diff --git a/operator/pkg/controlplane/apiserver/apiserver.go b/operator/pkg/controlplane/apiserver/apiserver.go index d3f5a1ffb..490e60500 100644 --- a/operator/pkg/controlplane/apiserver/apiserver.go +++ b/operator/pkg/controlplane/apiserver/apiserver.go @@ -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, diff --git a/operator/pkg/controlplane/controlplane.go b/operator/pkg/controlplane/controlplane.go index 27b0b632f..ecd6ff802 100644 --- a/operator/pkg/controlplane/controlplane.go +++ b/operator/pkg/controlplane/controlplane.go @@ -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 { diff --git a/operator/pkg/controlplane/webhook/webhook.go b/operator/pkg/controlplane/webhook/webhook.go index 20c8ba208..8def05b3d 100644 --- a/operator/pkg/controlplane/webhook/webhook.go +++ b/operator/pkg/controlplane/webhook/webhook.go @@ -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 { diff --git a/operator/pkg/tasks/deinit/kubeconfig.go b/operator/pkg/tasks/deinit/kubeconfig.go index 30f187a96..45285af7d 100644 --- a/operator/pkg/tasks/deinit/kubeconfig.go +++ b/operator/pkg/tasks/deinit/kubeconfig.go @@ -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, ) diff --git a/operator/pkg/tasks/init/upload.go b/operator/pkg/tasks/init/upload.go index 75f51f41e..0eef189bd 100644 --- a/operator/pkg/tasks/init/upload.go +++ b/operator/pkg/tasks/init/upload.go @@ -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}, diff --git a/operator/pkg/util/naming.go b/operator/pkg/util/naming.go index 91fa802bc..c5a6cc62c 100644 --- a/operator/pkg/util/naming.go +++ b/operator/pkg/util/naming.go @@ -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") }