rpaasvalidation: add support to build pod with initContainers

tsuru · Jun 25, 2024 · 69dbd2e · 69dbd2e
1 parent 4bf965d
commit 69dbd2e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/controllers/validation_controller.go b/controllers/validation_controller.go
@@ -380,6 +380,7 @@ func newValidationPod(validationMergedWithFlavors *v1alpha1.RpaasValidation, val
 			},
 		},
 		Spec: corev1.PodSpec{
+			InitContainers: validationMergedWithFlavors.Spec.PodTemplate.InitContainers,
 			Containers: []corev1.Container{
 				{
 					Name:         "validation",

diff --git a/controllers/validation_controller_test.go b/controllers/validation_controller_test.go
@@ -479,6 +479,19 @@ func TestValidationControllerReconcicleManyFlavors(t *testing.T) {
 				Name:      "banana",
 				Namespace: "default",
 			},
+			Spec: v1alpha1.RpaasFlavorSpec{
+				InstanceTemplate: &v1alpha1.RpaasInstanceSpec{
+					PodTemplate: nginxv1alpha1.NginxPodTemplateSpec{
+						InitContainers: []corev1.Container{
+							{
+								Name:  "do-something",
+								Image: "busybox",
+								Args:  []string{"cp /tmp/blah /etc/blah"},
+							},
+						},
+					},
+				},
+			},
 		},
 
 		&v1alpha1.RpaasFlavor{
@@ -498,6 +511,15 @@ func TestValidationControllerReconcicleManyFlavors(t *testing.T) {
 	require.NoError(t, err)
 
 	assert.Equal(t, corev1.PodSpec{
+		InitContainers: []corev1.Container{
+			{
+				Name:  "do-something",
+				Image: "busybox",
+				Args: []string{
+					"cp /tmp/blah /etc/blah",
+				},
+			},
+		},
 		Volumes: []corev1.Volume{
 			{
 				Name: "nginx-config",