fix: add pvcs to service spec

Signed-off-by: Vladislav Sukhin <vladislav@kubeshop.io>
kubeshop · Dec 12, 2024 · bd2cf57 · bd2cf57
1 parent d9fcff8
commit bd2cf57
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/api/v1/testkube.yaml b/api/v1/testkube.yaml
@@ -8678,6 +8678,10 @@ components:
             type: string
           readinessProbe:
             $ref: "#/components/schemas/Probe"
+          pvcs:
+            type: object
+            additionalProperties:
+              $ref: "#/components/schemas/TestWorkflowPvcConfig"
 
     TestWorkflowServiceSpec:
       type: object
@@ -10599,9 +10603,6 @@ components:
     TestWorkflowPvcConfig:
       type: object
       properties:
-        shared:
-          description: Specify whether the pvc should be shared between test workflow pods
-          type: boolean
         accessModes:
           description: 'Access mode for claim storage. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes'
           type: array

diff --git a/pkg/api/v1/testkube/model_test_workflow_independent_service_spec.go b/pkg/api/v1/testkube/model_test_workflow_independent_service_spec.go
@@ -41,5 +41,6 @@ type TestWorkflowIndependentServiceSpec struct {
 	// matrix of parameters to spawn instances
 	Matrix map[string]interface{} `json:"matrix,omitempty"`
 	// parameters that should be distributed across sharded instances
-	Shards map[string]interface{} `json:"shards,omitempty"`
+	Shards map[string]interface{}           `json:"shards,omitempty"`
+	Pvcs   map[string]TestWorkflowPvcConfig `json:"pvcs,omitempty"`
 }
diff --git a/pkg/api/v1/testkube/model_test_workflow_pvc_config.go b/pkg/api/v1/testkube/model_test_workflow_pvc_config.go
@@ -10,8 +10,6 @@
 package testkube
 
 type TestWorkflowPvcConfig struct {
-	// Specify whether the pvc should be shared between test workflow pods
-	Shared bool `json:"shared,omitempty"`
 	// Access mode for claim storage. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes
 	AccessModes []string `json:"accessModes,omitempty"`
 	// Volume mode indicates the consumption of the volume as either a filesystem or block device. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes/#volume-mode

diff --git a/pkg/api/v1/testkube/model_test_workflow_service_spec.go b/pkg/api/v1/testkube/model_test_workflow_service_spec.go
@@ -42,5 +42,6 @@ type TestWorkflowServiceSpec struct {
 	// matrix of parameters to spawn instances
 	Matrix map[string]interface{} `json:"matrix,omitempty"`
 	// parameters that should be distributed across sharded instances
-	Shards map[string]interface{} `json:"shards,omitempty"`
+	Shards map[string]interface{}           `json:"shards,omitempty"`
+	Pvcs   map[string]TestWorkflowPvcConfig `json:"pvcs,omitempty"`
 }