fix zone flags (#279)

vesoft-inc · Sep 15, 2023 · 60f7db6 · 60f7db6
1 parent 65db47e
commit 60f7db6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/charts/nebula-operator/templates/scheduler-configmap.yaml b/charts/nebula-operator/templates/scheduler-configmap.yaml
@@ -10,6 +10,7 @@ metadata:
 data:
   scheduler-config.yaml: |
     apiVersion: kubescheduler.config.k8s.io/v1
+    kind: KubeSchedulerConfiguration
     profiles:
       # Compose all plugins in one profile
       - schedulerName: {{ .Values.scheduler.schedulerName }}

diff --git a/pkg/controller/component/graphd_cluster.go b/pkg/controller/component/graphd_cluster.go
@@ -105,8 +105,10 @@ func (c *graphdCluster) syncGraphdWorkload(nc *v1alpha1.NebulaCluster) error {
 	}
 
 	if notExist {
-		if err := syncZoneConfigMap(nc.GraphdComponent(), c.clientSet.ConfigMap()); err != nil {
-			return err
+		if nc.IsZoneEnabled() {
+			if err := syncZoneConfigMap(nc.GraphdComponent(), c.clientSet.ConfigMap()); err != nil {
+				return err
+			}
 		}
 		if err := extender.SetLastAppliedConfigAnnotation(newWorkload); err != nil {
 			return err

diff --git a/pkg/controller/component/storaged_cluster.go b/pkg/controller/component/storaged_cluster.go
@@ -119,8 +119,10 @@ func (c *storagedCluster) syncStoragedWorkload(nc *v1alpha1.NebulaCluster) error
 	}
 
 	if notExist {
-		if err := syncZoneConfigMap(nc.StoragedComponent(), c.clientSet.ConfigMap()); err != nil {
-			return err
+		if nc.IsZoneEnabled() {
+			if err := syncZoneConfigMap(nc.StoragedComponent(), c.clientSet.ConfigMap()); err != nil {
+				return err
+			}
 		}
 		if err := extender.SetLastAppliedConfigAnnotation(newWorkload); err != nil {
 			return err
@@ -182,8 +184,10 @@ func (c *storagedCluster) syncStoragedWorkload(nc *v1alpha1.NebulaCluster) error
 			return fmt.Errorf("update storaged cluster %s dynamic flags failed: %v", newWorkload.GetName(), err)
 		}
 
-		if err := c.updateZoneMappings(nc, *newReplicas); err != nil {
-			return fmt.Errorf("update zone mappings failed: %v", err)
+		if nc.IsZoneEnabled() {
+			if err := c.updateZoneMappings(nc, *newReplicas); err != nil {
+				return fmt.Errorf("update zone mappings failed: %v", err)
+			}
 		}
 	}