feat: add Volumes/VolumeMounts/Setup to TestWorkflows (#229)

kubeshop · Mar 12, 2024 · c5c7958 · c5c7958
1 parent 6625e24
commit c5c7958
Show file tree

Hide file tree

Showing 8 changed files with 3,852 additions and 5 deletions.
diff --git a/api/testworkflows/v1/step_types.go b/api/testworkflows/v1/step_types.go
@@ -62,6 +62,11 @@ type StepBase struct {
 type IndependentStep struct {
 	StepBase `json:",inline" expr:"include"`
 
+	// steps to run before other operations in this step
+	// +kubebuilder:pruning:PreserveUnknownFields
+	// +kubebuilder:validation:Schemaless
+	Setup []IndependentStep `json:"setup,omitempty" expr:"include"`
+
 	// sub-steps to run
 	// +kubebuilder:pruning:PreserveUnknownFields
 	// +kubebuilder:validation:Schemaless
@@ -77,6 +82,11 @@ type Step struct {
 	// single template to run in this step
 	Template *TemplateRef `json:"template,omitempty" expr:"include"`
 
+	// steps to run before other operations in this step
+	// +kubebuilder:pruning:PreserveUnknownFields
+	// +kubebuilder:validation:Schemaless
+	Setup []Step `json:"setup,omitempty" expr:"include"`
+
 	// sub-steps to run
 	// +kubebuilder:pruning:PreserveUnknownFields
 	// +kubebuilder:validation:Schemaless

diff --git a/api/testworkflows/v1/types.go b/api/testworkflows/v1/types.go
@@ -32,6 +32,9 @@ type ContainerConfig struct {
 
 	// security context for the container
 	SecurityContext *corev1.SecurityContext `json:"securityContext,omitempty" expr:"force"`
+
+	// volume mounts to append to the container
+	VolumeMounts []corev1.VolumeMount `json:"volumeMounts,omitempty" expr:"force"`
 }
 
 type Resources struct {
@@ -65,4 +68,7 @@ type PodConfig struct {
 
 	// annotations added to the scheduled pod
 	Annotations map[string]string `json:"annotations,omitempty" expr:"template,template"`
+
+	// volumes to include in the pod
+	Volumes []corev1.Volume `json:"volumes,omitempty" expr:"force"`
 }
diff --git a/api/testworkflows/v1/zz_generated.deepcopy.go b/api/testworkflows/v1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/tests.testkube.io_testexecutions.yaml b/config/crd/bases/tests.testkube.io_testexecutions.yaml
@@ -283,7 +283,8 @@ spec:
                         type: object
                     type: object
                   sourceScripts:
-                    description: run scripts using source command (container executor only)
+                    description: run scripts using source command (container executor
+                      only)
                     type: boolean
                   sync:
                     description: whether to start execution sync or async
@@ -728,7 +729,8 @@ spec:
                         type: object
                     type: object
                   sourceScripts:
-                    description: run scripts using source command (container executor only)
+                    description: run scripts using source command (container executor
+                      only)
                     type: boolean
                   startTime:
                     description: test start time

diff --git a/config/crd/bases/tests.testkube.io_tests.yaml b/config/crd/bases/tests.testkube.io_tests.yaml
@@ -673,7 +673,8 @@ spec:
                         type: object
                     type: object
                   sourceScripts:
-                    description: run scripts using source command (container executor only)
+                    description: run scripts using source command (container executor
+                      only)
                     type: boolean
                   sync:
                     description: whether to start execution sync or async

diff --git a/config/crd/bases/tests.testkube.io_testsuiteexecutions.yaml b/config/crd/bases/tests.testkube.io_testsuiteexecutions.yaml
@@ -606,7 +606,8 @@ spec:
                                         type: object
                                     type: object
                                   sourceScripts:
-                                    description: run scripts using source command (container executor only)
+                                    description: run scripts using source command
+                                      (container executor only)
                                     type: boolean
                                   startTime:
                                     description: test start time
@@ -1167,7 +1168,8 @@ spec:
                                   type: object
                               type: object
                             sourceScripts:
-                              description: run scripts using source command (container executor only)
+                              description: run scripts using source command (container
+                                executor only)
                               type: boolean
                             startTime:
                               description: test start time