fix: pass pvc names

Signed-off-by: Vladislav Sukhin <[email protected]>
kubeshop · Dec 16, 2024 · 3520a1a · 3520a1a
1 parent c83e10b
commit 3520a1a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/cmd/tcl/testworkflow-toolkit/commands/parallel.go b/cmd/tcl/testworkflow-toolkit/commands/parallel.go
@@ -205,6 +205,7 @@ func NewParallelCmd() *cobra.Command {
 					testworkflowconfig.CreateResourceMachine(&cfg.Resource),
 					testworkflowconfig.CreateWorkerMachine(&cfg.Worker),
 					baseMachine,
+					testworkflowconfig.CreatePvcMachine(cfg.Execution.Pvcs),
 					params.MachineAt(index),
 				)
 

diff --git a/cmd/tcl/testworkflow-toolkit/commands/services.go b/cmd/tcl/testworkflow-toolkit/commands/services.go
@@ -261,6 +261,7 @@ func NewServicesCmd() *cobra.Command {
 					testworkflowconfig.CreateResourceMachine(&cfg.Resource),
 					testworkflowconfig.CreateWorkerMachine(&cfg.Worker),
 					baseMachine,
+					testworkflowconfig.CreatePvcMachine(cfg.Execution.Pvcs),
 					params.MachineAt(index),
 				)
 

diff --git a/pkg/testworkflows/testworkflowconfig/config.go b/pkg/testworkflows/testworkflowconfig/config.go
@@ -22,6 +22,7 @@ type ExecutionConfig struct {
 	OrganizationId  string            `json:"o,omitempty"`
 	EnvironmentId   string            `json:"e,omitempty"`
 	ParentIds       string            `json:"p,omitempty"`
+	PvcNames        []string          `json:"P,omitempty"`
 }
 
 type WorkflowConfig struct {

diff --git a/pkg/testworkflows/testworkflowconfig/expressions.go b/pkg/testworkflows/testworkflowconfig/expressions.go
@@ -3,8 +3,6 @@ package testworkflowconfig
 import (
 	"strings"
 
-	corev1 "k8s.io/api/core/v1"
-
 	"github.com/kubeshop/testkube/pkg/expressions"
 )
 
@@ -84,15 +82,15 @@ func CreateWorkerMachine(cfg *WorkerConfig) expressions.Machine {
 	return expressions.CombinedMachines(machine)
 }
 
-func CreatePvcMachine(pvcs []corev1.PersistentVolumeClaim) expressions.Machine {
+func CreatePvcMachine(pvcNames []string) expressions.Machine {
 	pvcMap := make(map[string]string)
-	for _, pvc := range pvcs {
-		name := pvc.Name
+	for _, pvcName := range pvcNames {
+		name := pvcName
 		if index := strings.LastIndex(name, "-"); index != -1 {
 			name = name[:index]
 		}
 
-		pvcMap[name+".name"] = pvc.Name
+		pvcMap[name+".name"] = pvcName
 	}
 
 	return expressions.NewMachine().RegisterStringMap("pvcs", pvcMap)

diff --git a/pkg/testworkflows/testworkflowprocessor/processor.go b/pkg/testworkflows/testworkflowprocessor/processor.go
@@ -120,7 +120,9 @@ func (p *processor) Bundle(ctx context.Context, workflow *testworkflowsv1.TestWo
 		createSecretMachine(mapEnv),
 		testworkflowconfig.CreateWorkerMachine(&options.Config.Worker),
 		testworkflowconfig.CreateResourceMachine(&options.Config.Resource),
-		testworkflowconfig.CreatePvcMachine(layer.Pvcs()))
+		testworkflowconfig.CreatePvcMachine(
+			common.MapSlice(layer.Pvcs(), func(p corev1.PersistentVolumeClaim) string { return p.Name })),
+	)
 
 	// Fetch resource root and resource ID
 	if options.Config.Resource.Id == "" {
@@ -174,6 +176,8 @@ func (p *processor) Bundle(ctx context.Context, workflow *testworkflowsv1.TestWo
 			return nil, errors.Wrap(err, "finalizing Pvc")
 		}
 	}
+	pvcNames := common.MapSlice(pvcs, func(p corev1.PersistentVolumeClaim) string { return p.Name })
+	options.Config.Execution.PvcNames = pvcNames
 
 	// Finalize Secrets
 	secrets := append(layer.Secrets(), options.Secrets...)