fix: copy owner label and annotations

itscontained · Sep 12, 2020 · b37b27a · b37b27a
1 parent 46a4baa
commit b37b27a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/pkg/controller/externalsecret/controller.go b/pkg/controller/externalsecret/controller.go
@@ -97,6 +97,8 @@ func (r *ExternalSecretReconciler) Reconcile(req ctrl.Request) (ctrl.Result, err
 			return fmt.Errorf("failed to set ExternalSecret controller reference: %w", err)
 		}
 
+		secret.Labels = extSecret.Labels
+		secret.Annotations = extSecret.Annotations
 		secret.Data, err = r.getSecret(ctx, storeClient, extSecret)
 		if err != nil {
 			return fmt.Errorf("%s: %w", errGetSecretDataFailed, err)
@@ -108,6 +110,7 @@ func (r *ExternalSecretReconciler) Reconcile(req ctrl.Request) (ctrl.Result, err
 				return fmt.Errorf("%s: %w", errTemplateFailed, err)
 			}
 		}
+
 		return nil
 	})
 
@@ -197,15 +200,15 @@ func (r *ExternalSecretReconciler) getStore(ctx context.Context, extSecret *smv1
 		}
 		return clusterStore, nil
 	}
-	var namespacedStore smv1alpha1.SecretStore
+	namespacedStore := &smv1alpha1.SecretStore{}
 	ref := types.NamespacedName{
 		Namespace: extSecret.Namespace,
 		Name:      extSecret.Spec.StoreRef.Name,
 	}
-	if err := r.Reader.Get(ctx, ref, &namespacedStore); err != nil {
+	if err := r.Reader.Get(ctx, ref, namespacedStore); err != nil {
 		return nil, fmt.Errorf("SecretStore %q: %w", ref.Name, err)
 	}
-	return &namespacedStore, nil
+	return namespacedStore, nil
 }
 
 func (r *ExternalSecretReconciler) templateSecret(secret *corev1.Secret, template []byte) error {

diff --git a/pkg/controller/externalsecret/controller_test.go b/pkg/controller/externalsecret/controller_test.go
@@ -196,6 +196,12 @@ var _ = Describe("ExternalSecrets Controller", func() {
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      key.Name,
 					Namespace: key.Namespace,
+					Labels: map[string]string{
+						"label-key": "label-value",
+					},
+					Annotations: map[string]string{
+						"annotation-key": "annotation-value",
+					},
 				},
 				Spec: spec,
 			}
@@ -237,6 +243,11 @@ var _ = Describe("ExternalSecrets Controller", func() {
 				"The owner kind should be ExternalSecret")
 			Expect(fetchedSecret.OwnerReferences[0].Name).Should(BeIdenticalTo(toCreate.Name),
 				"The owner name should be the name of the ExternalSecret")
+
+			Expect(fetchedSecret.Labels["label-key"]).Should(BeIdenticalTo(toCreate.Labels["label-key"]),
+				"The secret should have labels of the ExternalSecret")
+			Expect(fetchedSecret.Annotations["annotation-key"]).Should(BeIdenticalTo(toCreate.Annotations["annotation-key"]),
+				"The secret should have annotations of the ExternalSecret")
 		})
 
 		It("An ExternalSecret with dataFrom specified should generate secret", func() {