karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: AdminKubeconfigSecretName function name 

Signed-off-by: honglian.you <honglian.you@daocloud.io>
This commit is contained in:
honglian.you 2023-06-30 18:41:55 +08:00
parent c921acddec
commit a3441a11c2
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
operator/pkg/controlplane/apiserver/apiserver.go
View File

@ -101,7 +101,7 @@ func installKarmadaAggregatedAPIServer(client clientset.Interface, cfg *operator
Namespace: namespace,
Image: cfg.Image.Name(),
EtcdClientService: util.KarmadaEtcdClientName(name),
KubeconfigSecret: util.AdminKubeconfigSercretName(name),
KubeconfigSecret: util.AdminKubeconfigSecretName(name),
KarmadaCertsSecret: util.KarmadaCertSecretName(name),
EtcdCertsSecret: util.EtcdCertSecretName(name),
Replicas: cfg.Replicas,

8
operator/pkg/controlplane/controlplane.go
View File

@ -76,7 +76,7 @@ func getKubeControllerManagerManifest(name, namespace string, cfg *operatorv1alp
Namespace: namespace,
Image: cfg.Image.Name(),
KarmadaCertsSecret: util.KarmadaCertSecretName(name),
KubeconfigSecret: util.AdminKubeconfigSercretName(name),
KubeconfigSecret: util.AdminKubeconfigSecretName(name),
Replicas: cfg.Replicas,
})
if err != nil {
@ -102,7 +102,7 @@ func getKarmadaControllerManagerManifest(name, namespace string, featureGates ma
DeploymentName: util.KarmadaControllerManagerName(name),
Namespace: namespace,
Image: cfg.Image.Name(),
KubeconfigSecret: util.AdminKubeconfigSercretName(name),
KubeconfigSecret: util.AdminKubeconfigSecretName(name),
Replicas: cfg.Replicas,
})
if err != nil {
@ -128,7 +128,7 @@ func getKarmadaSchedulerManifest(name, namespace string, featureGates map[string
DeploymentName: util.KarmadaSchedulerName(name),
Namespace: namespace,
Image: cfg.Image.Name(),
KubeconfigSecret: util.AdminKubeconfigSercretName(name),
KubeconfigSecret: util.AdminKubeconfigSecretName(name),
Replicas: cfg.Replicas,
})
if err != nil {
@ -154,7 +154,7 @@ func getKarmadaDeschedulerManifest(name, namespace string, featureGates map[stri
DeploymentName: util.KarmadaDeschedulerName(name),
Namespace: namespace,
Image: cfg.Image.Name(),
KubeconfigSecret: util.AdminKubeconfigSercretName(name),
KubeconfigSecret: util.AdminKubeconfigSecretName(name),
Replicas: cfg.Replicas,
})
if err != nil {

2
operator/pkg/controlplane/webhook/webhook.go
View File

@ -34,7 +34,7 @@ func installKarmadaWebhook(client clientset.Interface, cfg *operatorv1alpha1.Kar
Namespace: namespace,
Image: cfg.Image.Name(),
Replicas: cfg.Replicas,
KubeconfigSecret: util.AdminKubeconfigSercretName(name),
KubeconfigSecret: util.AdminKubeconfigSecretName(name),
WebhookCertsSecret: util.WebhookCertSecretName(name),
})
if err != nil {

2
operator/pkg/tasks/deinit/kubeconfig.go
View File

@ -30,7 +30,7 @@ func runCleanupKubeconfig(r workflow.RunData) error {
err := apiclient.DeleteSecretIfHasLabels(
data.RemoteClient(),
util.AdminKubeconfigSercretName(data.GetName()),
util.AdminKubeconfigSecretName(data.GetName()),
data.GetNamespace(),
constants.KarmadaOperatorLabel,
)

2
operator/pkg/tasks/init/upload.go
View File

@ -77,7 +77,7 @@ func runUploadAdminKubeconfig(r workflow.RunData) error {
err = apiclient.CreateOrUpdateSecret(data.RemoteClient(), &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Namespace: data.GetNamespace(),
Name: util.AdminKubeconfigSercretName(data.GetName()),
Name: util.AdminKubeconfigSecretName(data.GetName()),
Labels: constants.KarmadaOperatorLabel,
},
Data: map[string][]byte{"config": configBytes},

4
operator/pkg/util/naming.go
View File

@ -8,8 +8,8 @@ import (
// Namefunc defines a function to generate resource name according to karmada resource name.
type Namefunc func(karmada string) string
// AdminKubeconfigSercretName returns secret name of karmada-admin kubeconfig
func AdminKubeconfigSercretName(karmada string) string {
// AdminKubeconfigSecretName returns secret name of karmada-admin kubeconfig
func AdminKubeconfigSecretName(karmada string) string {
return generateResourceName(karmada, "admin-config")
}