Standardize the naming of karmada config in Helm chart

seanlaii · seanlaii · commit 02732d8f16fc · 2025-02-25T11:12:52.000+08:00
Signed-off-by: wei-chenglai &lt;qazwsx0939059006@gmail.com&gt;
diff --git a/charts/karmada/templates/_helpers.tpl b/charts/karmada/templates/_helpers.tpl
@@ -112,15 +112,14 @@ app: {{- include "karmada.name" .}}-kube-controller-manager
 
 {{- define "karmada.kubeconfig.volume" -}}
 {{- $name := include "karmada.name" . -}}
-- name: kubeconfig-secret
+- name: karmada-config
   secret:
-    secretName: {{ $name }}-kubeconfig
+    secretName: {{ $name }}-config
 {{- end -}}
 
 {{- define "karmada.kubeconfig.volumeMount" -}}
-- name: kubeconfig-secret
-  subPath: kubeconfig
-  mountPath: /etc/kubeconfig
+- name: karmada-config
+  mountPath: /etc/karmada/config
 {{- end -}}
 
 {{- define "karmada.kubeconfig.caData" -}}
@@ -197,11 +196,11 @@ app: {{$name}}
 {{- define "karmada.descheduler.kubeconfig.volume" -}}
 {{ $name :=  include "karmada.name" . }}
 {{- if eq .Values.installMode "host" -}}
-- name: kubeconfig-secret
+- name: karmada-config
   secret:
-    secretName: {{ $name }}-kubeconfig
+    secretName: {{ $name }}-descheduler-config
 {{- else -}}
-- name: kubeconfig-secret
+- name: karmada-config
   secret:
     secretName: {{ .Values.descheduler.kubeconfig }}
 {{- end -}}
@@ -324,14 +323,14 @@ app: {{- include "karmada.name" .}}-search
 - name: k8s-certs
   secret:
     secretName: {{ $name }}-cert
-- name: kubeconfig-secret
+- name: karmada-config
   secret:
-    secretName: {{ $name }}-kubeconfig
+    secretName: {{ $name }}-search-config
 {{- else -}}
 - name: k8s-certs
   secret:
     secretName: {{ .Values.search.certs }}
-- name: kubeconfig-secret
+- name: karmada-config
   secret:
     secretName: {{ .Values.search.kubeconfig }}
 {{- end -}}
@@ -628,7 +627,7 @@ Return the proper Docker Image Registry Secret Names
       # case first installation: no `cm/karmada-version` at first, so when you get it, it means `karmada-static-resource-job` finished.
       # case restart: already has `cm/karmada-version`, which means `karmada-static-resource-job` already finished.
       # case upgrading: already has `cm/karmada-version`, but it may be old version, we should wait until `.data.karmadaVersion` equal to current `.Values.karmadaImageVersion`.
-      while [[ $(kubectl --kubeconfig /etc/kubeconfig get configmap karmada-version -n {{ .Values.systemNamespace }} -o jsonpath='{.data.karmadaVersion}') != {{ .Values.karmadaImageVersion }} ]]; do
+      while [[ $(kubectl --kubeconfig /etc/karmada/config/karmada.config get configmap karmada-version -n {{ .Values.systemNamespace }} -o jsonpath='{.data.karmadaVersion}') != {{ .Values.karmadaImageVersion }} ]]; do
         echo "wait for karmada-static-resource-job finished"; sleep 2
       done
 
diff --git a/charts/karmada/templates/karmada-agent.yaml b/charts/karmada/templates/karmada-agent.yaml
@@ -33,10 +33,10 @@ subjects:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ $name }}-kubeconfig
+  name: {{ $name }}-config
   namespace: {{ include "karmada.namespace" . }}
 stringData:
-  kubeconfig: |-
+  karmada.config: |-
     apiVersion: v1
     kind: Config
     clusters:
@@ -103,7 +103,7 @@ spec:
           imagePullPolicy: {{ .Values.agent.image.pullPolicy }}
           command:
             - /bin/karmada-agent
-            - --karmada-kubeconfig=/etc/kubeconfig/kubeconfig
+            - --karmada-kubeconfig=/etc/karmada/config/karmada.config
             - --cluster-name={{ .Values.agent.clusterName }}
             {{- if .Values.agent.clusterEndpoint }}
             - --cluster-api-endpoint={{ .Values.agent.clusterEndpoint }}
@@ -126,15 +126,15 @@ spec:
               name: metrics
               protocol: TCP
           volumeMounts:
-            - name: kubeconfig
-              mountPath: /etc/kubeconfig
+            - name: karmada-config
+              mountPath: /etc/karmada/config
           resources:
           {{- toYaml .Values.agent.resources | nindent 12 }}
       priorityClassName: {{ .Values.agent.priorityClassName }}
       volumes:
-        - name: kubeconfig
+        - name: karmada-config
           secret:
-            secretName: {{ $name }}-kubeconfig
+            secretName: {{ $name }}-config
 
 {{ if .Values.agent.podDisruptionBudget }}
 ---
diff --git a/charts/karmada/templates/karmada-aggregated-apiserver.yaml b/charts/karmada/templates/karmada-aggregated-apiserver.yaml
@@ -45,9 +45,9 @@ spec:
               readOnly: true
           command:
             - /bin/karmada-aggregated-apiserver
-            - --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
             {{- if eq .Values.etcd.mode "external" }}
             - --etcd-cafile=/etc/etcd/pki/ca.crt
             - --etcd-certfile=/etc/etcd/pki/tls.crt
@@ -99,7 +99,9 @@ spec:
       {{- end }}
       priorityClassName: {{ .Values.aggregatedApiServer.priorityClassName }}
       volumes:
-        {{- include "karmada.kubeconfig.volume" . | nindent 8 }}
+        - name: karmada-config
+          secret:
+            secretName: {{ $name }}-aggregated-apiserver-config
         - name: apiserver-cert
           secret:
             secretName: {{ $name }}-cert
diff --git a/charts/karmada/templates/karmada-controller-manager.yaml b/charts/karmada/templates/karmada-controller-manager.yaml
@@ -43,7 +43,9 @@ spec:
       {{- end }}
       priorityClassName: {{ .Values.controllerManager.priorityClassName }}
       volumes:
-      {{- include "karmada.kubeconfig.volume" . | nindent 8 }}
+        - name: karmada-config
+          secret:
+            secretName: {{ $name }}-controller-manager-config
       initContainers:
         {{- include "karmada.initContainer.waitStaticResource" . | nindent 8 }}
       containers:
@@ -52,7 +54,7 @@ spec:
           imagePullPolicy: {{ .Values.controllerManager.image.pullPolicy }}
           command:
             - /bin/karmada-controller-manager
-            - --kubeconfig=/etc/kubeconfig
+            - --kubeconfig=/etc/karmada/config/karmada.config
             - --cluster-status-update-frequency=10s
             - --leader-elect-resource-namespace={{ $systemNamespace }}
             - --health-probe-bind-address=0.0.0.0:10357
diff --git a/charts/karmada/templates/karmada-descheduler.yaml b/charts/karmada/templates/karmada-descheduler.yaml
@@ -49,7 +49,7 @@ spec:
           imagePullPolicy: {{ .Values.descheduler.image.pullPolicy }}
           command:
             - /bin/karmada-descheduler
-            - --kubeconfig=/etc/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 }}
diff --git a/charts/karmada/templates/karmada-kubeconfig.yaml b/charts/karmada/templates/karmada-kubeconfig.yaml
@@ -3,10 +3,10 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ $name }}-kubeconfig
+  name: {{ $name }}-config
   namespace: {{ include "karmada.namespace" . }}
 stringData:
-  kubeconfig: |-
+  karmada.config: |-
     apiVersion: v1
     kind: Config
     clusters:
diff --git a/charts/karmada/templates/karmada-metrics-adapter.yaml b/charts/karmada/templates/karmada-metrics-adapter.yaml
@@ -43,10 +43,10 @@ spec:
               readOnly: true
           command:
             - /bin/karmada-metrics-adapter
-            - --kubeconfig=/etc/kubeconfig
+            - --kubeconfig=/etc/karmada/config/karmada.config
             - --metrics-bind-address=:8080
-            - --authentication-kubeconfig=/etc/kubeconfig
-            - --authorization-kubeconfig=/etc/kubeconfig
+            - --authentication-kubeconfig=/etc/karmada/config/karmada.config
+            - --authorization-kubeconfig=/etc/karmada/config/karmada.config
             - --tls-cert-file=/etc/kubernetes/pki/karmada.crt
             - --tls-private-key-file=/etc/kubernetes/pki/karmada.key
             - --audit-log-path=-
@@ -85,7 +85,9 @@ spec:
       {{- end }}
       priorityClassName: {{ .Values.metricsAdapter.priorityClassName }}
       volumes:
-        {{- include "karmada.kubeconfig.volume" . | nindent 8 }}
+        - name: karmada-config
+          secret:
+            secretName: {{ $name }}-metrics-adapter-config
         - name: apiserver-cert
           secret:
             secretName: {{ $name }}-cert
diff --git a/charts/karmada/templates/karmada-scheduler.yaml b/charts/karmada/templates/karmada-scheduler.yaml
@@ -49,7 +49,7 @@ spec:
           imagePullPolicy: {{ .Values.scheduler.image.pullPolicy }}
           command:
             - /bin/karmada-scheduler
-            - --kubeconfig=/etc/kubeconfig
+            - --kubeconfig=/etc/karmada/config/karmada.config
             - --metrics-bind-address=0.0.0.0:8080
             - --health-probe-bind-address=0.0.0.0:10351
             - --leader-elect-resource-namespace={{ $systemNamespace }}
@@ -78,7 +78,9 @@ spec:
           {{- toYaml .Values.scheduler.resources | nindent 12 }}
       priorityClassName: {{ .Values.scheduler.priorityClassName }}
       volumes:
-      {{- include "karmada.kubeconfig.volume" . | nindent 8 }}
+        - name: karmada-config
+          secret:
+            secretName: {{ $name }}-scheduler-config
       {{- include "karmada.scheduler.cert.volume" . | nindent 8 }}
 
 {{ if .Values.scheduler.podDisruptionBudget }}
diff --git a/charts/karmada/templates/karmada-search.yaml b/charts/karmada/templates/karmada-search.yaml
@@ -53,14 +53,13 @@ spec:
             - name: etcd-certs
               mountPath: /etc/etcd/pki
               readOnly: true
-            - name: kubeconfig-secret
-              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
             {{- if eq .Values.etcd.mode "external" }}
             - --etcd-cafile=/etc/etcd/pki/ca.crt
             - --etcd-certfile=/etc/etcd/pki/tls.crt
@@ -160,7 +159,7 @@ spec:
             - |
               bash <<'EOF'
               set -ex
-              kubectl apply -f /search-apiservice --kubeconfig /etc/kubeconfig
+              kubectl apply -f /search-apiservice --kubeconfig /etc/karmada/config/karmada.config
               EOF
           volumeMounts:
             - name: {{ $name }}-search-apiservice
diff --git a/charts/karmada/templates/karmada-static-resource-job.yaml b/charts/karmada/templates/karmada-static-resource-job.yaml
@@ -42,11 +42,11 @@ spec:
           bash <<'EOF'
           set -ex
           kubectl rollout status deployment {{ $name }}-apiserver -n {{ $namespace }}
-          kubectl apply -k /crds --kubeconfig /etc/kubeconfig
-          kubectl apply -f /static-resources/system-namespace.yaml --kubeconfig /etc/kubeconfig
-          kubectl apply -f /static-resources/ --kubeconfig /etc/kubeconfig
+          kubectl apply -k /crds --kubeconfig /etc/karmada/config/karmada.config
+          kubectl apply -f /static-resources/system-namespace.yaml --kubeconfig /etc/karmada/config/karmada.config
+          kubectl apply -f /static-resources/ --kubeconfig /etc/karmada/config/karmada.config
 
-          kubectl --kubeconfig /etc/kubeconfig apply -f - <<InnerEOF
+          kubectl --kubeconfig /etc/karmada/config/karmada.config apply -f - <<InnerEOF
           apiVersion: v1
           kind: ConfigMap
           metadata:
diff --git a/charts/karmada/templates/karmada-webhook.yaml b/charts/karmada/templates/karmada-webhook.yaml
@@ -49,7 +49,7 @@ spec:
           imagePullPolicy: {{ .Values.webhook.image.pullPolicy }}
           command:
             - /bin/karmada-webhook
-            - --kubeconfig=/etc/kubeconfig
+            - --kubeconfig=/etc/karmada/config/karmada.config
             - --bind-address=0.0.0.0
             - --secure-port=8443
             - --cert-dir=/var/serving-cert
@@ -72,7 +72,9 @@ spec:
           {{- toYaml .Values.webhook.resources | nindent 12 }}
       priorityClassName: {{ .Values.webhook.priorityClassName }}
       volumes:
-      {{- include "karmada.kubeconfig.volume" . | nindent 8 }}
+        - name: karmada-config
+          secret:
+            secretName: {{ $name }}-webhook-config
         - name: {{ $name }}-webhook-cert-secret
           secret:
             secretName: {{ $name }}-webhook-cert
diff --git a/charts/karmada/templates/kube-controller-manager.yaml b/charts/karmada/templates/kube-controller-manager.yaml
@@ -47,16 +47,16 @@ spec:
         - command:
             - kube-controller-manager
             - --allocate-node-cidrs=true
-            - --authentication-kubeconfig=/etc/kubeconfig
-            - --authorization-kubeconfig=/etc/kubeconfig
+            - --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/server-ca.crt
             - --cluster-cidr={{ .Values.kubeControllerManager.clusterCIDR }}
             - --cluster-name=karmada
             - --cluster-signing-cert-file=/etc/karmada/pki/server-ca.crt
             - --cluster-signing-key-file=/etc/karmada/pki/server-ca.key
             - --controllers={{ .Values.kubeControllerManager.controllers }}
-            - --kubeconfig=/etc/kubeconfig
+            - --kubeconfig=/etc/karmada/config/karmada.config
             - --leader-elect=true
             - --node-cidr-mask-size=24
             - --root-ca-file=/etc/karmada/pki/server-ca.crt
@@ -89,7 +89,9 @@ spec:
         - name: apiserver-cert
           secret:
             secretName: {{ $name }}-cert
-        {{- include "karmada.kubeconfig.volume" . | nindent 8 }}
+        - name: karmada-config
+          secret:
+            secretName: {{ $name }}-kube-controller-manager-config
 
 {{ if .Values.kubeControllerManager.podDisruptionBudget }}
 ---
diff --git a/charts/karmada/templates/pre-install-job.yaml b/charts/karmada/templates/pre-install-job.yaml
@@ -279,14 +279,42 @@ data:
         {{ print "{{ crt }}" }}
       tls.key: |-
         {{ print "{{ key }}" }}
+  {{- range .Values.kubeconfigComponents }}
+  {{ . }}-kubeconfig.yaml: |- 
+    apiVersion: v1
+    kind: Secret
+    metadata:
+      name: {{ $name }}-{{ . }}-config
+      namespace: {{ $namespace }}
+    stringData:
+      karmada.config: |-
+        apiVersion: v1
+        kind: Config
+        clusters:
+          - cluster:
+              certificate-authority-data: {{ print "{{ ca_crt }}" }}
+              server: https://{{ $name }}-apiserver.{{ $namespace }}.svc.{{ $.Values.clusterDomain }}:5443
+            name: {{ $name }}-apiserver
+        users:
+          - user:
+              client-certificate-data: {{ print "{{ crt }}" }}
+              client-key-data: {{ print "{{ key }}" }}
+            name: {{ $name }}-apiserver
+        contexts:
+          - context:
+              cluster: {{ $name }}-apiserver
+              user: {{ $name }}-apiserver
+            name: {{ $name }}-apiserver
+        current-context: {{ $name }}-apiserver
+  {{- end }}
   kubeconfig.yaml: |-
     apiVersion: v1
     kind: Secret
     metadata:
-      name: {{ $name }}-kubeconfig
+      name: {{ $name }}-config
       namespace: {{ $namespace }}
     stringData:
-      kubeconfig: |-
+      karmada.config: |-
         apiVersion: v1
         kind: Config
         clusters:
@@ -415,6 +443,11 @@ spec:
           sed -i'' -e "s/{{ print "{{ key }}" }}/${karmada_key}/g" /opt/configs/webhook-cert.yaml
           sed -i'' -e "s/{{ print "{{ ca_crt }}" }}/${karmada_ca}/g" /opt/configs/static-resources-configmaps.yaml
           sed -i'' -e "s/{{ print "{{ ca_crt }}" }}/${karmada_ca}/g" /opt/configs/crds-patches-configmaps.yaml
+          {{- range .Values.kubeconfigComponents }}
+          sed -i'' -e "s/{{ print "{{ ca_crt }}" }}/${karmada_ca}/g" /opt/configs/{{ . }}-kubeconfig.yaml
+          sed -i'' -e "s/{{ print "{{ crt }}" }}/${karmada_crt}/g" /opt/configs/{{ . }}-kubeconfig.yaml
+          sed -i'' -e "s/{{ print "{{ key }}" }}/${karmada_key}/g" /opt/configs/{{ . }}-kubeconfig.yaml
+          {{- end }}
           EOF
         volumeMounts:
         - name: mount
diff --git a/charts/karmada/values.yaml b/charts/karmada/values.yaml
