support component customize the nodeSelector (#78)

vesoft-inc · Oct 25, 2021 · 63f7cc4 · 63f7cc4
1 parent 63927f7
commit 63f7cc4
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 2 deletions.
diff --git a/apis/apps/v1alpha1/nebulacluster_common.go b/apis/apps/v1alpha1/nebulacluster_common.go
@@ -260,7 +260,7 @@ func generateStatefulSet(c NebulaClusterComponentter, cm *corev1.ConfigMap, enab
 
 	podSpec := corev1.PodSpec{
 		SchedulerName:    nc.Spec.SchedulerName,
-		NodeSelector:     nc.Spec.NodeSelector,
+		NodeSelector:     c.NodeSelector(),
 		Containers:       containers,
 		Volumes:          volumes,
 		ImagePullSecrets: nc.Spec.ImagePullSecrets,

diff --git a/apis/apps/v1alpha1/nebulacluster_componentter.go b/apis/apps/v1alpha1/nebulacluster_componentter.go
@@ -41,6 +41,7 @@ type NebulaClusterComponentter interface {
 	GetPodEnvVars() []corev1.EnvVar
 	GetPodAnnotations() map[string]string
 	GetPodLabels() map[string]string
+	NodeSelector() map[string]string
 	IsHeadlessService() bool
 	GetServiceSpec() *ServiceSpec
 	GetServiceName() string

diff --git a/apis/apps/v1alpha1/nebulacluster_graphd.go b/apis/apps/v1alpha1/nebulacluster_graphd.go
@@ -99,6 +99,17 @@ func (c *graphdComponent) GetPodLabels() map[string]string {
 	return c.nc.Spec.Graphd.PodSpec.Labels
 }
 
+func (c *graphdComponent) NodeSelector() map[string]string {
+	selector := map[string]string{}
+	for k, v := range c.nc.Spec.NodeSelector {
+		selector[k] = v
+	}
+	for k, v := range c.nc.Spec.Graphd.PodSpec.NodeSelector {
+		selector[k] = v
+	}
+	return selector
+}
+
 func (c *graphdComponent) IsHeadlessService() bool {
 	return false
 }

diff --git a/apis/apps/v1alpha1/nebulacluster_metad.go b/apis/apps/v1alpha1/nebulacluster_metad.go
@@ -99,6 +99,17 @@ func (c *metadComponent) GetPodLabels() map[string]string {
 	return c.nc.Spec.Metad.PodSpec.Labels
 }
 
+func (c *metadComponent) NodeSelector() map[string]string {
+	selector := map[string]string{}
+	for k, v := range c.nc.Spec.NodeSelector {
+		selector[k] = v
+	}
+	for k, v := range c.nc.Spec.Metad.PodSpec.NodeSelector {
+		selector[k] = v
+	}
+	return selector
+}
+
 func (c *metadComponent) IsHeadlessService() bool {
 	return true
 }

diff --git a/apis/apps/v1alpha1/nebulacluster_storaged.go b/apis/apps/v1alpha1/nebulacluster_storaged.go
@@ -101,6 +101,17 @@ func (c *storagedComponent) GetPodLabels() map[string]string {
 	return c.nc.Spec.Storaged.PodSpec.Labels
 }
 
+func (c *storagedComponent) NodeSelector() map[string]string {
+	selector := map[string]string{}
+	for k, v := range c.nc.Spec.NodeSelector {
+		selector[k] = v
+	}
+	for k, v := range c.nc.Spec.Storaged.PodSpec.NodeSelector {
+		selector[k] = v
+	}
+	return selector
+}
+
 func (c *storagedComponent) IsHeadlessService() bool {
 	return true
 }

diff --git a/apis/apps/v1alpha1/nebulacluster_types.go b/apis/apps/v1alpha1/nebulacluster_types.go
@@ -237,6 +237,10 @@ type PodSpec struct {
 
 	// +optional
 	Labels map[string]string `json:"labels,omitempty"`
+
+	// K8S nodeSelector.
+	// +optional
+	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
 }
 
 // StorageClaim contains details of storages

diff --git a/apis/apps/v1alpha1/zz_generated.deepcopy.go b/apis/apps/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/apps.nebula-graph.io_nebulaclusters.yaml b/config/crd/bases/apps.nebula-graph.io_nebulaclusters.yaml
@@ -139,6 +139,10 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  nodeSelector:
+                    additionalProperties:
+                      type: string
+                    type: object
                   replicas:
                     format: int32
                     minimum: 0
@@ -297,6 +301,10 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  nodeSelector:
+                    additionalProperties:
+                      type: string
+                    type: object
                   replicas:
                     format: int32
                     minimum: 0
@@ -457,6 +465,10 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  nodeSelector:
+                    additionalProperties:
+                      type: string
+                    type: object
                   replicas:
                     format: int32
                     minimum: 0

diff --git a/pkg/controller/nebulacluster/nebula_cluster_control_test.go b/pkg/controller/nebulacluster/nebula_cluster_control_test.go
@@ -124,7 +124,6 @@ func Test_defaultNebulaClusterControl_UpdateNebulaCluster(t *testing.T) {
 	}
 }
 
-// nolint: gocritic
 func newFakeNebulaClusterControl() (
 	ControlInterface,
 	*component.FakeGraphdCluster,