Преглед изворни кода

fix: move removing keys after templating

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>
Gergely Brautigam пре 1 година
родитељ
комит
2c600bc09f
1 измењених фајлова са 4 додато и 4 уклоњено
  1. 4 4
      pkg/controllers/externalsecret/externalsecret_controller.go

+ 4 - 4
pkg/controllers/externalsecret/externalsecret_controller.go

@@ -275,6 +275,10 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		if secret.Data == nil {
 			secret.Data = make(map[string][]byte)
 		}
+		err = r.applyTemplate(ctx, &externalSecret, secret, dataMap)
+		if err != nil {
+			return fmt.Errorf(errApplyTemplate, err)
+		}
 		// diff existing keys
 		keys, err := getManagedDataKeys(&existingSecret, externalSecret.Name)
 		if err != nil {
@@ -288,10 +292,6 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 				delete(secret.Data, key)
 			}
 		}
-		err = r.applyTemplate(ctx, &externalSecret, secret, dataMap)
-		if err != nil {
-			return fmt.Errorf(errApplyTemplate, err)
-		}
 		if externalSecret.Spec.Target.CreationPolicy == esv1beta1.CreatePolicyOwner {
 			lblValue := utils.ObjectHash(fmt.Sprintf("%v/%v", externalSecret.Namespace, externalSecret.Name))
 			secret.Labels[esv1beta1.LabelOwner] = lblValue