Merge pull request #3733 from RuliXu/add-manifests-leader-elect

Karmada Operator: Add Leader Elect to Manifests
karmada-io · Jun 30, 2023 · b01cf50 · b01cf50
2 parents dfd12ef + c79ed77
commit b01cf50
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/operator/pkg/controlplane/controlplane.go b/operator/pkg/controlplane/controlplane.go
@@ -95,12 +95,13 @@ func getKubeControllerManagerManifest(name, namespace string, cfg *operatorv1alp
 
 func getKarmadaControllerManagerManifest(name, namespace string, featureGates map[string]bool, cfg *operatorv1alpha1.KarmadaControllerManager) (*appsv1.Deployment, error) {
 	karmadaControllerManagerBytes, err := util.ParseTemplate(KamradaControllerManagerDeployment, struct {
-		Replicas                  *int32
-		DeploymentName, Namespace string
-		Image, KubeconfigSecret   string
+		Replicas                                   *int32
+		DeploymentName, Namespace, SystemNamespace string
+		Image, KubeconfigSecret                    string
 	}{
 		DeploymentName:   util.KarmadaControllerManagerName(name),
 		Namespace:        namespace,
+		SystemNamespace:  namespace,
 		Image:            cfg.Image.Name(),
 		KubeconfigSecret: util.AdminKubeconfigSercretName(name),
 		Replicas:         cfg.Replicas,
@@ -121,12 +122,13 @@ func getKarmadaControllerManagerManifest(name, namespace string, featureGates ma
 
 func getKarmadaSchedulerManifest(name, namespace string, featureGates map[string]bool, cfg *operatorv1alpha1.KarmadaScheduler) (*appsv1.Deployment, error) {
 	karmadaSchedulerBytes, err := util.ParseTemplate(KarmadaSchedulerDeployment, struct {
-		Replicas                  *int32
-		DeploymentName, Namespace string
-		Image, KubeconfigSecret   string
+		Replicas                                   *int32
+		DeploymentName, Namespace, SystemNamespace string
+		Image, KubeconfigSecret                    string
 	}{
 		DeploymentName:   util.KarmadaSchedulerName(name),
 		Namespace:        namespace,
+		SystemNamespace:  namespace,
 		Image:            cfg.Image.Name(),
 		KubeconfigSecret: util.AdminKubeconfigSercretName(name),
 		Replicas:         cfg.Replicas,
@@ -147,12 +149,13 @@ func getKarmadaSchedulerManifest(name, namespace string, featureGates map[string
 
 func getKarmadaDeschedulerManifest(name, namespace string, featureGates map[string]bool, cfg *operatorv1alpha1.KarmadaDescheduler) (*appsv1.Deployment, error) {
 	karmadaDeschedulerBytes, err := util.ParseTemplate(KarmadaDeschedulerDeployment, struct {
-		Replicas                  *int32
-		DeploymentName, Namespace string
-		Image, KubeconfigSecret   string
+		Replicas                                   *int32
+		DeploymentName, Namespace, SystemNamespace string
+		Image, KubeconfigSecret                    string
 	}{
 		DeploymentName:   util.KarmadaDeschedulerName(name),
 		Namespace:        namespace,
+		SystemNamespace:  namespace,
 		Image:            cfg.Image.Name(),
 		KubeconfigSecret: util.AdminKubeconfigSercretName(name),
 		Replicas:         cfg.Replicas,

diff --git a/operator/pkg/controlplane/manifests.go b/operator/pkg/controlplane/manifests.go
@@ -116,6 +116,7 @@ spec:
         - --cluster-status-update-frequency=10s
         - --secure-port=10357
         - --failover-eviction-timeout=30s
+        - --leader-elect-resource-namespace={{ .SystemNamespace }}
         - --v=4
         livenessProbe:
           httpGet:
@@ -170,6 +171,7 @@ spec:
         - --bind-address=0.0.0.0
         - --secure-port=10351
         - --enable-scheduler-estimator=true
+        - --leader-elect-resource-namespace={{ .SystemNamespace }}
         - --v=4
         livenessProbe:
           httpGet:
@@ -222,6 +224,7 @@ spec:
         - /bin/karmada-descheduler
         - --kubeconfig=/etc/karmada/config
         - --bind-address=0.0.0.0
+        - --leader-elect-resource-namespace={{ .SystemNamespace }}
         - --v=4
         livenessProbe:
           httpGet: