minor refactor

Signed-off-by: Arvind Thirumurugan <arvindth@microsoft.com>

Author: Arvind Thirumurugan

cmd/crdinstaller/utils/util.go

@@ -24,8 +24,6 @@ import (
 )
 
 const (
-	// ArcInstallationKey is the key used to indicate if the installation is for ARC AKS cluster.
-	ArcInstallationKey = "crd-installer.azurefleet.io/arc"
 	// CRDInstallerLabelKey is the label key used to indicate that a CRD is managed by the installer.
 	CRDInstallerLabelKey = "crd-installer.azurefleet.io/managed"
 	// AzureManagedLabelKey is the label key used to indicate that a CRD is managed by an azure resource.
@@ -44,7 +42,7 @@ const (
 	ModeHub = "hub"
 	// ModeMember installs member cluster CRDs.
 	ModeMember = "member"
-	// ModeArcMember installs member cluster CRDs with ARC labels.
+	// ModeArcMember installs member cluster CRDs with ARC member label value.
 	ModeArcMember = "arcMember"
 )
 
@@ -75,16 +73,17 @@ func InstallCRD(ctx context.Context, client client.Client, crd *apiextensionsv1.
 		if existingCRD.Labels == nil {
 			existingCRD.Labels = make(map[string]string)
 		}
-		if mode == ModeArcMember {
-			// For ARC AKS installation, we want to add an additional label to indicate this is an ARC managed cluster,
-			// needed for clean up of CRD by kube-addon-manager.
-			existingCRD.Labels[ArcInstallationKey] = trueLabelValue
-		}
 		// Ensure the label for management by the installer is set.
 		existingCRD.Labels[CRDInstallerLabelKey] = trueLabelValue
 		// Also set the Azure managed label to indicate this is managed by Fleet,
 		// needed for clean up of CRD by kube-addon-manager.
-		existingCRD.Labels[AzureManagedLabelKey] = FleetLabelValue
+		if mode == ModeArcMember {
+			// For aks ARC, we set the label value to "arcMember" to avoid clean up of CRDs by OM.
+			existingCRD.Labels[AzureManagedLabelKey] = ModeArcMember
+		} else {
+			existingCRD.Labels[AzureManagedLabelKey] = FleetLabelValue
+		}
+
 		return nil
 	}
 	err := install(ctx, client, &existingCRD, mutFn)

cmd/crdinstaller/utils/util_test.go

@@ -202,17 +202,13 @@ func TestInstallCRD(t *testing.T) {
 				t.Errorf("Expected CRD label %s to be 'true', got %q", CRDInstallerLabelKey, installedCRD.Labels[CRDInstallerLabelKey])
 			}
 
-			if installedCRD.Labels[AzureManagedLabelKey] != FleetLabelValue {
-				t.Errorf("Expected CRD label %s to be %q, got %q", AzureManagedLabelKey, FleetLabelValue, installedCRD.Labels[AzureManagedLabelKey])
-			}
-
 			if tt.mode == ModeArcMember {
-				if installedCRD.Labels[ArcInstallationKey] != "true" {
-					t.Errorf("Expected CRD label %s to be 'true', got %q", ArcInstallationKey, installedCRD.Labels[ArcInstallationKey])
+				if installedCRD.Labels[AzureManagedLabelKey] != ModeArcMember {
+					t.Errorf("Expected CRD label %s to be %q, got %q", AzureManagedLabelKey, ModeArcMember, installedCRD.Labels[AzureManagedLabelKey])
 				}
 			} else {
-				if _, exists := installedCRD.Labels[ArcInstallationKey]; exists {
-					t.Errorf("Expected CRD label %s to not exist for non-ARC installation", ArcInstallationKey)
+				if installedCRD.Labels[AzureManagedLabelKey] != FleetLabelValue {
+					t.Errorf("Expected CRD label %s to be %q, got %q", AzureManagedLabelKey, FleetLabelValue, installedCRD.Labels[AzureManagedLabelKey])
 				}
 			}
 

test/crdinstaller/crd_installer_integration_test.go

@@ -106,8 +106,7 @@ var _ = Describe("Test CRD Installer, Create and Update CRD", Ordered, func() {
 		It("should verify CRD has ARC installation label", func() {
 			ensureCRDExistsWithLabels(map[string]string{
 				cmdCRDInstaller.CRDInstallerLabelKey: "true",
-				cmdCRDInstaller.AzureManagedLabelKey: cmdCRDInstaller.FleetLabelValue,
-				cmdCRDInstaller.ArcInstallationKey:   "true",
+				cmdCRDInstaller.AzureManagedLabelKey: cmdCRDInstaller.ModeArcMember,
 			})
 			crd := &apiextensionsv1.CustomResourceDefinition{}
 			Expect(k8sClient.Get(ctx, types.NamespacedName{Name: crdName}, crd)).NotTo(HaveOccurred(), "CRD %s should be installed", crdName)
@@ -133,8 +132,7 @@ var _ = Describe("Test CRD Installer, Create and Update CRD", Ordered, func() {
 			ensureCRDExistsWithLabels(map[string]string{
 				randomLabelKey:                       "true",
 				cmdCRDInstaller.CRDInstallerLabelKey: "true",
-				cmdCRDInstaller.AzureManagedLabelKey: cmdCRDInstaller.FleetLabelValue,
-				cmdCRDInstaller.ArcInstallationKey:   "true",
+				cmdCRDInstaller.AzureManagedLabelKey: cmdCRDInstaller.ModeArcMember,
 			})
 			crd := &apiextensionsv1.CustomResourceDefinition{}
 			Expect(k8sClient.Get(ctx, types.NamespacedName{Name: crdName}, crd)).NotTo(HaveOccurred(), "CRD %s should be installed", crdName)