chore: switch to patch instead of update (#43)

* chore: switch to patch instead of update

Signed-off-by: Artur Shad Nik <[email protected]>

* chore: cleaup

Signed-off-by: Artur Shad Nik <[email protected]>

* chore: bump e2e addon check timeout

Signed-off-by: Artur Shad Nik <[email protected]>

* test: update support bundle config

Signed-off-by: Artur Shad Nik <[email protected]>

---------

Signed-off-by: Artur Shad Nik <[email protected]>

Author: arturshadnik

fleetconfig-controller/internal/controller/addon.go

@@ -2,7 +2,9 @@ package controller
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
+	"maps"
 	"net/url"
 	"os/exec"
 	"slices"
@@ -185,11 +187,14 @@ func labelConfigurationResources(ctx context.Context, addonC *addonapi.Clientset
 	if addonTemplate.Labels == nil {
 		addonTemplate.Labels = make(map[string]string)
 	}
-	for k, v := range v1alpha1.ManagedByLabels {
-		addonTemplate.Labels[k] = v
+	maps.Copy(addonTemplate.Labels, v1alpha1.ManagedByLabels)
+
+	patchBytes, err := json.Marshal(labelPatchData(addonTemplate.Labels))
+	if err != nil {
+		return fmt.Errorf("failed to marshal patch data for AddOnTemplate %s: %v", addonTemplateName, err)
 	}
 
-	_, err = addonC.AddonV1alpha1().AddOnTemplates().Update(ctx, addonTemplate, metav1.UpdateOptions{})
+	_, err = addonC.AddonV1alpha1().AddOnTemplates().Patch(ctx, addonTemplate.Name, types.MergePatchType, patchBytes, metav1.PatchOptions{})
 	if err != nil {
 		return fmt.Errorf("failed to update AddOnTemplate %s with labels: %v", addonTemplateName, err)
 	}
@@ -205,11 +210,14 @@ func labelConfigurationResources(ctx context.Context, addonC *addonapi.Clientset
 	if clusterMgmtAddOn.Labels == nil {
 		clusterMgmtAddOn.Labels = make(map[string]string)
 	}
-	for k, v := range v1alpha1.ManagedByLabels {
-		clusterMgmtAddOn.Labels[k] = v
+	maps.Copy(clusterMgmtAddOn.Labels, v1alpha1.ManagedByLabels)
+
+	patchBytes, err = json.Marshal(labelPatchData(clusterMgmtAddOn.Labels))
+	if err != nil {
+		return fmt.Errorf("failed to marshal patch data for ClusterManagementAddOn %s: %v", addon.Name, err)
 	}
 
-	_, err = addonC.AddonV1alpha1().ClusterManagementAddOns().Update(ctx, clusterMgmtAddOn, metav1.UpdateOptions{})
+	_, err = addonC.AddonV1alpha1().ClusterManagementAddOns().Patch(ctx, clusterMgmtAddOn.Name, types.MergePatchType, patchBytes, metav1.PatchOptions{})
 	if err != nil {
 		return fmt.Errorf("failed to update ClusterManagementAddOn %s with labels: %v", addon.Name, err)
 	}
@@ -426,11 +434,14 @@ func labelManagedClusterAddOn(ctx context.Context, addonC *addonapi.Clientset, s
 	if mcao.Labels == nil {
 		mcao.Labels = make(map[string]string)
 	}
-	for k, v := range v1alpha1.ManagedByLabels {
-		mcao.Labels[k] = v
+	maps.Copy(mcao.Labels, v1alpha1.ManagedByLabels)
+
+	patchBytes, err := json.Marshal(labelPatchData(mcao.Labels))
+	if err != nil {
+		return fmt.Errorf("failed to marshal patch data for ManagedClusterAddOn %s: %v", addonName, err)
 	}
 
-	_, err = addonC.AddonV1alpha1().ManagedClusterAddOns(spokeName).Update(ctx, mcao, metav1.UpdateOptions{})
+	_, err = addonC.AddonV1alpha1().ManagedClusterAddOns(spokeName).Patch(ctx, mcao.Name, types.MergePatchType, patchBytes, metav1.PatchOptions{})
 	if err != nil {
 		return fmt.Errorf("failed to update ManagedClusterAddOn %s for spoke %s with labels: %v", addonName, spokeName, err)
 	}
@@ -464,3 +475,11 @@ func handleAddonDisable(ctx context.Context, spokeName string, addons []string)
 	logger.V(1).Info("disabled addons", "managedcluster", spokeName, "addons", addons, "output", string(stdout))
 	return nil
 }
+
+func labelPatchData(labels map[string]string) map[string]any {
+	return map[string]any{
+		"metadata": map[string]any{
+			"labels": labels,
+		},
+	}
+}

fleetconfig-controller/test/e2e/helper.go

@@ -387,13 +387,19 @@ func ensureAddonCreated(tc *E2EContext, addonIdx int) {
 			utils.WarnError(err, "failed to get ManagedClusterAddOn %s in namespace %s", addon.name, spokeName)
 			return err
 		}
+		managedBy, ok := mcao.Labels[v1alpha1.LabelAddOnManagedBy]
+		if !ok || managedBy != "fleetconfig-controller" {
+			err := fmt.Errorf("did not find expected label %s on ManagedClusterAddOn", v1alpha1.LabelAddOnManagedBy)
+			utils.WarnError(err, "ManagedClusterAddOn not managed by fleetconfig-controller")
+			return err
+		}
 		ns := corev1.Namespace{}
 		if err := tc.kClientSpoke.Get(tc.ctx, ktypes.NamespacedName{Name: addon.namespace}, &ns); err != nil {
 			utils.WarnError(err, "failed to get namespace %s in spoke cluster", addon.namespace)
 			return err
 		}
 		return nil
-	}, 1*time.Minute, 1*time.Second).Should(Succeed())
+	}, 2*time.Minute, 1*time.Second).Should(Succeed())
 }
 
 func updateAddon(tc *E2EContext, fc *v1alpha1.FleetConfig) {

fleetconfig-controller/test/utils/resources/support-bundle.yaml

@@ -39,7 +39,7 @@ spec:
       name: hub-kubeconfig-secret
   - logs:
       selector:
-      - app.kubernetes.io/name=fleetconfig
+      - app.kubernetes.io/name=fleetconfig-controller
       namespace: fleetconfig-system
       name: fleetconfig/fleetconfig
   - logs: