feat: allow users to specify nodeSelector map

Author: migueladh

api/v1alphav1/overcommit_types.go

@@ -26,6 +26,8 @@ type OvercommitSpec struct {
 	// +kubebuilder:validation:Optional
 	Annotations map[string]string `json:"annotations,omitempty"`
 	// +kubebuilder:validation:Optional
+	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
+	// +kubebuilder:validation:Optional
 	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
 }
 

api/v1alphav1/overcommitclass_types.go

@@ -34,6 +34,8 @@ type OvercommitClassSpec struct {
 	Labels      map[string]string `json:"labels,omitempty"`
 	Annotations map[string]string `json:"annotations,omitempty"`
 	// +kubebuilder:validation:Optional
+	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
+	// +kubebuilder:validation:Optional
 	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
 }
 

api/v1alphav1/zz_generated.deepcopy.go

@@ -76,6 +76,10 @@ spec:
                 maximum: 1
                 minimum: 0.0001
                 type: number
+              nodeSelector:
+                additionalProperties:
+                  type: string
+                type: object
               tolerations:
                 items:
                   description: |-

config/crd/bases/overcommit.inditex.dev_overcommitclasses.yaml

@@ -52,6 +52,10 @@ spec:
                 additionalProperties:
                   type: string
                 type: object
+              nodeSelector:
+                additionalProperties:
+                  type: string
+                type: object
               overcommitLabel:
                 minLength: 1
                 type: string

config/crd/bases/overcommit.inditex.dev_overcommits.yaml

@@ -94,7 +94,8 @@ func GenerateOvercommitClassControllerDeployment(overcommitObject overcommit.Ove
 							},
 						},
 					},
-					Tolerations: overcommitObject.Spec.Tolerations,
+					NodeSelector: overcommitObject.Spec.NodeSelector,
+					Tolerations:  overcommitObject.Spec.Tolerations,
 				},
 			},
 		},

internal/resources/generate_resources_overcommit_class_controller_controller.go

@@ -97,7 +97,8 @@ func CreateDeployment(class overcommit.OvercommitClass) *appsv1.Deployment {
 							},
 						},
 					},
-					Tolerations: class.Spec.Tolerations,
+					NodeSelector: class.Spec.NodeSelector,
+					Tolerations:  class.Spec.Tolerations,
 					Volumes: []corev1.Volume{
 						{
 							Name: "webhook-tls-secret",

internal/resources/generate_resources_pod_mutating_webhooks.go

@@ -42,7 +42,7 @@ func TestCreateDeployment(t *testing.T) {
 	}
 }
 
-func TestCreateDeploymentWithTolerations(t *testing.T) {
+func TestCreateDeploymentWithTolerationsAndNodeSelector(t *testing.T) {
 	os.Setenv("POD_NAMESPACE", "test-namespace")
 	os.Setenv("IMAGE_REGISTRY", "test-registry")
 	os.Setenv("IMAGE_REPOSITORY", "test-repo")
@@ -55,6 +55,9 @@ func TestCreateDeploymentWithTolerations(t *testing.T) {
 		Spec: overcommit.OvercommitClassSpec{
 			Labels:      map[string]string{"key": "value"},
 			Annotations: map[string]string{"annotation-key": "annotation-value"},
+			NodeSelector: map[string]string{
+				"disktype": "ssd",
+			},
 			Tolerations: []corev1.Toleration{
 				{
 					Key:      "key1",
@@ -81,6 +84,9 @@ func TestCreateDeploymentWithTolerations(t *testing.T) {
 	if deployment.Spec.Template.Spec.Tolerations[0].Key != "key1" {
 		t.Errorf("Expected toleration key 'key1', got '%s'", deployment.Spec.Template.Spec.Tolerations[0].Key)
 	}
+	if val, ok := deployment.Spec.Template.Spec.NodeSelector["disktype"]; !ok || val != "ssd" {
+		t.Errorf("Expected node selector 'disktype: ssd', got '%v'", deployment.Spec.Template.Spec.NodeSelector)
+	}
 }
 
 func TestCreateService(t *testing.T) {

internal/resources/generate_resources_pod_mutating_webhooks_test.go

@@ -128,7 +128,8 @@ func GeneratePodValidatingDeployment(overcommitObject overcommit.Overcommit) *ap
 							},
 						},
 					},
-					Tolerations: overcommitObject.Spec.Tolerations,
+					NodeSelector: overcommitObject.Spec.NodeSelector,
+					Tolerations:  overcommitObject.Spec.Tolerations,
 					Volumes: []corev1.Volume{
 						{
 							Name: "webhook-cert",
@@ -300,7 +301,8 @@ func GenerateOvercommitClassValidatingDeployment(overcommitObject overcommit.Ove
 							},
 						},
 					},
-					Tolerations: overcommitObject.Spec.Tolerations,
+					NodeSelector: overcommitObject.Spec.NodeSelector,
+					Tolerations:  overcommitObject.Spec.Tolerations,
 					Volumes: []corev1.Volume{
 						{
 							Name: "webhook-cert",