Added slaves field in executor CRD to add slaves configuration (#177)

* Added slaves field in executor CRD to add slaves configuration Signed-off-by: hiteshwani <hitesh.wani@infracloud.io> * Discard changes Signed-off-by: hiteshwani <hitesh.wani@infracloud.io> * Fixed trivial review comments Signed-off-by: Aman Parauliya <aman@infracloud.io> --------- Signed-off-by: hiteshwani <hitesh.wani@infracloud.io> Signed-off-by: Aman Parauliya <aman@infracloud.io> Co-authored-by: Aman Parauliya <aman@infracloud.io>
kubeshop · Sep 26, 2023 · fe2d1f9 · fe2d1f9
1 parent 4d087b2
commit fe2d1f9
Show file tree

Hide file tree

Showing 11 changed files with 102 additions and 9 deletions.
diff --git a/apis/executor/v1/executor_types.go b/apis/executor/v1/executor_types.go
@@ -60,6 +60,13 @@ type ExecutorSpec struct {
 
 	// Meta data about executor
 	Meta *ExecutorMeta `json:"meta,omitempty"`
+
+	// Slaves data to run test in distributed environment
+	Slaves *SlavesMeta `json:"slaves,omitempty"`
+}
+
+type SlavesMeta struct {
+	Image string `json:"image"`
 }
 
 // +kubebuilder:validation:Enum=artifacts;junit-report

diff --git a/apis/executor/v1/zz_generated.deepcopy.go b/apis/executor/v1/zz_generated.deepcopy.go
diff --git a/apis/template/v1/zz_generated.deepcopy.go b/apis/template/v1/zz_generated.deepcopy.go
diff --git a/apis/tests/v3/zz_generated.deepcopy.go b/apis/tests/v3/zz_generated.deepcopy.go
diff --git a/apis/testsuite/v2/zz_generated.deepcopy.go b/apis/testsuite/v2/zz_generated.deepcopy.go
diff --git a/apis/testsuite/v3/zz_generated.deepcopy.go b/apis/testsuite/v3/zz_generated.deepcopy.go
diff --git a/apis/testtriggers/v1/testtrigger_types.go b/apis/testtriggers/v1/testtrigger_types.go
@@ -58,7 +58,7 @@ type TestTriggerSpec struct {
 	// TestSelector identifies on which Testkube Kubernetes Objects an Action should be taken
 	TestSelector TestTriggerSelector `json:"testSelector"`
 	// ConcurrencyPolicy defines concurrency policy for selected Execution
-	ConcurrencyPolicy TestTriggerConcurrencyPolicy `json:"concurrencyPolicy, omitEmpty"`
+	ConcurrencyPolicy TestTriggerConcurrencyPolicy `json:"concurrencyPolicy,omitempty"`
 	// Delay is a duration string which specifies how long should the test be delayed after a trigger is matched
 	// +kubebuilder:validation:Type:=string
 	// +kubebuilder:validation:Format:=duration

diff --git a/apis/testtriggers/v1/zz_generated.deepcopy.go b/apis/testtriggers/v1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/executor.testkube.io_executors.yaml b/config/crd/bases/executor.testkube.io_executors.yaml
@@ -110,6 +110,14 @@ spec:
                     description: executor tooltips
                     type: object
                 type: object
+              slaves:
+                description: Slaves data to run test in distributed environment
+                properties:
+                  image:
+                    type: string
+                required:
+                - image
+                type: object
               types:
                 description: Types defines what types can be handled by executor e.g.
                   "postman/collection", ":curl/command" etc

diff --git a/config/crd/bases/tests.testkube.io_testsuiteexecutions.yaml b/config/crd/bases/tests.testkube.io_testsuiteexecutions.yaml
@@ -305,8 +305,7 @@ spec:
                                           type: string
                                         type: array
                                       omitFolderPerExecution:
-                                        description: don't use a separate folder for execution
-                                          artifacts
+                                        description: don't use a separate folder for execution artifacts
                                         type: boolean
                                       storageBucket:
                                         description: artifact bucket storage

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -1,4 +1,3 @@
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole