Skip to content

Commit 8acb959

Browse files
seanlaiiseanlaii
committed
Standardize the naming of karmada config in Karmada Operator
Signed-off-by: wei-chenglai <[email protected]>
1 parent d24b2b9 commit 8acb959

File tree

18 files changed

+136
-82
lines changed

18 files changed

+136
-82
lines changed

‎operator/pkg/controlplane/apiserver/apiserver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func installKarmadaAggregatedAPIServer(client clientset.Interface, cfg *operator
124124
Namespace: namespace,
125125
Image: cfg.Image.Name(),
126126
ImagePullPolicy: string(cfg.ImagePullPolicy),
127-
KubeconfigSecret: util.AdminKubeconfigSecretName(name),
127+
KubeconfigSecret: util.ComponentKubeconfigSecretName(util.KarmadaAggregatedAPIServerName(name)),
128128
KarmadaCertsSecret: util.KarmadaCertSecretName(name),
129129
Replicas: cfg.Replicas,
130130
})

‎operator/pkg/controlplane/apiserver/apiserver_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ func verifyAggregatedAPIServerDeploymentAdditionalDetails(featureGates map[strin
415415
for _, volume := range deployment.Spec.Template.Spec.Volumes {
416416
extractedSecrets = append(extractedSecrets, volume.Secret.SecretName)
417417
}
418-
expectedSecrets := []string{util.AdminKubeconfigSecretName(expectedDeploymentName), util.KarmadaCertSecretName(expectedDeploymentName), util.EtcdCertSecretName(expectedDeploymentName)}
418+
expectedSecrets := []string{util.ComponentKubeconfigSecretName(util.KarmadaAggregatedAPIServerName(expectedDeploymentName)), util.KarmadaCertSecretName(expectedDeploymentName), util.EtcdCertSecretName(expectedDeploymentName)}
419419
for _, expectedSecret := range expectedSecrets {
420420
if !contains(extractedSecrets, expectedSecret) {
421421
return fmt.Errorf("expected secret '%s' not found in extracted secrets", expectedSecret)

‎operator/pkg/controlplane/apiserver/manifests.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,24 +163,23 @@ spec:
163163
imagePullPolicy: {{ .ImagePullPolicy }}
164164
command:
165165
- /bin/karmada-aggregated-apiserver
166-
- --kubeconfig=/etc/karmada/kubeconfig
167-
- --authentication-kubeconfig=/etc/karmada/kubeconfig
168-
- --authorization-kubeconfig=/etc/karmada/kubeconfig
166+
- --kubeconfig=/etc/karmada/config/karmada.config
167+
- --authentication-kubeconfig=/etc/karmada/config/karmada.config
168+
- --authorization-kubeconfig=/etc/karmada/config/karmada.config
169169
- --tls-cert-file=/etc/karmada/pki/karmada.crt
170170
- --tls-private-key-file=/etc/karmada/pki/karmada.key
171171
- --tls-min-version=VersionTLS13
172172
- --audit-log-path=-
173173
- --audit-log-maxage=0
174174
- --audit-log-maxbackup=0
175175
volumeMounts:
176-
- mountPath: /etc/karmada/kubeconfig
177-
name: kubeconfig
178-
subPath: kubeconfig
176+
- mountPath: /etc/karmada/config
177+
name: karmada-config
179178
- mountPath: /etc/karmada/pki
180179
name: apiserver-cert
181180
readOnly: true
182181
volumes:
183-
- name: kubeconfig
182+
- name: karmada-config
184183
secret:
185184
secretName: {{ .KubeconfigSecret }}
186185
- name: apiserver-cert

‎operator/pkg/controlplane/controlplane.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func getKubeControllerManagerManifest(name, namespace string, cfg *operatorv1alp
9393
Image: cfg.Image.Name(),
9494
ImagePullPolicy: string(cfg.ImagePullPolicy),
9595
KarmadaCertsSecret: util.KarmadaCertSecretName(name),
96-
KubeconfigSecret: util.AdminKubeconfigSecretName(name),
96+
KubeconfigSecret: util.ComponentKubeconfigSecretName(util.KubeControllerManagerName(name)),
9797
Replicas: cfg.Replicas,
9898
})
9999
if err != nil {
@@ -121,7 +121,7 @@ func getKarmadaControllerManagerManifest(name, namespace string, featureGates ma
121121
SystemNamespace: constants.KarmadaSystemNamespace,
122122
Image: cfg.Image.Name(),
123123
ImagePullPolicy: string(cfg.ImagePullPolicy),
124-
KubeconfigSecret: util.AdminKubeconfigSecretName(name),
124+
KubeconfigSecret: util.ComponentKubeconfigSecretName(util.KarmadaControllerManagerName(name)),
125125
Replicas: cfg.Replicas,
126126
})
127127
if err != nil {
@@ -149,7 +149,7 @@ func getKarmadaSchedulerManifest(name, namespace string, featureGates map[string
149149
SystemNamespace: constants.KarmadaSystemNamespace,
150150
Image: cfg.Image.Name(),
151151
ImagePullPolicy: string(cfg.ImagePullPolicy),
152-
KubeconfigSecret: util.AdminKubeconfigSecretName(name),
152+
KubeconfigSecret: util.ComponentKubeconfigSecretName(util.KarmadaSchedulerName(name)),
153153
KarmadaCertsSecret: util.KarmadaCertSecretName(name),
154154
Replicas: cfg.Replicas,
155155
})
@@ -178,7 +178,7 @@ func getKarmadaDeschedulerManifest(name, namespace string, featureGates map[stri
178178
SystemNamespace: constants.KarmadaSystemNamespace,
179179
Image: cfg.Image.Name(),
180180
ImagePullPolicy: string(cfg.ImagePullPolicy),
181-
KubeconfigSecret: util.AdminKubeconfigSecretName(name),
181+
KubeconfigSecret: util.ComponentKubeconfigSecretName(util.KarmadaDeschedulerName(name)),
182182
KarmadaCertsSecret: util.KarmadaCertSecretName(name),
183183
Replicas: cfg.Replicas,
184184
})

‎operator/pkg/controlplane/controlplane_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ func TestGetKubeControllerManagerManifest(t *testing.T) {
165165
}
166166

167167
expectedSecrets := []string{
168-
util.AdminKubeconfigSecretName(name),
168+
util.ComponentKubeconfigSecretName(util.KubeControllerManagerName(name)),
169169
util.KarmadaCertSecretName(name),
170170
}
171171
err = verifySecrets(deployment, expectedSecrets)
@@ -222,7 +222,7 @@ func TestGetKarmadaControllerManagerManifest(t *testing.T) {
222222
t.Errorf("failed to verify karmada controller manager system namespace: %v", err)
223223
}
224224

225-
expectedSecrets := []string{util.AdminKubeconfigSecretName(name)}
225+
expectedSecrets := []string{util.ComponentKubeconfigSecretName(util.KarmadaControllerManagerName(name))}
226226
err = verifySecrets(deployment, expectedSecrets)
227227
if err != nil {
228228
t.Errorf("failed to verify karmada controller manager secrets: %v", err)
@@ -279,7 +279,7 @@ func TestGetKarmadaSchedulerManifest(t *testing.T) {
279279
}
280280

281281
expectedSecrets := []string{
282-
util.AdminKubeconfigSecretName(name),
282+
util.ComponentKubeconfigSecretName(util.KarmadaSchedulerName(name)),
283283
util.KarmadaCertSecretName(name),
284284
}
285285
err = verifySecrets(deployment, expectedSecrets)
@@ -338,7 +338,7 @@ func TestGetKarmadaDeschedulerManifest(t *testing.T) {
338338
}
339339

340340
expectedSecrets := []string{
341-
util.AdminKubeconfigSecretName(name),
341+
util.ComponentKubeconfigSecretName(util.KarmadaDeschedulerName(name)),
342342
util.KarmadaCertSecretName(name),
343343
}
344344
err = verifySecrets(deployment, expectedSecrets)

‎operator/pkg/controlplane/manifests.go

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ spec:
5555
command:
5656
- kube-controller-manager
5757
- --allocate-node-cidrs=true
58-
- --kubeconfig=/etc/karmada/kubeconfig
59-
- --authentication-kubeconfig=/etc/karmada/kubeconfig
60-
- --authorization-kubeconfig=/etc/karmada/kubeconfig
58+
- --kubeconfig=/etc/karmada/config/karmada.config
59+
- --authentication-kubeconfig=/etc/karmada/config/karmada.config
60+
- --authorization-kubeconfig=/etc/karmada/config/karmada.config
6161
- --bind-address=0.0.0.0
6262
- --client-ca-file=/etc/karmada/pki/ca.crt
6363
- --cluster-cidr=10.244.0.0/16
@@ -86,14 +86,13 @@ spec:
8686
- name: karmada-certs
8787
mountPath: /etc/karmada/pki
8888
readOnly: true
89-
- name: kubeconfig
90-
mountPath: /etc/karmada/kubeconfig
91-
subPath: kubeconfig
89+
- name: karmada-config
90+
mountPath: /etc/karmada/config
9291
volumes:
9392
- name: karmada-certs
9493
secret:
9594
secretName: {{ .KarmadaCertsSecret }}
96-
- name: kubeconfig
95+
- name: karmada-config
9796
secret:
9897
secretName: {{ .KubeconfigSecret }}
9998
`
@@ -127,7 +126,7 @@ spec:
127126
imagePullPolicy: {{ .ImagePullPolicy }}
128127
command:
129128
- /bin/karmada-controller-manager
130-
- --kubeconfig=/etc/karmada/kubeconfig
129+
- --kubeconfig=/etc/karmada/config/karmada.config
131130
- --metrics-bind-address=:8080
132131
- --cluster-status-update-frequency=10s
133132
- --failover-eviction-timeout=30s
@@ -148,11 +147,10 @@ spec:
148147
name: metrics
149148
protocol: TCP
150149
volumeMounts:
151-
- name: kubeconfig
152-
subPath: kubeconfig
153-
mountPath: /etc/karmada/kubeconfig
150+
- name: karmada-config
151+
mountPath: /etc/karmada/config
154152
volumes:
155-
- name: kubeconfig
153+
- name: karmada-config
156154
secret:
157155
secretName: {{ .KubeconfigSecret }}
158156
`
@@ -187,7 +185,7 @@ spec:
187185
imagePullPolicy: {{ .ImagePullPolicy }}
188186
command:
189187
- /bin/karmada-scheduler
190-
- --kubeconfig=/etc/karmada/kubeconfig
188+
- --kubeconfig=/etc/karmada/config/karmada.config
191189
- --metrics-bind-address=0.0.0.0:8080
192190
- --health-probe-bind-address=0.0.0.0:10351
193191
- --enable-scheduler-estimator=true
@@ -213,14 +211,13 @@ spec:
213211
- name: karmada-certs
214212
mountPath: /etc/karmada/pki
215213
readOnly: true
216-
- name: kubeconfig
217-
subPath: kubeconfig
218-
mountPath: /etc/karmada/kubeconfig
214+
- name: karmada-config
215+
mountPath: /etc/karmada/config
219216
volumes:
220217
- name: karmada-certs
221218
secret:
222219
secretName: {{ .KarmadaCertsSecret }}
223-
- name: kubeconfig
220+
- name: karmada-config
224221
secret:
225222
secretName: {{ .KubeconfigSecret }}
226223
`
@@ -255,7 +252,7 @@ spec:
255252
imagePullPolicy: {{ .ImagePullPolicy }}
256253
command:
257254
- /bin/karmada-descheduler
258-
- --kubeconfig=/etc/karmada/kubeconfig
255+
- --kubeconfig=/etc/karmada/config/karmada.config
259256
- --metrics-bind-address=0.0.0.0:8080
260257
- --health-probe-bind-address=0.0.0.0:10358
261258
- --leader-elect-resource-namespace={{ .SystemNamespace }}
@@ -280,14 +277,13 @@ spec:
280277
- name: karmada-certs
281278
mountPath: /etc/karmada/pki
282279
readOnly: true
283-
- name: kubeconfig
284-
subPath: kubeconfig
285-
mountPath: /etc/karmada/kubeconfig
280+
- name: karmada-config
281+
mountPath: /etc/karmada/config
286282
volumes:
287283
- name: karmada-certs
288284
secret:
289285
secretName: {{ .KarmadaCertsSecret }}
290-
- name: kubeconfig
286+
- name: karmada-config
291287
secret:
292288
secretName: {{ .KubeconfigSecret }}
293289
`

‎operator/pkg/controlplane/metricsadapter/manifests.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ spec:
4747
imagePullPolicy: {{ .ImagePullPolicy }}
4848
command:
4949
- /bin/karmada-metrics-adapter
50-
- --kubeconfig=/etc/karmada/kubeconfig
50+
- --kubeconfig=/etc/karmada/config/karmada.config
5151
- --metrics-bind-address=:8080
52-
- --authentication-kubeconfig=/etc/karmada/kubeconfig
53-
- --authorization-kubeconfig=/etc/karmada/kubeconfig
52+
- --authentication-kubeconfig=/etc/karmada/config/karmada.config
53+
- --authorization-kubeconfig=/etc/karmada/config/karmada.config
5454
- --client-ca-file=/etc/karmada/pki/ca.crt
5555
- --tls-cert-file=/etc/karmada/pki/karmada.crt
5656
- --tls-private-key-file=/etc/karmada/pki/karmada.key
@@ -59,9 +59,8 @@ spec:
5959
- --audit-log-maxage=0
6060
- --audit-log-maxbackup=0
6161
volumeMounts:
62-
- name: kubeconfig
63-
subPath: kubeconfig
64-
mountPath: /etc/karmada/kubeconfig
62+
- name: karmada-config
63+
mountPath: /etc/karmada/config
6564
- name: karmada-cert
6665
mountPath: /etc/karmada/pki
6766
readOnly: true
@@ -87,7 +86,7 @@ spec:
8786
requests:
8887
cpu: 100m
8988
volumes:
90-
- name: kubeconfig
89+
- name: karmada-config
9190
secret:
9291
secretName: {{ .KubeconfigSecret }}
9392
- name: karmada-cert

‎operator/pkg/controlplane/metricsadapter/metricsadapter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func installKarmadaMetricAdapter(client clientset.Interface, cfg *operatorv1alph
5151
Image: cfg.Image.Name(),
5252
ImagePullPolicy: string(cfg.ImagePullPolicy),
5353
Replicas: cfg.Replicas,
54-
KubeconfigSecret: util.AdminKubeconfigSecretName(name),
54+
KubeconfigSecret: util.ComponentKubeconfigSecretName(util.KarmadaMetricsAdapterName(name)),
5555
KarmadaCertsSecret: util.KarmadaCertSecretName(name),
5656
})
5757
if err != nil {

‎operator/pkg/controlplane/metricsadapter/metricsadapter_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ func verifyDeploymentDetails(deployment *appsv1.Deployment, replicas int32, imag
213213
extractedSecrets = append(extractedSecrets, volume.Secret.SecretName)
214214
}
215215
expectedSecrets := []string{
216-
util.AdminKubeconfigSecretName(name),
216+
util.ComponentKubeconfigSecretName(util.KarmadaMetricsAdapterName(name)),
217217
util.KarmadaCertSecretName(name),
218218
}
219219
for _, expectedSecret := range expectedSecrets {

‎operator/pkg/controlplane/search/manifests.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,13 @@ spec:
4949
- name: k8s-certs
5050
mountPath: /etc/karmada/pki
5151
readOnly: true
52-
- name: kubeconfig
53-
subPath: kubeconfig
54-
mountPath: /etc/kubeconfig
52+
- name: karmada-config
53+
mountPath: /etc/karmada/config
5554
command:
5655
- /bin/karmada-search
57-
- --kubeconfig=/etc/kubeconfig
58-
- --authentication-kubeconfig=/etc/kubeconfig
59-
- --authorization-kubeconfig=/etc/kubeconfig
56+
- --kubeconfig=/etc/karmada/config/karmada.config
57+
- --authentication-kubeconfig=/etc/karmada/config/karmada.config
58+
- --authorization-kubeconfig=/etc/karmada/config/karmada.config
6059
- --tls-cert-file=/etc/karmada/pki/karmada.crt
6160
- --tls-private-key-file=/etc/karmada/pki/karmada.key
6261
- --tls-min-version=VersionTLS13
@@ -79,7 +78,7 @@ spec:
7978
- name: k8s-certs
8079
secret:
8180
secretName: {{ .KarmadaCertsSecret }}
82-
- name: kubeconfig
81+
- name: karmada-config
8382
secret:
8483
secretName: {{ .KubeconfigSecret }}
8584
`

‎operator/pkg/controlplane/search/search.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func installKarmadaSearch(client clientset.Interface, cfg *operatorv1alpha1.Karm
5353
ImagePullPolicy: string(cfg.ImagePullPolicy),
5454
KarmadaCertsSecret: util.KarmadaCertSecretName(name),
5555
Replicas: cfg.Replicas,
56-
KubeconfigSecret: util.AdminKubeconfigSecretName(name),
56+
KubeconfigSecret: util.ComponentKubeconfigSecretName(util.KarmadaSearchName(name)),
5757
})
5858
if err != nil {
5959
return fmt.Errorf("error when parsing KarmadaSearch Deployment template: %w", err)

‎operator/pkg/controlplane/search/search_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ func verifySecrets(deployment *appsv1.Deployment, name string) error {
236236
extractedSecrets = append(extractedSecrets, volume.Secret.SecretName)
237237
}
238238
expectedSecrets := []string{
239-
util.AdminKubeconfigSecretName(name),
239+
util.ComponentKubeconfigSecretName(util.KarmadaSearchName(name)),
240240
util.KarmadaCertSecretName(name),
241241
}
242242
for _, expectedSecret := range expectedSecrets {

‎operator/pkg/controlplane/webhook/manifests.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
imagePullPolicy: {{ .ImagePullPolicy }}
4848
command:
4949
- /bin/karmada-webhook
50-
- --kubeconfig=/etc/karmada/kubeconfig
50+
- --kubeconfig=/etc/karmada/config/karmada.config
5151
- --bind-address=0.0.0.0
5252
- --metrics-bind-address=:8080
5353
- --default-not-ready-toleration-seconds=30
@@ -61,9 +61,8 @@ spec:
6161
name: metrics
6262
protocol: TCP
6363
volumeMounts:
64-
- name: kubeconfig
65-
subPath: kubeconfig
66-
mountPath: /etc/karmada/kubeconfig
64+
- name: karmada-config
65+
mountPath: /etc/karmada/config
6766
- name: cert
6867
mountPath: /var/serving-cert
6968
readOnly: true
@@ -73,7 +72,7 @@ spec:
7372
port: 8443
7473
scheme: HTTPS
7574
volumes:
76-
- name: kubeconfig
75+
- name: karmada-config
7776
secret:
7877
secretName: {{ .KubeconfigSecret }}
7978
- name: cert

‎operator/pkg/controlplane/webhook/webhook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func installKarmadaWebhook(client clientset.Interface, cfg *operatorv1alpha1.Kar
5151
Image: cfg.Image.Name(),
5252
ImagePullPolicy: string(cfg.ImagePullPolicy),
5353
Replicas: cfg.Replicas,
54-
KubeconfigSecret: util.AdminKubeconfigSecretName(name),
54+
KubeconfigSecret: util.ComponentKubeconfigSecretName(util.KarmadaWebhookName(name)),
5555
WebhookCertsSecret: util.WebhookCertSecretName(name),
5656
})
5757
if err != nil {

‎operator/pkg/controlplane/webhook/webhook_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ func verifySecrets(deployment *appsv1.Deployment, name string) error {
226226
extractedSecrets = append(extractedSecrets, volume.Secret.SecretName)
227227
}
228228
expectedSecrets := []string{
229-
util.AdminKubeconfigSecretName(name),
229+
util.ComponentKubeconfigSecretName(util.KarmadaWebhookName(name)),
230230
util.WebhookCertSecretName(name),
231231
}
232232
for _, expectedSecret := range expectedSecrets {

0 commit comments

Comments
 (0)