Merge pull request #225 from ksimon1/delete-pvc

feat: add delete PVC option for modify-data-object task
kubevirt · Feb 20, 2023 · d69f5d4 · d69f5d4
2 parents 44b1ba3 + 5214871
commit d69f5d4
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 10 deletions.
diff --git a/manifests/kubernetes/kubevirt-tekton-tasks-kubernetes.yaml b/manifests/kubernetes/kubevirt-tekton-tasks-kubernetes.yaml
diff --git a/manifests/okd/kubevirt-tekton-tasks-okd.yaml b/manifests/okd/kubevirt-tekton-tasks-okd.yaml
diff --git a/modules/modify-data-object/pkg/constants/constants.go b/modules/modify-data-object/pkg/constants/constants.go
@@ -15,6 +15,7 @@ const (
 const (
 	DataVolumeKind = "DataVolume"
 	DataSourceKind = "DataSource"
+	PVCKind        = "PersistentVolumeClaim"
 )
 
 // Result names

diff --git a/modules/modify-data-object/pkg/dataobject/provider.go b/modules/modify-data-object/pkg/dataobject/provider.go
@@ -154,13 +154,15 @@ func NewDataObjectCreator(cliOptions *parse.CLIOptions) (*DataObjectCreator, err
 }
 
 func (d *DataObjectCreator) DeleteDataObject() error {
-	if d.cliOptions.DeleteObjectKind == constants.DataVolumeKind {
+	switch d.cliOptions.DeleteObjectKind {
+	case constants.DataVolumeKind:
 		return d.dataObjectProvider.DeleteDV(d.cliOptions.DataObjectNamespace, d.cliOptions.DeleteObjectName)
-	}
-
-	if d.cliOptions.DeleteObjectKind == constants.DataSourceKind {
+	case constants.DataSourceKind:
 		return d.dataObjectProvider.DeleteDS(d.cliOptions.DataObjectNamespace, d.cliOptions.DeleteObjectName)
+	case constants.PVCKind:
+		return d.dataObjectProvider.DeletePVC(d.cliOptions.DataObjectNamespace, d.cliOptions.DeleteObjectName)
 	}
+
 	return errors.NewBadRequest("object-kind not defined")
 }
 

diff --git a/modules/modify-data-object/pkg/utils/parse/clioptions.go b/modules/modify-data-object/pkg/utils/parse/clioptions.go
@@ -126,7 +126,7 @@ func (c *CLIOptions) assertValidParams() error {
 			return zerrors.NewMissingRequiredError("%s param has to be specified", nameOptionName)
 		}
 
-		if c.DeleteObjectKind != constants.DataVolumeKind && c.DeleteObjectKind != constants.DataSourceKind {
+		if c.DeleteObjectKind != constants.DataVolumeKind && c.DeleteObjectKind != constants.DataSourceKind && c.DeleteObjectKind != constants.PVCKind {
 			return zerrors.NewMissingRequiredError("%s param has to have values %s or %s", objectKindOptionName, constants.DataVolumeKind, constants.DataSourceKind)
 		}
 		return nil

diff --git a/tasks/modify-data-object/README.md b/tasks/modify-data-object/README.md
diff --git a/tasks/modify-data-object/manifests/modify-data-object.yaml b/tasks/modify-data-object/manifests/modify-data-object.yaml
diff --git a/templates/modify-data-object/manifests/modify-data-object.yaml b/templates/modify-data-object/manifests/modify-data-object.yaml
@@ -32,7 +32,7 @@ spec:
       type: string
       default: "false"
     - name: deleteObject
-      description: Set to `true` or `false` if task should delete the specified datavolume or datasource. If set to 'true' the ds/dv will be deleted and all other parameters are ignored.
+      description: Set to `true` or `false` if task should delete the specified DataVolume, DataSource or PersistentVolumeClaim. If set to 'true' the ds/dv/pvc will be deleted and all other parameters are ignored.
       default: 'false'
       type: string
     - name: deleteObjectKind