[Misc] Operator: priorityClassName and nodeName supported

Add support for priorityClassName and nodeName for workloads Change-Id: I9ceb2a548aa2493295ac0a05cc5995f9ddf9aa65
SAP · Nov 28, 2023 · 15ab5b9 · 15ab5b9
1 parent fcb7b2e
commit 15ab5b9
Show file tree

Hide file tree

Showing 13 changed files with 679 additions and 29 deletions.
diff --git a/cmd/web-hooks/internal/handler/handler_test.go b/cmd/web-hooks/internal/handler/handler_test.go
@@ -181,7 +181,7 @@ func createAdmissionRequest(operation admissionv1.Operation, crdType string, crd
 							ConsumedBTPServices: []string{},
 							DeploymentDefinition: &v1alpha1.DeploymentDetails{
 								Type: v1alpha1.DeploymentCAP,
-								ContainerDetails: v1alpha1.ContainerDetails{
+								CommonDetails: v1alpha1.CommonDetails{
 									Image: "foo",
 								},
 							},
@@ -191,7 +191,7 @@ func createAdmissionRequest(operation admissionv1.Operation, crdType string, crd
 							ConsumedBTPServices: []string{},
 							DeploymentDefinition: &v1alpha1.DeploymentDetails{
 								Type: v1alpha1.DeploymentRouter,
-								ContainerDetails: v1alpha1.ContainerDetails{
+								CommonDetails: v1alpha1.CommonDetails{
 									Image: "foo",
 								},
 							},
@@ -201,7 +201,7 @@ func createAdmissionRequest(operation admissionv1.Operation, crdType string, crd
 							ConsumedBTPServices: []string{},
 							JobDefinition: &v1alpha1.JobDetails{
 								Type: v1alpha1.JobContent,
-								ContainerDetails: v1alpha1.ContainerDetails{
+								CommonDetails: v1alpha1.CommonDetails{
 									Image: "foo",
 								},
 							},
@@ -897,7 +897,7 @@ func TestCavInvalidity(t *testing.T) {
 							ConsumedBTPServices: []string{},
 							DeploymentDefinition: &v1alpha1.DeploymentDetails{
 								Type: v1alpha1.DeploymentCAP,
-								ContainerDetails: v1alpha1.ContainerDetails{
+								CommonDetails: v1alpha1.CommonDetails{
 									Image: "foo",
 								},
 							},
@@ -907,7 +907,7 @@ func TestCavInvalidity(t *testing.T) {
 							ConsumedBTPServices: []string{},
 							DeploymentDefinition: &v1alpha1.DeploymentDetails{
 								Type: v1alpha1.DeploymentRouter,
-								ContainerDetails: v1alpha1.ContainerDetails{
+								CommonDetails: v1alpha1.CommonDetails{
 									Image: "foo",
 								},
 							},
@@ -917,7 +917,7 @@ func TestCavInvalidity(t *testing.T) {
 							ConsumedBTPServices: []string{},
 							JobDefinition: &v1alpha1.JobDetails{
 								Type: v1alpha1.JobContent,
-								ContainerDetails: v1alpha1.ContainerDetails{
+								CommonDetails: v1alpha1.CommonDetails{
 									Image: "foo",
 								},
 							},
@@ -933,7 +933,7 @@ func TestCavInvalidity(t *testing.T) {
 					ConsumedBTPServices: []string{},
 					DeploymentDefinition: &v1alpha1.DeploymentDetails{
 						Type: v1alpha1.DeploymentAdditional,
-						ContainerDetails: v1alpha1.ContainerDetails{
+						CommonDetails: v1alpha1.CommonDetails{
 							Image: "foo",
 						},
 					},
@@ -949,7 +949,7 @@ func TestCavInvalidity(t *testing.T) {
 					ConsumedBTPServices: []string{},
 					DeploymentDefinition: &v1alpha1.DeploymentDetails{
 						Type: v1alpha1.DeploymentCAP,
-						ContainerDetails: v1alpha1.ContainerDetails{
+						CommonDetails: v1alpha1.CommonDetails{
 							Image: "foo",
 						},
 					},
@@ -961,7 +961,7 @@ func TestCavInvalidity(t *testing.T) {
 					ConsumedBTPServices: []string{},
 					DeploymentDefinition: &v1alpha1.DeploymentDetails{
 						Type: v1alpha1.DeploymentRouter,
-						ContainerDetails: v1alpha1.ContainerDetails{
+						CommonDetails: v1alpha1.CommonDetails{
 							Image: "foo",
 						},
 					},
@@ -989,7 +989,7 @@ func TestCavInvalidity(t *testing.T) {
 					ConsumedBTPServices: []string{},
 					JobDefinition: &v1alpha1.JobDetails{
 						Type: v1alpha1.JobCustomTenantOperation,
-						ContainerDetails: v1alpha1.ContainerDetails{
+						CommonDetails: v1alpha1.CommonDetails{
 							Image: "foo",
 						},
 					},
@@ -1001,7 +1001,7 @@ func TestCavInvalidity(t *testing.T) {
 					ConsumedBTPServices: []string{},
 					JobDefinition: &v1alpha1.JobDetails{
 						Type: v1alpha1.JobTenantOperation,
-						ContainerDetails: v1alpha1.ContainerDetails{
+						CommonDetails: v1alpha1.CommonDetails{
 							Image: "foo",
 						},
 					},
@@ -1011,7 +1011,7 @@ func TestCavInvalidity(t *testing.T) {
 					ConsumedBTPServices: []string{},
 					JobDefinition: &v1alpha1.JobDetails{
 						Type: v1alpha1.JobCustomTenantOperation,
-						ContainerDetails: v1alpha1.ContainerDetails{
+						CommonDetails: v1alpha1.CommonDetails{
 							Image: "foo",
 						},
 					},
@@ -1034,7 +1034,7 @@ func TestCavInvalidity(t *testing.T) {
 					ConsumedBTPServices: []string{},
 					JobDefinition: &v1alpha1.JobDetails{
 						Type: v1alpha1.JobTenantOperation,
-						ContainerDetails: v1alpha1.ContainerDetails{
+						CommonDetails: v1alpha1.CommonDetails{
 							Image: "foo",
 						},
 					},
@@ -1057,7 +1057,7 @@ func TestCavInvalidity(t *testing.T) {
 					ConsumedBTPServices: []string{},
 					JobDefinition: &v1alpha1.JobDetails{
 						Type: v1alpha1.JobTenantOperation,
-						ContainerDetails: v1alpha1.ContainerDetails{
+						CommonDetails: v1alpha1.CommonDetails{
 							Image: "foo",
 						},
 					},
@@ -1067,7 +1067,7 @@ func TestCavInvalidity(t *testing.T) {
 					ConsumedBTPServices: []string{},
 					JobDefinition: &v1alpha1.JobDetails{
 						Type: v1alpha1.JobCustomTenantOperation,
-						ContainerDetails: v1alpha1.ContainerDetails{
+						CommonDetails: v1alpha1.CommonDetails{
 							Image: "foo",
 						},
 					},
@@ -1116,7 +1116,7 @@ func TestCavInvalidity(t *testing.T) {
 					ConsumedBTPServices: []string{},
 					JobDefinition: &v1alpha1.JobDetails{
 						Type: v1alpha1.JobContent,
-						ContainerDetails: v1alpha1.ContainerDetails{
+						CommonDetails: v1alpha1.CommonDetails{
 							Image: "foo",
 						},
 					},
@@ -1127,7 +1127,7 @@ func TestCavInvalidity(t *testing.T) {
 					ConsumedBTPServices: []string{},
 					JobDefinition: &v1alpha1.JobDetails{
 						Type: v1alpha1.JobContent,
-						ContainerDetails: v1alpha1.ContainerDetails{
+						CommonDetails: v1alpha1.CommonDetails{
 							Image: "foo",
 						},
 					},
@@ -1139,7 +1139,7 @@ func TestCavInvalidity(t *testing.T) {
 					ConsumedBTPServices: []string{},
 					JobDefinition: &v1alpha1.JobDetails{
 						Type: v1alpha1.JobContent,
-						ContainerDetails: v1alpha1.ContainerDetails{
+						CommonDetails: v1alpha1.CommonDetails{
 							Image: "foo",
 						},
 					},

diff --git a/crds/sme.sap.com_capapplicationversions.yaml b/crds/sme.sap.com_capapplicationversions.yaml
@@ -616,6 +616,8 @@ spec:
                               format: int32
                               type: integer
                           type: object
+                        nodeName:
+                          type: string
                         nodeSelector:
                           additionalProperties:
                             type: string
@@ -706,6 +708,8 @@ spec:
                             - port
                             type: object
                           type: array
+                        priorityClassName:
+                          type: string
                         readinessProbe:
                           properties:
                             exec:
@@ -1395,6 +1399,8 @@ spec:
                           type: string
                         imagePullPolicy:
                           type: string
+                        nodeName:
+                          type: string
                         nodeSelector:
                           additionalProperties:
                             type: string
@@ -1463,6 +1469,8 @@ spec:
                                   type: string
                               type: object
                           type: object
+                        priorityClassName:
+                          type: string
                         resources:
                           properties:
                             claims:

diff --git a/internal/controller/reconcile-capapplicationversion.go b/internal/controller/reconcile-capapplicationversion.go
@@ -306,6 +306,8 @@ func newContentDeploymentJob(ca *v1alpha1.CAPApplication, cav *v1alpha1.CAPAppli
 					ImagePullSecrets:          convertToLocalObjectReferences(cav.Spec.RegistrySecrets),
 					RestartPolicy:             corev1.RestartPolicyOnFailure,
 					NodeSelector:              workload.JobDefinition.NodeSelector,
+					NodeName:                  workload.JobDefinition.NodeName,
+					PriorityClassName:         workload.JobDefinition.PriorityClassName,
 					Affinity:                  workload.JobDefinition.Affinity,
 					TopologySpreadConstraints: workload.JobDefinition.TopologySpreadConstraints,
 					Tolerations:               workload.JobDefinition.Tolerations,
@@ -593,6 +595,8 @@ func createDeployment(params *DeploymentParameters) *appsv1.Deployment {
 					Containers:                getContainer(params),
 					SecurityContext:           params.WorkloadDetails.DeploymentDefinition.PodSecurityContext,
 					NodeSelector:              params.WorkloadDetails.DeploymentDefinition.NodeSelector,
+					NodeName:                  params.WorkloadDetails.DeploymentDefinition.NodeName,
+					PriorityClassName:         params.WorkloadDetails.DeploymentDefinition.PriorityClassName,
 					Affinity:                  params.WorkloadDetails.DeploymentDefinition.Affinity,
 					TopologySpreadConstraints: params.WorkloadDetails.DeploymentDefinition.TopologySpreadConstraints,
 					Tolerations:               params.WorkloadDetails.DeploymentDefinition.Tolerations,

diff --git a/internal/controller/reconcile-capapplicationversion_test.go b/internal/controller/reconcile-capapplicationversion_test.go
@@ -704,3 +704,23 @@ func TestCAV_Tolerations(t *testing.T) {
 		},
 	)
 }
+
+func TestCAV_Node_PriorityClass_Names(t *testing.T) {
+	reconcileTestItem(
+		context.TODO(), t,
+		QueueItem{Key: ResourceCAPApplicationVersion, ResourceKey: NamespacedResourceKey{Namespace: "default", Name: "test-cap-01-cav-v1"}},
+		TestData{
+			description: "capapplication version with nodeName and priorityClassName",
+			initialResources: []string{
+				"testdata/common/capapplication.yaml",
+				"testdata/common/credential-secrets.yaml",
+				"testdata/capapplicationversion/content-job-completed.yaml",
+				"testdata/capapplicationversion/cav-node-prio.yaml",
+			},
+			expectedResources: "testdata/capapplicationversion/expected/cav-ready-node-prio.yaml",
+			backlogItems: []string{
+				"ERP4SMEPREPWORKAPPPLAT-3294", // More workload configuration enhancements
+			},
+		},
+	)
+}
diff --git a/internal/controller/reconcile-captenantoperation.go b/internal/controller/reconcile-captenantoperation.go
@@ -47,6 +47,8 @@ type tentantOperationWorkload struct {
 	podSecurityContext        *corev1.PodSecurityContext
 	affinity                  *corev1.Affinity
 	nodeSelector              map[string]string
+	nodeName                  string
+	priorityClassName         string
 	topologySpreadConstraints []corev1.TopologySpreadConstraint
 	tolerations               []corev1.Toleration
 	backoffLimit              *int32
@@ -493,6 +495,8 @@ func (c *Controller) createTenantOperationJob(ctx context.Context, ctop *v1alpha
 					Containers:                getContainers(payload, ctop, derivedWorkload, workload, params),
 					SecurityContext:           derivedWorkload.podSecurityContext,
 					NodeSelector:              derivedWorkload.nodeSelector,
+					NodeName:                  derivedWorkload.nodeName,
+					PriorityClassName:         derivedWorkload.priorityClassName,
 					Affinity:                  derivedWorkload.affinity,
 					TopologySpreadConstraints: derivedWorkload.topologySpreadConstraints,
 					Tolerations:               derivedWorkload.tolerations,
@@ -584,6 +588,8 @@ func deriveWorkloadForTenantOperation(workload *v1alpha1.WorkloadDetails) tentan
 		result.podSecurityContext = workload.DeploymentDefinition.PodSecurityContext
 		result.affinity = workload.DeploymentDefinition.Affinity
 		result.nodeSelector = workload.DeploymentDefinition.NodeSelector
+		result.nodeName = workload.DeploymentDefinition.NodeName
+		result.priorityClassName = workload.DeploymentDefinition.PriorityClassName
 		result.topologySpreadConstraints = workload.DeploymentDefinition.TopologySpreadConstraints
 		result.tolerations = workload.DeploymentDefinition.Tolerations
 	} else {
@@ -603,6 +609,8 @@ func deriveWorkloadForTenantOperation(workload *v1alpha1.WorkloadDetails) tentan
 		}
 		result.affinity = workload.JobDefinition.Affinity
 		result.nodeSelector = workload.JobDefinition.NodeSelector
+		result.nodeName = workload.JobDefinition.NodeName
+		result.priorityClassName = workload.JobDefinition.PriorityClassName
 		result.topologySpreadConstraints = workload.JobDefinition.TopologySpreadConstraints
 		result.tolerations = workload.JobDefinition.Tolerations
 	}
@@ -631,6 +639,8 @@ func (c *Controller) createCustomTenantOperationJob(ctx context.Context, ctop *v
 					RestartPolicy:             corev1.RestartPolicyNever,
 					SecurityContext:           workload.JobDefinition.PodSecurityContext,
 					NodeSelector:              workload.JobDefinition.NodeSelector,
+					NodeName:                  workload.JobDefinition.NodeName,
+					PriorityClassName:         workload.JobDefinition.PriorityClassName,
 					Affinity:                  workload.JobDefinition.Affinity,
 					TopologySpreadConstraints: workload.JobDefinition.TopologySpreadConstraints,
 					Tolerations:               workload.JobDefinition.Tolerations,

diff --git a/internal/controller/reconcile_test.go b/internal/controller/reconcile_test.go
@@ -205,7 +205,7 @@ func createCavCRO(name string, state v1alpha1.CAPApplicationVersionState, versio
 					},
 					DeploymentDefinition: &v1alpha1.DeploymentDetails{
 						Type: v1alpha1.DeploymentCAP,
-						ContainerDetails: v1alpha1.ContainerDetails{
+						CommonDetails: v1alpha1.CommonDetails{
 							Image: "test://image",
 						},
 					},
@@ -214,7 +214,7 @@ func createCavCRO(name string, state v1alpha1.CAPApplicationVersionState, versio
 					Name:                "app-router",
 					ConsumedBTPServices: []string{},
 					DeploymentDefinition: &v1alpha1.DeploymentDetails{
-						ContainerDetails: v1alpha1.ContainerDetails{
+						CommonDetails: v1alpha1.CommonDetails{
 							Image: "test://image",
 						},
 					},