Standardize the naming of karmada config in Karmada Operator

Signed-off-by: wei-chenglai <[email protected]>
karmada-io · Jan 25, 2025 · 8acb959 · 8acb959
1 parent d24b2b9
commit 8acb959
Show file tree

Hide file tree

Showing 18 changed files with 136 additions and 82 deletions.
diff --git a/operator/pkg/controlplane/apiserver/apiserver.go b/operator/pkg/controlplane/apiserver/apiserver.go
@@ -124,7 +124,7 @@ func installKarmadaAggregatedAPIServer(client clientset.Interface, cfg *operator
 		Namespace:          namespace,
 		Image:              cfg.Image.Name(),
 		ImagePullPolicy:    string(cfg.ImagePullPolicy),
-		KubeconfigSecret:   util.AdminKubeconfigSecretName(name),
+		KubeconfigSecret:   util.ComponentKubeconfigSecretName(util.KarmadaAggregatedAPIServerName(name)),
 		KarmadaCertsSecret: util.KarmadaCertSecretName(name),
 		Replicas:           cfg.Replicas,
 	})

diff --git a/operator/pkg/controlplane/apiserver/apiserver_test.go b/operator/pkg/controlplane/apiserver/apiserver_test.go
@@ -415,7 +415,7 @@ func verifyAggregatedAPIServerDeploymentAdditionalDetails(featureGates map[strin
 	for _, volume := range deployment.Spec.Template.Spec.Volumes {
 		extractedSecrets = append(extractedSecrets, volume.Secret.SecretName)
 	}
-	expectedSecrets := []string{util.AdminKubeconfigSecretName(expectedDeploymentName), util.KarmadaCertSecretName(expectedDeploymentName), util.EtcdCertSecretName(expectedDeploymentName)}
+	expectedSecrets := []string{util.ComponentKubeconfigSecretName(util.KarmadaAggregatedAPIServerName(expectedDeploymentName)), util.KarmadaCertSecretName(expectedDeploymentName), util.EtcdCertSecretName(expectedDeploymentName)}
 	for _, expectedSecret := range expectedSecrets {
 		if !contains(extractedSecrets, expectedSecret) {
 			return fmt.Errorf("expected secret '%s' not found in extracted secrets", expectedSecret)

diff --git a/operator/pkg/controlplane/apiserver/manifests.go b/operator/pkg/controlplane/apiserver/manifests.go
@@ -163,24 +163,23 @@ spec:
         imagePullPolicy: {{ .ImagePullPolicy }}
         command:
         - /bin/karmada-aggregated-apiserver
-        - --kubeconfig=/etc/karmada/kubeconfig
-        - --authentication-kubeconfig=/etc/karmada/kubeconfig
-        - --authorization-kubeconfig=/etc/karmada/kubeconfig
+        - --kubeconfig=/etc/karmada/config/karmada.config
+        - --authentication-kubeconfig=/etc/karmada/config/karmada.config
+        - --authorization-kubeconfig=/etc/karmada/config/karmada.config
         - --tls-cert-file=/etc/karmada/pki/karmada.crt
         - --tls-private-key-file=/etc/karmada/pki/karmada.key
         - --tls-min-version=VersionTLS13
         - --audit-log-path=-
         - --audit-log-maxage=0
         - --audit-log-maxbackup=0
         volumeMounts:
-        - mountPath: /etc/karmada/kubeconfig
-          name: kubeconfig
-          subPath: kubeconfig
+        - mountPath: /etc/karmada/config
+          name: karmada-config
         - mountPath: /etc/karmada/pki
           name: apiserver-cert
           readOnly: true
       volumes:
-      - name: kubeconfig
+      - name: karmada-config
         secret:
           secretName: {{ .KubeconfigSecret }}
       - name: apiserver-cert

diff --git a/operator/pkg/controlplane/controlplane.go b/operator/pkg/controlplane/controlplane.go
@@ -93,7 +93,7 @@ func getKubeControllerManagerManifest(name, namespace string, cfg *operatorv1alp
 		Image:              cfg.Image.Name(),
 		ImagePullPolicy:    string(cfg.ImagePullPolicy),
 		KarmadaCertsSecret: util.KarmadaCertSecretName(name),
-		KubeconfigSecret:   util.AdminKubeconfigSecretName(name),
+		KubeconfigSecret:   util.ComponentKubeconfigSecretName(util.KubeControllerManagerName(name)),
 		Replicas:           cfg.Replicas,
 	})
 	if err != nil {
@@ -121,7 +121,7 @@ func getKarmadaControllerManagerManifest(name, namespace string, featureGates ma
 		SystemNamespace:  constants.KarmadaSystemNamespace,
 		Image:            cfg.Image.Name(),
 		ImagePullPolicy:  string(cfg.ImagePullPolicy),
-		KubeconfigSecret: util.AdminKubeconfigSecretName(name),
+		KubeconfigSecret: util.ComponentKubeconfigSecretName(util.KarmadaControllerManagerName(name)),
 		Replicas:         cfg.Replicas,
 	})
 	if err != nil {
@@ -149,7 +149,7 @@ func getKarmadaSchedulerManifest(name, namespace string, featureGates map[string
 		SystemNamespace:    constants.KarmadaSystemNamespace,
 		Image:              cfg.Image.Name(),
 		ImagePullPolicy:    string(cfg.ImagePullPolicy),
-		KubeconfigSecret:   util.AdminKubeconfigSecretName(name),
+		KubeconfigSecret:   util.ComponentKubeconfigSecretName(util.KarmadaSchedulerName(name)),
 		KarmadaCertsSecret: util.KarmadaCertSecretName(name),
 		Replicas:           cfg.Replicas,
 	})
@@ -178,7 +178,7 @@ func getKarmadaDeschedulerManifest(name, namespace string, featureGates map[stri
 		SystemNamespace:    constants.KarmadaSystemNamespace,
 		Image:              cfg.Image.Name(),
 		ImagePullPolicy:    string(cfg.ImagePullPolicy),
-		KubeconfigSecret:   util.AdminKubeconfigSecretName(name),
+		KubeconfigSecret:   util.ComponentKubeconfigSecretName(util.KarmadaDeschedulerName(name)),
 		KarmadaCertsSecret: util.KarmadaCertSecretName(name),
 		Replicas:           cfg.Replicas,
 	})

diff --git a/operator/pkg/controlplane/controlplane_test.go b/operator/pkg/controlplane/controlplane_test.go
@@ -165,7 +165,7 @@ func TestGetKubeControllerManagerManifest(t *testing.T) {
 	}
 
 	expectedSecrets := []string{
-		util.AdminKubeconfigSecretName(name),
+		util.ComponentKubeconfigSecretName(util.KubeControllerManagerName(name)),
 		util.KarmadaCertSecretName(name),
 	}
 	err = verifySecrets(deployment, expectedSecrets)
@@ -222,7 +222,7 @@ func TestGetKarmadaControllerManagerManifest(t *testing.T) {
 		t.Errorf("failed to verify karmada controller manager system namespace: %v", err)
 	}
 
-	expectedSecrets := []string{util.AdminKubeconfigSecretName(name)}
+	expectedSecrets := []string{util.ComponentKubeconfigSecretName(util.KarmadaControllerManagerName(name))}
 	err = verifySecrets(deployment, expectedSecrets)
 	if err != nil {
 		t.Errorf("failed to verify karmada controller manager secrets: %v", err)
@@ -279,7 +279,7 @@ func TestGetKarmadaSchedulerManifest(t *testing.T) {
 	}
 
 	expectedSecrets := []string{
-		util.AdminKubeconfigSecretName(name),
+		util.ComponentKubeconfigSecretName(util.KarmadaSchedulerName(name)),
 		util.KarmadaCertSecretName(name),
 	}
 	err = verifySecrets(deployment, expectedSecrets)
@@ -338,7 +338,7 @@ func TestGetKarmadaDeschedulerManifest(t *testing.T) {
 	}
 
 	expectedSecrets := []string{
-		util.AdminKubeconfigSecretName(name),
+		util.ComponentKubeconfigSecretName(util.KarmadaDeschedulerName(name)),
 		util.KarmadaCertSecretName(name),
 	}
 	err = verifySecrets(deployment, expectedSecrets)

diff --git a/operator/pkg/controlplane/manifests.go b/operator/pkg/controlplane/manifests.go
@@ -55,9 +55,9 @@ spec:
         command:
         - kube-controller-manager
         - --allocate-node-cidrs=true
-        - --kubeconfig=/etc/karmada/kubeconfig
-        - --authentication-kubeconfig=/etc/karmada/kubeconfig
-        - --authorization-kubeconfig=/etc/karmada/kubeconfig
+        - --kubeconfig=/etc/karmada/config/karmada.config
+        - --authentication-kubeconfig=/etc/karmada/config/karmada.config
+        - --authorization-kubeconfig=/etc/karmada/config/karmada.config
         - --bind-address=0.0.0.0
         - --client-ca-file=/etc/karmada/pki/ca.crt
         - --cluster-cidr=10.244.0.0/16
@@ -86,14 +86,13 @@ spec:
         - name: karmada-certs
           mountPath: /etc/karmada/pki
           readOnly: true
-        - name: kubeconfig
-          mountPath: /etc/karmada/kubeconfig
-          subPath: kubeconfig
+        - name: karmada-config
+          mountPath: /etc/karmada/config
       volumes:
         - name: karmada-certs
           secret:
             secretName: {{ .KarmadaCertsSecret }}
-        - name: kubeconfig
+        - name: karmada-config
           secret:
             secretName: {{ .KubeconfigSecret }}
 `
@@ -127,7 +126,7 @@ spec:
         imagePullPolicy: {{ .ImagePullPolicy }}
         command:
         - /bin/karmada-controller-manager
-        - --kubeconfig=/etc/karmada/kubeconfig
+        - --kubeconfig=/etc/karmada/config/karmada.config
         - --metrics-bind-address=:8080
         - --cluster-status-update-frequency=10s
         - --failover-eviction-timeout=30s
@@ -148,11 +147,10 @@ spec:
           name: metrics
           protocol: TCP
         volumeMounts:
-        - name: kubeconfig
-          subPath: kubeconfig
-          mountPath: /etc/karmada/kubeconfig
+        - name: karmada-config
+          mountPath: /etc/karmada/config
       volumes:
-      - name: kubeconfig
+      - name: karmada-config
         secret:
           secretName: {{ .KubeconfigSecret }}
 `
@@ -187,7 +185,7 @@ spec:
         imagePullPolicy: {{ .ImagePullPolicy }}
         command:
         - /bin/karmada-scheduler
-        - --kubeconfig=/etc/karmada/kubeconfig
+        - --kubeconfig=/etc/karmada/config/karmada.config
         - --metrics-bind-address=0.0.0.0:8080
         - --health-probe-bind-address=0.0.0.0:10351
         - --enable-scheduler-estimator=true
@@ -213,14 +211,13 @@ spec:
         - name: karmada-certs
           mountPath: /etc/karmada/pki
           readOnly: true
-        - name: kubeconfig
-          subPath: kubeconfig
-          mountPath: /etc/karmada/kubeconfig
+        - name: karmada-config
+          mountPath: /etc/karmada/config
       volumes:
         - name: karmada-certs
           secret:
             secretName: {{ .KarmadaCertsSecret }}
-        - name: kubeconfig
+        - name: karmada-config
           secret:
             secretName: {{ .KubeconfigSecret }}
 `
@@ -255,7 +252,7 @@ spec:
         imagePullPolicy: {{ .ImagePullPolicy }}
         command:
         - /bin/karmada-descheduler
-        - --kubeconfig=/etc/karmada/kubeconfig
+        - --kubeconfig=/etc/karmada/config/karmada.config
         - --metrics-bind-address=0.0.0.0:8080
         - --health-probe-bind-address=0.0.0.0:10358
         - --leader-elect-resource-namespace={{ .SystemNamespace }}
@@ -280,14 +277,13 @@ spec:
         - name: karmada-certs
           mountPath: /etc/karmada/pki
           readOnly: true
-        - name: kubeconfig
-          subPath: kubeconfig
-          mountPath: /etc/karmada/kubeconfig
+        - name: karmada-config
+          mountPath: /etc/karmada/config
       volumes:
         - name: karmada-certs
           secret:
             secretName: {{ .KarmadaCertsSecret }}
-        - name: kubeconfig
+        - name: karmada-config
           secret:
             secretName: {{ .KubeconfigSecret }}
 `

diff --git a/operator/pkg/controlplane/metricsadapter/manifests.go b/operator/pkg/controlplane/metricsadapter/manifests.go
@@ -47,10 +47,10 @@ spec:
         imagePullPolicy: {{ .ImagePullPolicy }}
         command:
         - /bin/karmada-metrics-adapter
-        - --kubeconfig=/etc/karmada/kubeconfig
+        - --kubeconfig=/etc/karmada/config/karmada.config
         - --metrics-bind-address=:8080
-        - --authentication-kubeconfig=/etc/karmada/kubeconfig
-        - --authorization-kubeconfig=/etc/karmada/kubeconfig
+        - --authentication-kubeconfig=/etc/karmada/config/karmada.config
+        - --authorization-kubeconfig=/etc/karmada/config/karmada.config
         - --client-ca-file=/etc/karmada/pki/ca.crt
         - --tls-cert-file=/etc/karmada/pki/karmada.crt
         - --tls-private-key-file=/etc/karmada/pki/karmada.key
@@ -59,9 +59,8 @@ spec:
         - --audit-log-maxage=0
         - --audit-log-maxbackup=0
         volumeMounts:
-        - name: kubeconfig
-          subPath: kubeconfig
-          mountPath: /etc/karmada/kubeconfig
+        - name: karmada-config
+          mountPath: /etc/karmada/config
         - name: karmada-cert
           mountPath: /etc/karmada/pki
           readOnly: true
@@ -87,7 +86,7 @@ spec:
           requests:
             cpu: 100m
       volumes:
-      - name: kubeconfig
+      - name: karmada-config
         secret:
           secretName: {{ .KubeconfigSecret }}
       - name: karmada-cert

diff --git a/operator/pkg/controlplane/metricsadapter/metricsadapter.go b/operator/pkg/controlplane/metricsadapter/metricsadapter.go
@@ -51,7 +51,7 @@ func installKarmadaMetricAdapter(client clientset.Interface, cfg *operatorv1alph
 		Image:              cfg.Image.Name(),
 		ImagePullPolicy:    string(cfg.ImagePullPolicy),
 		Replicas:           cfg.Replicas,
-		KubeconfigSecret:   util.AdminKubeconfigSecretName(name),
+		KubeconfigSecret:   util.ComponentKubeconfigSecretName(util.KarmadaMetricsAdapterName(name)),
 		KarmadaCertsSecret: util.KarmadaCertSecretName(name),
 	})
 	if err != nil {

diff --git a/operator/pkg/controlplane/metricsadapter/metricsadapter_test.go b/operator/pkg/controlplane/metricsadapter/metricsadapter_test.go
@@ -213,7 +213,7 @@ func verifyDeploymentDetails(deployment *appsv1.Deployment, replicas int32, imag
 		extractedSecrets = append(extractedSecrets, volume.Secret.SecretName)
 	}
 	expectedSecrets := []string{
-		util.AdminKubeconfigSecretName(name),
+		util.ComponentKubeconfigSecretName(util.KarmadaMetricsAdapterName(name)),
 		util.KarmadaCertSecretName(name),
 	}
 	for _, expectedSecret := range expectedSecrets {

diff --git a/operator/pkg/controlplane/search/manifests.go b/operator/pkg/controlplane/search/manifests.go
@@ -49,14 +49,13 @@ spec:
             - name: k8s-certs
               mountPath: /etc/karmada/pki
               readOnly: true
-            - name: kubeconfig
-              subPath: kubeconfig
-              mountPath: /etc/kubeconfig
+            - name: karmada-config
+              mountPath: /etc/karmada/config
           command:
             - /bin/karmada-search
-            - --kubeconfig=/etc/kubeconfig
-            - --authentication-kubeconfig=/etc/kubeconfig
-            - --authorization-kubeconfig=/etc/kubeconfig
+            - --kubeconfig=/etc/karmada/config/karmada.config
+            - --authentication-kubeconfig=/etc/karmada/config/karmada.config
+            - --authorization-kubeconfig=/etc/karmada/config/karmada.config
             - --tls-cert-file=/etc/karmada/pki/karmada.crt
             - --tls-private-key-file=/etc/karmada/pki/karmada.key
             - --tls-min-version=VersionTLS13
@@ -79,7 +78,7 @@ spec:
         - name: k8s-certs
           secret:
             secretName: {{ .KarmadaCertsSecret }}
-        - name: kubeconfig
+        - name: karmada-config
           secret:
             secretName: {{ .KubeconfigSecret }}
 `

diff --git a/operator/pkg/controlplane/search/search.go b/operator/pkg/controlplane/search/search.go
@@ -53,7 +53,7 @@ func installKarmadaSearch(client clientset.Interface, cfg *operatorv1alpha1.Karm
 		ImagePullPolicy:    string(cfg.ImagePullPolicy),
 		KarmadaCertsSecret: util.KarmadaCertSecretName(name),
 		Replicas:           cfg.Replicas,
-		KubeconfigSecret:   util.AdminKubeconfigSecretName(name),
+		KubeconfigSecret:   util.ComponentKubeconfigSecretName(util.KarmadaSearchName(name)),
 	})
 	if err != nil {
 		return fmt.Errorf("error when parsing KarmadaSearch Deployment template: %w", err)

diff --git a/operator/pkg/controlplane/search/search_test.go b/operator/pkg/controlplane/search/search_test.go
@@ -236,7 +236,7 @@ func verifySecrets(deployment *appsv1.Deployment, name string) error {
 		extractedSecrets = append(extractedSecrets, volume.Secret.SecretName)
 	}
 	expectedSecrets := []string{
-		util.AdminKubeconfigSecretName(name),
+		util.ComponentKubeconfigSecretName(util.KarmadaSearchName(name)),
 		util.KarmadaCertSecretName(name),
 	}
 	for _, expectedSecret := range expectedSecrets {

diff --git a/operator/pkg/controlplane/webhook/manifests.go b/operator/pkg/controlplane/webhook/manifests.go
@@ -47,7 +47,7 @@ spec:
         imagePullPolicy: {{ .ImagePullPolicy }}
         command:
         - /bin/karmada-webhook
-        - --kubeconfig=/etc/karmada/kubeconfig
+        - --kubeconfig=/etc/karmada/config/karmada.config
         - --bind-address=0.0.0.0
         - --metrics-bind-address=:8080
         - --default-not-ready-toleration-seconds=30
@@ -61,9 +61,8 @@ spec:
           name: metrics
           protocol: TCP
         volumeMounts:
-        - name: kubeconfig
-          subPath: kubeconfig
-          mountPath: /etc/karmada/kubeconfig
+        - name: karmada-config
+          mountPath: /etc/karmada/config
         - name: cert
           mountPath: /var/serving-cert
           readOnly: true
@@ -73,7 +72,7 @@ spec:
             port: 8443
             scheme: HTTPS
       volumes:
-      - name: kubeconfig
+      - name: karmada-config
         secret:
           secretName: {{ .KubeconfigSecret }}
       - name: cert

diff --git a/operator/pkg/controlplane/webhook/webhook.go b/operator/pkg/controlplane/webhook/webhook.go
@@ -51,7 +51,7 @@ func installKarmadaWebhook(client clientset.Interface, cfg *operatorv1alpha1.Kar
 		Image:              cfg.Image.Name(),
 		ImagePullPolicy:    string(cfg.ImagePullPolicy),
 		Replicas:           cfg.Replicas,
-		KubeconfigSecret:   util.AdminKubeconfigSecretName(name),
+		KubeconfigSecret:   util.ComponentKubeconfigSecretName(util.KarmadaWebhookName(name)),
 		WebhookCertsSecret: util.WebhookCertSecretName(name),
 	})
 	if err != nil {

diff --git a/operator/pkg/controlplane/webhook/webhook_test.go b/operator/pkg/controlplane/webhook/webhook_test.go
@@ -226,7 +226,7 @@ func verifySecrets(deployment *appsv1.Deployment, name string) error {
 		extractedSecrets = append(extractedSecrets, volume.Secret.SecretName)
 	}
 	expectedSecrets := []string{
-		util.AdminKubeconfigSecretName(name),
+		util.ComponentKubeconfigSecretName(util.KarmadaWebhookName(name)),
 		util.WebhookCertSecretName(name),
 	}
 	for _, expectedSecret := range expectedSecrets {