Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Standardize the naming of karmada config in Karmada Operator #6082

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Standardize the naming of karmada config in Karmada Operator #6082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hack/deploy-karmada-by-operator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ kubectl --kubeconfig="${HOST_CLUSTER_KUBECONFIG}" --context="${CONTEXT_NAME}" ap
kubectl --kubeconfig="${HOST_CLUSTER_KUBECONFIG}" --context="${CONTEXT_NAME}" wait --for=condition=Ready --timeout=1000s karmada ${KARMADA_INSTANCE_NAME} -n ${KARMADA_INSTANCE_NAMESPACE}

# generate kubeconfig for karmada instance
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
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
cat ~/.kube/${KARMADA_INSTANCE_NAME}-${KARMADA_INSTANCE_NAMESPACE}-tmp-apiserver.config| grep "certificate-authority-data"| awk '{print $2}'| base64 -d > ${CERT_DIR}/ca.crt
cat ~/.kube/${KARMADA_INSTANCE_NAME}-${KARMADA_INSTANCE_NAMESPACE}-tmp-apiserver.config| grep "client-certificate-data"| awk '{print $2}'| base64 -d > ${CERT_DIR}/karmada.crt
cat ~/.kube/${KARMADA_INSTANCE_NAME}-${KARMADA_INSTANCE_NAMESPACE}-tmp-apiserver.config| grep "client-key-data"| awk '{print $2}'| base64 -d > ${CERT_DIR}/karmada.key
Expand Down
2 changes: 1 addition & 1 deletion operator/pkg/controlplane/apiserver/apiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
})
Expand Down
2 changes: 1 addition & 1 deletion operator/pkg/controlplane/apiserver/apiserver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
13 changes: 6 additions & 7 deletions operator/pkg/controlplane/apiserver/manifests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines +176 to +177
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just nits, it is better like this:

Suggested change
- mountPath: /etc/karmada/config
name: karmada-config
- name: karmada-config
mountPath: /etc/karmada/config

- mountPath: /etc/karmada/pki
name: apiserver-cert
readOnly: true
volumes:
- name: kubeconfig
- name: karmada-config
secret:
secretName: {{ .KubeconfigSecret }}
- name: apiserver-cert
Expand Down
8 changes: 4 additions & 4 deletions operator/pkg/controlplane/controlplane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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,
})
Expand Down Expand Up @@ -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,
})
Expand Down
8 changes: 4 additions & 4 deletions operator/pkg/controlplane/controlplane_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
40 changes: 18 additions & 22 deletions operator/pkg/controlplane/manifests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
`
Expand Down Expand Up @@ -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
Expand All @@ -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 }}
`
Expand Down Expand Up @@ -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
Expand All @@ -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 }}
`
Expand Down Expand Up @@ -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 }}
Expand All @@ -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 }}
`
Expand Down
13 changes: 6 additions & 7 deletions operator/pkg/controlplane/metricsadapter/manifests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -87,7 +86,7 @@ spec:
requests:
cpu: 100m
volumes:
- name: kubeconfig
- name: karmada-config
secret:
secretName: {{ .KubeconfigSecret }}
- name: karmada-cert
Expand Down
2 changes: 1 addition & 1 deletion operator/pkg/controlplane/metricsadapter/metricsadapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion operator/pkg/controlplane/metricsadapter/metricsadapter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
13 changes: 6 additions & 7 deletions operator/pkg/controlplane/search/manifests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -79,7 +78,7 @@ spec:
- name: k8s-certs
secret:
secretName: {{ .KarmadaCertsSecret }}
- name: kubeconfig
- name: karmada-config
secret:
secretName: {{ .KubeconfigSecret }}
`
Expand Down
2 changes: 1 addition & 1 deletion operator/pkg/controlplane/search/search.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion operator/pkg/controlplane/search/search_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 4 additions & 5 deletions operator/pkg/controlplane/webhook/manifests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -73,7 +72,7 @@ spec:
port: 8443
scheme: HTTPS
volumes:
- name: kubeconfig
- name: karmada-config
secret:
secretName: {{ .KubeconfigSecret }}
- name: cert
Expand Down
2 changes: 1 addition & 1 deletion operator/pkg/controlplane/webhook/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion operator/pkg/controlplane/webhook/webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading