lint fix

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

Author: Arvind Thirumurugan

cmd/crdinstaller/main.go

@@ -31,8 +31,8 @@ func main() {
 	flag.Parse()
 
 	// Validate required flags.
-	if *mode != "hub" && *mode != "member" && *mode != "arcMember" {
-		klog.Fatal("--mode flag must be either 'hub' or 'member' or ''arcMember'")
+	if *mode != utils.ModeHub && *mode != utils.ModeMember && *mode != utils.ModeArcMember {
+		klog.Fatal("--mode flag must be either 'hub' or 'member' or 'arcMember'")
 	}
 
 	klog.Infof("Starting CRD installer in %s mode", *mode)

cmd/crdinstaller/utils/util.go

@@ -38,6 +38,16 @@ const (
 	trueLabelValue = "true"
 )
 
+// Mode constants for CRD installer.
+const (
+	// ModeHub installs hub cluster CRDs.
+	ModeHub = "hub"
+	// ModeMember installs member cluster CRDs.
+	ModeMember = "member"
+	// ModeArcMember installs member cluster CRDs with ARC labels.
+	ModeArcMember = "arcMember"
+)
+
 var (
 	multiclusterCRD = map[string]bool{
 		"multicluster.x-k8s.io_clusterprofiles.yaml": true,
@@ -65,7 +75,7 @@ func InstallCRD(ctx context.Context, client client.Client, crd *apiextensionsv1.
 		if existingCRD.Labels == nil {
 			existingCRD.Labels = make(map[string]string)
 		}
-		if mode == "arcMember" {
+		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
@@ -119,9 +129,9 @@ func CollectCRDs(crdDirectoryPath, mode string, scheme *runtime.Scheme) ([]apiex
 
 		var shouldInstall bool
 		switch mode {
-		case "member", "arcMember":
+		case ModeMember, ModeArcMember:
 			shouldInstall = memberCRD[crdFileName]
-		case "hub":
+		case ModeHub:
 			// Install multicluster CRD or CRDs with kubernetes-fleet.io in the filename (excluding member-only CRDs).
 			// CRD filenames follow the pattern <group>_<plural>.yaml, so we can check the filename.
 			shouldInstall = multiclusterCRD[crdFileName] || (strings.Contains(crdFileName, "kubernetes-fleet.io") && !memberCRD[crdFileName])

cmd/crdinstaller/utils/util_test.go

@@ -56,7 +56,7 @@ func runTest(t *testing.T, crdPath string) {
 	}{
 		{
 			name: "hub mode v1beta1 with actual directory",
-			mode: "hub",
+			mode: ModeHub,
 			wantedCRDNames: []string{
 				"memberclusters.cluster.kubernetes-fleet.io",
 				"internalmemberclusters.cluster.kubernetes-fleet.io",
@@ -90,7 +90,7 @@ func runTest(t *testing.T, crdPath string) {
 		},
 		{
 			name: "member mode v1beta1 with actual directory",
-			mode: "member",
+			mode: ModeMember,
 			wantedCRDNames: []string{
 				"appliedworks.placement.kubernetes-fleet.io",
 			},
@@ -163,13 +163,13 @@ func TestInstallCRD(t *testing.T) {
 		{
 			name:      "successful CRD installation with member mode",
 			crd:       testCRD,
-			mode:      "member",
+			mode:      ModeMember,
 			wantError: false,
 		},
 		{
 			name:      "successful CRD installation with arcMember mode",
 			crd:       testCRD,
-			mode:      "arcMember",
+			mode:      ModeArcMember,
 			wantError: false,
 		},
 	}
@@ -206,7 +206,7 @@ func TestInstallCRD(t *testing.T) {
 				t.Errorf("Expected CRD label %s to be %q, got %q", AzureManagedLabelKey, FleetLabelValue, installedCRD.Labels[AzureManagedLabelKey])
 			}
 
-			if tt.mode == "arcMember" {
+			if tt.mode == ModeArcMember {
 				if installedCRD.Labels[ArcInstallationKey] != "true" {
 					t.Errorf("Expected CRD label %s to be 'true', got %q", ArcInstallationKey, installedCRD.Labels[ArcInstallationKey])
 				}

test/crdinstaller/crd_installer_integration_test.go

@@ -44,7 +44,7 @@ var _ = Describe("Test CRD Installer, Create and Update CRD", Ordered, func() {
 			crd, err := cmdCRDInstaller.GetCRDFromPath(originalCRDPath, scheme)
 			Expect(err).NotTo(HaveOccurred(), "should get CRD from path %s", originalCRDPath)
 			Eventually(func() error {
-				return cmdCRDInstaller.InstallCRD(ctx, k8sClient, crd, "member")
+				return cmdCRDInstaller.InstallCRD(ctx, k8sClient, crd, cmdCRDInstaller.ModeMember)
 			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})
 
@@ -71,7 +71,7 @@ var _ = Describe("Test CRD Installer, Create and Update CRD", Ordered, func() {
 			crd, err := cmdCRDInstaller.GetCRDFromPath(updatedCRDPath, scheme)
 			Expect(err).NotTo(HaveOccurred(), "should get CRD from path %s", updatedCRDPath)
 			Eventually(func() error {
-				return cmdCRDInstaller.InstallCRD(ctx, k8sClient, crd, "member")
+				return cmdCRDInstaller.InstallCRD(ctx, k8sClient, crd, cmdCRDInstaller.ModeMember)
 			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})
 
@@ -99,7 +99,7 @@ var _ = Describe("Test CRD Installer, Create and Update CRD", Ordered, func() {
 			crd, err := cmdCRDInstaller.GetCRDFromPath(originalCRDPath, scheme)
 			Expect(err).NotTo(HaveOccurred(), "should get CRD from path %s", originalCRDPath)
 			Eventually(func() error {
-				return cmdCRDInstaller.InstallCRD(ctx, k8sClient, crd, "arcMember")
+				return cmdCRDInstaller.InstallCRD(ctx, k8sClient, crd, cmdCRDInstaller.ModeArcMember)
 			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})
 
@@ -124,7 +124,7 @@ var _ = Describe("Test CRD Installer, Create and Update CRD", Ordered, func() {
 			crd, err := cmdCRDInstaller.GetCRDFromPath(updatedCRDPath, scheme)
 			Expect(err).NotTo(HaveOccurred(), "should get CRD from path %s", updatedCRDPath)
 			Eventually(func() error {
-				return cmdCRDInstaller.InstallCRD(ctx, k8sClient, crd, "arcMember")
+				return cmdCRDInstaller.InstallCRD(ctx, k8sClient, crd, cmdCRDInstaller.ModeArcMember)
 			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})