Skip to content

Commit 1e3d8c0

Browse files
seanlaiiseanlaii
committed
Standardize the naming of karmada config in Karmada Operator
Signed-off-by: wei-chenglai <qazwsx0939059006@gmail.com>
1 parent d80b7d4 commit 1e3d8c0

File tree

22 files changed

+147
-93
lines changed

22 files changed

+147
-93
lines changed

‎hack/deploy-karmada-by-operator.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ kubectl --kubeconfig="${HOST_CLUSTER_KUBECONFIG}" --context="${CONTEXT_NAME}" ap
111111
kubectl --kubeconfig="${HOST_CLUSTER_KUBECONFIG}" --context="${CONTEXT_NAME}" wait --for=condition=Ready --timeout=1000s karmada ${KARMADA_INSTANCE_NAME} -n ${KARMADA_INSTANCE_NAMESPACE}
112112

113113
# generate kubeconfig for karmada instance
114-
kubectl --kubeconfig="${HOST_CLUSTER_KUBECONFIG}" --context="${CONTEXT_NAME}" get secret -n ${KARMADA_INSTANCE_NAMESPACE} ${KARMADA_INSTANCE_NAME}-admin-config -o jsonpath={.data.kubeconfig} | base64 -d > ~/.kube/${KARMADA_INSTANCE_NAME}-${KARMADA_INSTANCE_NAMESPACE}-tmp-apiserver.config
114+
kubectl --kubeconfig="${HOST_CLUSTER_KUBECONFIG}" --context="${CONTEXT_NAME}" get secret -n ${KARMADA_INSTANCE_NAMESPACE} ${KARMADA_INSTANCE_NAME}-admin-config -o jsonpath='{.data.karmada\.config}' | base64 -d > ~/.kube/${KARMADA_INSTANCE_NAME}-${KARMADA_INSTANCE_NAMESPACE}-tmp-apiserver.config
115115
cat ~/.kube/${KARMADA_INSTANCE_NAME}-${KARMADA_INSTANCE_NAMESPACE}-tmp-apiserver.config| grep "certificate-authority-data"| awk '{print $2}'| base64 -d > ${CERT_DIR}/ca.crt
116116
cat ~/.kube/${KARMADA_INSTANCE_NAME}-${KARMADA_INSTANCE_NAMESPACE}-tmp-apiserver.config| grep "client-certificate-data"| awk '{print $2}'| base64 -d > ${CERT_DIR}/karmada.crt
117117
cat ~/.kube/${KARMADA_INSTANCE_NAME}-${KARMADA_INSTANCE_NAMESPACE}-tmp-apiserver.config| grep "client-key-data"| awk '{print $2}'| base64 -d > ${CERT_DIR}/karmada.key

‎operator/pkg/controller/karmada/planner.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,15 +159,15 @@ func (p *Planner) afterRunJob() error {
159159
return fmt.Errorf("error when creating cluster client to install karmada, err: %w", err)
160160
}
161161

162-
secret, err := remoteClient.CoreV1().Secrets(p.karmada.GetNamespace()).Get(context.TODO(), util.AdminKubeconfigSecretName(p.karmada.GetName()), metav1.GetOptions{})
162+
secret, err := remoteClient.CoreV1().Secrets(p.karmada.GetNamespace()).Get(context.TODO(), util.AdminKarmadaConfigSecretName(p.karmada.GetName()), metav1.GetOptions{})
163163
if err != nil {
164164
return err
165165
}
166166

167167
_, err = localClusterClient.CoreV1().Secrets(p.karmada.GetNamespace()).Create(context.TODO(), &corev1.Secret{
168168
ObjectMeta: metav1.ObjectMeta{
169169
Namespace: p.karmada.GetNamespace(),
170-
Name: util.AdminKubeconfigSecretName(p.karmada.GetName()),
170+
Name: util.AdminKarmadaConfigSecretName(p.karmada.GetName()),
171171
},
172172
Data: secret.Data,
173173
}, metav1.CreateOptions{})
@@ -178,7 +178,7 @@ func (p *Planner) afterRunJob() error {
178178

179179
p.karmada.Status.SecretRef = &operatorv1alpha1.LocalSecretReference{
180180
Namespace: p.karmada.GetNamespace(),
181-
Name: util.AdminKubeconfigSecretName(p.karmada.GetName()),
181+
Name: util.AdminKarmadaConfigSecretName(p.karmada.GetName()),
182182
}
183183
p.karmada.Status.APIServerService = &operatorv1alpha1.APIServerService{
184184
Name: util.KarmadaAPIServerName(p.karmada.GetName()),

‎operator/pkg/controller/karmada/planner_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ func TestAfterRunJob(t *testing.T) {
244244
config: &rest.Config{},
245245
action: InitAction,
246246
verify: func(karmada *operatorv1alpha1.Karmada, planner *Planner, action Action) error {
247-
secretRefNameExpected := util.AdminKubeconfigSecretName(karmada.GetName())
247+
secretRefNameExpected := util.AdminKarmadaConfigSecretName(karmada.GetName())
248248
if planner.karmada.Status.SecretRef == nil {
249249
return fmt.Errorf("expected SecretRef to be set, but got nil")
250250
}

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ func verifyAggregatedAPIServerDeploymentAdditionalDetails(featureGates map[strin
423423
for _, volume := range deployment.Spec.Template.Spec.Volumes {
424424
extractedSecrets = append(extractedSecrets, volume.Secret.SecretName)
425425
}
426-
expectedSecrets := []string{util.AdminKubeconfigSecretName(expectedDeploymentName), util.KarmadaCertSecretName(expectedDeploymentName), util.EtcdCertSecretName(expectedDeploymentName)}
426+
expectedSecrets := []string{util.ComponentKarmadaConfigSecretName(util.KarmadaAggregatedAPIServerName(expectedDeploymentName)), util.KarmadaCertSecretName(expectedDeploymentName), util.EtcdCertSecretName(expectedDeploymentName)}
427427
for _, expectedSecret := range expectedSecrets {
428428
if !contains(extractedSecrets, expectedSecret) {
429429
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
@@ -162,24 +162,23 @@ spec:
162162
imagePullPolicy: {{ .ImagePullPolicy }}
163163
command:
164164
- /bin/karmada-aggregated-apiserver
165-
- --kubeconfig=/etc/karmada/kubeconfig
166-
- --authentication-kubeconfig=/etc/karmada/kubeconfig
167-
- --authorization-kubeconfig=/etc/karmada/kubeconfig
165+
- --kubeconfig=/etc/karmada/config/karmada.config
166+
- --authentication-kubeconfig=/etc/karmada/config/karmada.config
167+
- --authorization-kubeconfig=/etc/karmada/config/karmada.config
168168
- --tls-cert-file=/etc/karmada/pki/karmada.crt
169169
- --tls-private-key-file=/etc/karmada/pki/karmada.key
170170
- --tls-min-version=VersionTLS13
171171
- --audit-log-path=-
172172
- --audit-log-maxage=0
173173
- --audit-log-maxbackup=0
174174
volumeMounts:
175-
- mountPath: /etc/karmada/kubeconfig
176-
name: kubeconfig
177-
subPath: kubeconfig
175+
- name: karmada-config
176+
mountPath: /etc/karmada/config
178177
- mountPath: /etc/karmada/pki
179178
name: apiserver-cert
180179
readOnly: true
181180
volumes:
182-
- name: kubeconfig
181+
- name: karmada-config
183182
secret:
184183
secretName: {{ .KubeconfigSecret }}
185184
- 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.ComponentKarmadaConfigSecretName(util.KubeControllerManagerName(name)),
9797
Replicas: cfg.Replicas,
9898
})
9999
if err != nil {
@@ -122,7 +122,7 @@ func getKarmadaControllerManagerManifest(name, namespace string, featureGates ma
122122
SystemNamespace: constants.KarmadaSystemNamespace,
123123
Image: cfg.Image.Name(),
124124
ImagePullPolicy: string(cfg.ImagePullPolicy),
125-
KubeconfigSecret: util.AdminKubeconfigSecretName(name),
125+
KubeconfigSecret: util.ComponentKarmadaConfigSecretName(util.KarmadaControllerManagerName(name)),
126126
Replicas: cfg.Replicas,
127127
})
128128
if err != nil {
@@ -151,7 +151,7 @@ func getKarmadaSchedulerManifest(name, namespace string, featureGates map[string
151151
SystemNamespace: constants.KarmadaSystemNamespace,
152152
Image: cfg.Image.Name(),
153153
ImagePullPolicy: string(cfg.ImagePullPolicy),
154-
KubeconfigSecret: util.AdminKubeconfigSecretName(name),
154+
KubeconfigSecret: util.ComponentKarmadaConfigSecretName(util.KarmadaSchedulerName(name)),
155155
KarmadaCertsSecret: util.KarmadaCertSecretName(name),
156156
Replicas: cfg.Replicas,
157157
})
@@ -181,7 +181,7 @@ func getKarmadaDeschedulerManifest(name, namespace string, featureGates map[stri
181181
SystemNamespace: constants.KarmadaSystemNamespace,
182182
Image: cfg.Image.Name(),
183183
ImagePullPolicy: string(cfg.ImagePullPolicy),
184-
KubeconfigSecret: util.AdminKubeconfigSecretName(name),
184+
KubeconfigSecret: util.ComponentKarmadaConfigSecretName(util.KarmadaDeschedulerName(name)),
185185
KarmadaCertsSecret: util.KarmadaCertSecretName(name),
186186
Replicas: cfg.Replicas,
187187
})

‎operator/pkg/controlplane/controlplane_test.go‎

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

169169
expectedSecrets := []string{
170-
util.AdminKubeconfigSecretName(name),
170+
util.ComponentKarmadaConfigSecretName(util.KubeControllerManagerName(name)),
171171
util.KarmadaCertSecretName(name),
172172
}
173173
err = verifySecrets(deployment, expectedSecrets)
@@ -226,7 +226,7 @@ func TestGetKarmadaControllerManagerManifest(t *testing.T) {
226226
t.Errorf("failed to verify karmada controller manager system namespace: %v", err)
227227
}
228228

229-
expectedSecrets := []string{util.AdminKubeconfigSecretName(name)}
229+
expectedSecrets := []string{util.ComponentKarmadaConfigSecretName(util.KarmadaControllerManagerName(name))}
230230
err = verifySecrets(deployment, expectedSecrets)
231231
if err != nil {
232232
t.Errorf("failed to verify karmada controller manager secrets: %v", err)
@@ -285,7 +285,7 @@ func TestGetKarmadaSchedulerManifest(t *testing.T) {
285285
}
286286

287287
expectedSecrets := []string{
288-
util.AdminKubeconfigSecretName(name),
288+
util.ComponentKarmadaConfigSecretName(util.KarmadaSchedulerName(name)),
289289
util.KarmadaCertSecretName(name),
290290
}
291291
err = verifySecrets(deployment, expectedSecrets)
@@ -346,7 +346,7 @@ func TestGetKarmadaDeschedulerManifest(t *testing.T) {
346346
}
347347

348348
expectedSecrets := []string{
349-
util.AdminKubeconfigSecretName(name),
349+
util.ComponentKarmadaConfigSecretName(util.KarmadaDeschedulerName(name)),
350350
util.KarmadaCertSecretName(name),
351351
}
352352
err = verifySecrets(deployment, expectedSecrets)

‎operator/pkg/controlplane/manifests.go‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ spec:
5454
command:
5555
- kube-controller-manager
5656
- --allocate-node-cidrs=true
57-
- --kubeconfig=/etc/karmada/kubeconfig
58-
- --authentication-kubeconfig=/etc/karmada/kubeconfig
59-
- --authorization-kubeconfig=/etc/karmada/kubeconfig
57+
- --kubeconfig=/etc/karmada/config/karmada.config
58+
- --authentication-kubeconfig=/etc/karmada/config/karmada.config
59+
- --authorization-kubeconfig=/etc/karmada/config/karmada.config
6060
- --bind-address=0.0.0.0
6161
- --client-ca-file=/etc/karmada/pki/ca.crt
6262
- --cluster-cidr=10.244.0.0/16
@@ -85,14 +85,13 @@ spec:
8585
- name: karmada-certs
8686
mountPath: /etc/karmada/pki
8787
readOnly: true
88-
- name: kubeconfig
89-
mountPath: /etc/karmada/kubeconfig
90-
subPath: kubeconfig
88+
- name: karmada-config
89+
mountPath: /etc/karmada/config
9190
volumes:
9291
- name: karmada-certs
9392
secret:
9493
secretName: {{ .KarmadaCertsSecret }}
95-
- name: kubeconfig
94+
- name: karmada-config
9695
secret:
9796
secretName: {{ .KubeconfigSecret }}
9897
`
@@ -126,7 +125,7 @@ spec:
126125
imagePullPolicy: {{ .ImagePullPolicy }}
127126
command:
128127
- /bin/karmada-controller-manager
129-
- --kubeconfig=/etc/karmada/kubeconfig
128+
- --kubeconfig=/etc/karmada/config/karmada.config
130129
- --metrics-bind-address=:8080
131130
- --cluster-status-update-frequency=10s
132131
- --failover-eviction-timeout=30s
@@ -147,11 +146,10 @@ spec:
147146
name: metrics
148147
protocol: TCP
149148
volumeMounts:
150-
- name: kubeconfig
151-
subPath: kubeconfig
152-
mountPath: /etc/karmada/kubeconfig
149+
- name: karmada-config
150+
mountPath: /etc/karmada/config
153151
volumes:
154-
- name: kubeconfig
152+
- name: karmada-config
155153
secret:
156154
secretName: {{ .KubeconfigSecret }}
157155
`
@@ -186,7 +184,7 @@ spec:
186184
imagePullPolicy: {{ .ImagePullPolicy }}
187185
command:
188186
- /bin/karmada-scheduler
189-
- --kubeconfig=/etc/karmada/kubeconfig
187+
- --kubeconfig=/etc/karmada/config/karmada.config
190188
- --metrics-bind-address=0.0.0.0:8080
191189
- --health-probe-bind-address=0.0.0.0:10351
192190
- --enable-scheduler-estimator=true
@@ -212,14 +210,13 @@ spec:
212210
- name: karmada-certs
213211
mountPath: /etc/karmada/pki
214212
readOnly: true
215-
- name: kubeconfig
216-
subPath: kubeconfig
217-
mountPath: /etc/karmada/kubeconfig
213+
- name: karmada-config
214+
mountPath: /etc/karmada/config
218215
volumes:
219216
- name: karmada-certs
220217
secret:
221218
secretName: {{ .KarmadaCertsSecret }}
222-
- name: kubeconfig
219+
- name: karmada-config
223220
secret:
224221
secretName: {{ .KubeconfigSecret }}
225222
`
@@ -254,7 +251,7 @@ spec:
254251
imagePullPolicy: {{ .ImagePullPolicy }}
255252
command:
256253
- /bin/karmada-descheduler
257-
- --kubeconfig=/etc/karmada/kubeconfig
254+
- --kubeconfig=/etc/karmada/config/karmada.config
258255
- --metrics-bind-address=0.0.0.0:8080
259256
- --health-probe-bind-address=0.0.0.0:10358
260257
- --leader-elect-resource-namespace={{ .SystemNamespace }}
@@ -279,14 +276,13 @@ spec:
279276
- name: karmada-certs
280277
mountPath: /etc/karmada/pki
281278
readOnly: true
282-
- name: kubeconfig
283-
subPath: kubeconfig
284-
mountPath: /etc/karmada/kubeconfig
279+
- name: karmada-config
280+
mountPath: /etc/karmada/config
285281
volumes:
286282
- name: karmada-certs
287283
secret:
288284
secretName: {{ .KarmadaCertsSecret }}
289-
- name: kubeconfig
285+
- name: karmada-config
290286
secret:
291287
secretName: {{ .KubeconfigSecret }}
292288
`

‎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

0 commit comments

Comments
 (0)