cleanup pvcs

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

Hide file tree

Showing 2 changed files with 42 additions and 0 deletions.
diff --git a/pkg/testworkflows/executionworker/controller/cleanup.go b/pkg/testworkflows/executionworker/controller/cleanup.go
@@ -57,6 +57,17 @@ func cleanupJobs(labelName string) func(ctx context.Context, clientSet kubernete
 	}
 }
 
+func cleanupPvcs(labelName string) func(ctx context.Context, clientSet kubernetes.Interface, namespace, id string) error {
+	return func(ctx context.Context, clientSet kubernetes.Interface, namespace, id string) error {
+		return clientSet.CoreV1().PersistentVolumeClaims(namespace).DeleteCollection(ctx, metav1.DeleteOptions{
+			GracePeriodSeconds: common.Ptr(int64(0)),
+			PropagationPolicy:  common.Ptr(metav1.DeletePropagationBackground),
+		}, metav1.ListOptions{
+			LabelSelector: fmt.Sprintf("%s=%s", labelName, id),
+		})
+	}
+}
+
 func Cleanup(ctx context.Context, clientSet kubernetes.Interface, namespace, id string) error {
 	var errs []error
 	var errsMu sync.Mutex
@@ -70,6 +81,8 @@ func Cleanup(ctx context.Context, clientSet kubernetes.Interface, namespace, id
 		cleanupConfigMaps(constants.ResourceIdLabelName),
 		cleanupSecrets(constants.RootResourceIdLabelName),
 		cleanupSecrets(constants.ResourceIdLabelName),
+		cleanupPvcs(constants.RootResourceIdLabelName),
+		cleanupPvcs(constants.ResourceIdLabelName),
 	}
 	wg.Add(len(ops))
 	for _, op := range ops {
@@ -96,6 +109,7 @@ func CleanupGroup(ctx context.Context, clientSet kubernetes.Interface, namespace
 		cleanupPods(constants.GroupIdLabelName),
 		cleanupConfigMaps(constants.GroupIdLabelName),
 		cleanupSecrets(constants.GroupIdLabelName),
+		cleanupPvcs(constants.GroupIdLabelName),
 	}
 	wg.Add(len(ops))
 	for _, op := range ops {

diff --git a/pkg/testworkflows/testworkflowprocessor/mock_intermediate.go b/pkg/testworkflows/testworkflowprocessor/mock_intermediate.go