feat: Add option to deploy che component on specific nodes (eclipse-c…

…he#1902) * feat: Add option to deploy che component on specific nodes Signed-off-by: Anatolii Bazko <[email protected]>
AObuchow · Sep 20, 2024 · d5e7499 · d5e7499
1 parent 4bacfff
commit d5e7499
Show file tree

Hide file tree

Showing 12 changed files with 1,720 additions and 2 deletions.
diff --git a/api/v2/checluster_types.go b/api/v2/checluster_types.go
@@ -674,6 +674,12 @@ type Deployment struct {
 	// Security options the pod should run with.
 	// +optional
 	SecurityContext *PodSecurityContext `json:"securityContext,omitempty"`
+	// The node selector limits the nodes that can run the pod.
+	// +optional
+	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
+	// The pod tolerations of the component pod limit where the pod can run.
+	// +optional
+	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
 }
 
 // Container custom settings.

diff --git a/api/v2/zz_generated.deepcopy.go b/api/v2/zz_generated.deepcopy.go
diff --git a/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml b/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml
@@ -104,7 +104,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/eclipse-che/che-operator
     support: Eclipse Foundation
-  name: eclipse-che.v7.92.0-886.next
+  name: eclipse-che.v7.92.0-887.next
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -1035,7 +1035,7 @@ spec:
   minKubeVersion: 1.19.0
   provider:
     name: Eclipse Foundation
-  version: 7.92.0-886.next
+  version: 7.92.0-887.next
   webhookdefinitions:
     - admissionReviewVersions:
         - v1

diff --git a/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml b/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml
diff --git a/config/crd/bases/org.eclipse.che_checlusters.yaml b/config/crd/bases/org.eclipse.che_checlusters.yaml
diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml
diff --git a/...y/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/...y/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml
diff --git a/...oy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/...oy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
diff --git a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
diff --git a/pkg/deploy/deployment.go b/pkg/deploy/deployment.go
@@ -132,6 +132,22 @@ func OverrideDeployment(
 		}
 	}
 
+	if overrideDeploymentSettings != nil {
+		if len(overrideDeploymentSettings.NodeSelector) > 0 {
+			deployment.Spec.Template.Spec.NodeSelector = make(map[string]string, len(overrideDeploymentSettings.NodeSelector))
+			for i, s := range overrideDeploymentSettings.NodeSelector {
+				deployment.Spec.Template.Spec.NodeSelector[i] = s
+			}
+		}
+
+		if len(overrideDeploymentSettings.Tolerations) > 0 {
+			deployment.Spec.Template.Spec.Tolerations = make([]corev1.Toleration, len(overrideDeploymentSettings.Tolerations))
+			for i, t := range overrideDeploymentSettings.Tolerations {
+				deployment.Spec.Template.Spec.Tolerations[i] = t
+			}
+		}
+	}
+
 	if !infrastructure.IsOpenShift() {
 		if overrideDeploymentSettings != nil {
 			if overrideDeploymentSettings.SecurityContext != nil {

diff --git a/pkg/deploy/deployment_test.go b/pkg/deploy/deployment_test.go
@@ -1189,3 +1189,75 @@ func TestOverrideContainerCpuLimit(t *testing.T) {
 		})
 	}
 }
+
+func TestOverrideNodeSelector(t *testing.T) {
+	ctx := test.GetDeployContext(nil, []runtime.Object{})
+	deployment := &appsv1.Deployment{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "test",
+			Namespace: "eclipse-che",
+		},
+		Spec: appsv1.DeploymentSpec{
+			Template: corev1.PodTemplateSpec{
+				Spec: corev1.PodSpec{
+					Containers: []corev1.Container{
+						{
+							Name: "test",
+						},
+					},
+				},
+			},
+		},
+	}
+	overrideDeployment := &chev2.Deployment{
+		NodeSelector: map[string]string{
+			"a": "b",
+			"c": "d",
+		},
+	}
+
+	err := OverrideDeployment(ctx, deployment, overrideDeployment)
+	assert.NoError(t, err)
+	assert.Equal(t, overrideDeployment.NodeSelector, deployment.Spec.Template.Spec.NodeSelector)
+}
+
+func TestOverrideTolerations(t *testing.T) {
+	ctx := test.GetDeployContext(nil, []runtime.Object{})
+	deployment := &appsv1.Deployment{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "test",
+			Namespace: "eclipse-che",
+		},
+		Spec: appsv1.DeploymentSpec{
+			Template: corev1.PodTemplateSpec{
+				Spec: corev1.PodSpec{
+					Containers: []corev1.Container{
+						{
+							Name: "test",
+						},
+					},
+				},
+			},
+		},
+	}
+	overrideDeployment := &chev2.Deployment{
+		Tolerations: []corev1.Toleration{
+			{
+				Key:      "a",
+				Operator: corev1.TolerationOpEqual,
+				Value:    "b",
+				Effect:   corev1.TaintEffectNoSchedule,
+			},
+			{
+				Key:      "b",
+				Operator: corev1.TolerationOpExists,
+				Value:    "c",
+				Effect:   corev1.TaintEffectNoExecute,
+			},
+		},
+	}
+
+	err := OverrideDeployment(ctx, deployment, overrideDeployment)
+	assert.NoError(t, err)
+	assert.Equal(t, overrideDeployment.Tolerations, deployment.Spec.Template.Spec.Tolerations)
+}