Migrate managed fields to flux-operator owner

Signed-off-by: Stefan Prodan <[email protected]>
controlplaneio-fluxcd · Jun 20, 2024 · 246e88c · 246e88c
1 parent a7d71e0
commit 246e88c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/internal/controller/entitlement_controller.go b/internal/controller/entitlement_controller.go
@@ -160,8 +160,8 @@ func (r *EntitlementReconciler) InitEntitlementSecret(ctx context.Context) (*cor
 		}
 	}
 
-	exitingVendor, found := secret.Data[entitlement.VendorKey]
-	if !found || string(exitingVendor) != r.EntitlementClient.GetVendor() {
+	definedVendor, found := secret.Data[entitlement.VendorKey]
+	if !found || string(definedVendor) != r.EntitlementClient.GetVendor() {
 		secret.Data = make(map[string][]byte)
 		secret.Data[entitlement.VendorKey] = []byte(r.EntitlementClient.GetVendor())
 		if err := r.Client.Update(ctx, secret); err != nil {

diff --git a/internal/controller/fluxinstance_controller.go b/internal/controller/fluxinstance_controller.go
@@ -378,6 +378,10 @@ func (r *FluxInstanceReconciler) apply(ctx context.Context,
 				Name:          "kubectl",
 				OperationType: metav1.ManagedFieldsOperationUpdate,
 			},
+			{
+				Name:          "flux-controller",
+				OperationType: metav1.ManagedFieldsOperationApply,
+			},
 		},
 	}