From c42295273632add7dc7b8edd02a31e1790ab3fae Mon Sep 17 00:00:00 2001 From: calvin Date: Mon, 3 Jul 2023 18:21:16 +0800 Subject: [PATCH] karmada operator: change karmada system namespace Signed-off-by: calvin --- operator/pkg/controlplane/controlplane.go | 6 +++--- operator/pkg/tasks/init/karmadaresource.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/operator/pkg/controlplane/controlplane.go b/operator/pkg/controlplane/controlplane.go index 558f4f7d74c6..113985b89be4 100644 --- a/operator/pkg/controlplane/controlplane.go +++ b/operator/pkg/controlplane/controlplane.go @@ -101,7 +101,7 @@ func getKarmadaControllerManagerManifest(name, namespace string, featureGates ma }{ DeploymentName: util.KarmadaControllerManagerName(name), Namespace: namespace, - SystemNamespace: namespace, + SystemNamespace: constants.KarmadaSystemNamespace, Image: cfg.Image.Name(), KubeconfigSecret: util.AdminKubeconfigSecretName(name), Replicas: cfg.Replicas, @@ -128,7 +128,7 @@ func getKarmadaSchedulerManifest(name, namespace string, featureGates map[string }{ DeploymentName: util.KarmadaSchedulerName(name), Namespace: namespace, - SystemNamespace: namespace, + SystemNamespace: constants.KarmadaSystemNamespace, Image: cfg.Image.Name(), KubeconfigSecret: util.AdminKubeconfigSecretName(name), Replicas: cfg.Replicas, @@ -155,7 +155,7 @@ func getKarmadaDeschedulerManifest(name, namespace string, featureGates map[stri }{ DeploymentName: util.KarmadaDeschedulerName(name), Namespace: namespace, - SystemNamespace: namespace, + SystemNamespace: constants.KarmadaSystemNamespace, Image: cfg.Image.Name(), KubeconfigSecret: util.AdminKubeconfigSecretName(name), Replicas: cfg.Replicas, diff --git a/operator/pkg/tasks/init/karmadaresource.go b/operator/pkg/tasks/init/karmadaresource.go index fbfe29404d28..33047f15bc5d 100644 --- a/operator/pkg/tasks/init/karmadaresource.go +++ b/operator/pkg/tasks/init/karmadaresource.go @@ -68,14 +68,14 @@ func runSystemNamespace(r workflow.RunData) error { err := apiclient.CreateNamespace(data.KarmadaClient(), &corev1.Namespace{ ObjectMeta: metav1.ObjectMeta{ - Name: data.GetNamespace(), + Name: constants.KarmadaSystemNamespace, }, }) if err != nil { - return fmt.Errorf("failed to create namespace %s, err: %w", data.GetNamespace(), err) + return fmt.Errorf("failed to create namespace %s, err: %w", constants.KarmadaSystemNamespace, err) } - klog.V(2).InfoS("[systemName] Successfully created karmada system namespace", "namespace", data.GetNamespace(), "karmada", klog.KObj(data)) + klog.V(2).InfoS("[systemName] Successfully created karmada system namespace", "namespace", constants.KarmadaSystemNamespace, "karmada", klog.KObj(data)) return nil }