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

Merge pull request #3750 from calvin0327/change-karmada-system 

karmada operator: change karmada system namespace to `karmada-system`
This commit is contained in:
karmada-bot 2023-09-20 09:28:59 +08:00 committed by GitHub
parent d0f23b8c14 c422952736
commit 0135ebfae1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,7 +101,7 @@ func getKarmadaControllerManagerManifest(name, namespace string, featureGates ma
}{ }{
DeploymentName: util.KarmadaControllerManagerName(name), DeploymentName: util.KarmadaControllerManagerName(name),
Namespace: namespace, Namespace: namespace,
SystemNamespace: namespace, SystemNamespace: constants.KarmadaSystemNamespace,
Image: cfg.Image.Name(), Image: cfg.Image.Name(),
KubeconfigSecret: util.AdminKubeconfigSecretName(name), KubeconfigSecret: util.AdminKubeconfigSecretName(name),
Replicas: cfg.Replicas, Replicas: cfg.Replicas,
@ -128,7 +128,7 @@ func getKarmadaSchedulerManifest(name, namespace string, featureGates map[string
}{ }{
DeploymentName: util.KarmadaSchedulerName(name), DeploymentName: util.KarmadaSchedulerName(name),
Namespace: namespace, Namespace: namespace,
SystemNamespace: namespace, SystemNamespace: constants.KarmadaSystemNamespace,
Image: cfg.Image.Name(), Image: cfg.Image.Name(),
KubeconfigSecret: util.AdminKubeconfigSecretName(name), KubeconfigSecret: util.AdminKubeconfigSecretName(name),
Replicas: cfg.Replicas, Replicas: cfg.Replicas,
@ -155,7 +155,7 @@ func getKarmadaDeschedulerManifest(name, namespace string, featureGates map[stri
}{ }{
DeploymentName: util.KarmadaDeschedulerName(name), DeploymentName: util.KarmadaDeschedulerName(name),
Namespace: namespace, Namespace: namespace,
SystemNamespace: namespace, SystemNamespace: constants.KarmadaSystemNamespace,
Image: cfg.Image.Name(), Image: cfg.Image.Name(),
KubeconfigSecret: util.AdminKubeconfigSecretName(name), KubeconfigSecret: util.AdminKubeconfigSecretName(name),
Replicas: cfg.Replicas, Replicas: cfg.Replicas,

6
operator/pkg/tasks/init/karmadaresource.go
View File

@ -68,14 +68,14 @@ func runSystemNamespace(r workflow.RunData) error {
err := apiclient.CreateNamespace(data.KarmadaClient(), &corev1.Namespace{ err := apiclient.CreateNamespace(data.KarmadaClient(), &corev1.Namespace{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: data.GetNamespace(), Name: constants.KarmadaSystemNamespace,
}, },
}) })
if err != nil { 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 return nil
} }