breaking change: unify disk-virt task code and rename their parameters

The disk-virt tasks have almost identical code. This commit keeps only single version of disk-virt code. The params of the tasks were unified and renamed: customizeCommands, sysprepCommands -> virtCommands additionalOptions -> additionalVirtOptions Signed-off-by: Karel Simon <[email protected]>
kubevirt · Jul 11, 2024 · adcddc7 · adcddc7
1 parent ecd856a
commit adcddc7
Show file tree

Hide file tree

Showing 44 changed files with 168 additions and 563 deletions.
diff --git a/cmd/disk-virt-customize/main.go b/cmd/disk-virt-customize/main.go
@@ -2,12 +2,13 @@ package main
 
 import (
 	goarg "github.com/alexflint/go-arg"
-	. "github.com/kubevirt/kubevirt-tekton-tasks/modules/disk-virt-customize/pkg/constants"
-	"github.com/kubevirt/kubevirt-tekton-tasks/modules/disk-virt-customize/pkg/execute"
-	"github.com/kubevirt/kubevirt-tekton-tasks/modules/disk-virt-customize/pkg/utils/log"
-	"github.com/kubevirt/kubevirt-tekton-tasks/modules/disk-virt-customize/pkg/utils/parse"
-	"github.com/kubevirt/kubevirt-tekton-tasks/modules/shared/pkg/exit"
 	"go.uber.org/zap"
+
+	. "github.com/kubevirt/kubevirt-tekton-tasks/modules/disk-virt/pkg/constants"
+	"github.com/kubevirt/kubevirt-tekton-tasks/modules/disk-virt/pkg/execute"
+	"github.com/kubevirt/kubevirt-tekton-tasks/modules/disk-virt/pkg/utils/log"
+	"github.com/kubevirt/kubevirt-tekton-tasks/modules/disk-virt/pkg/utils/parse"
+	"github.com/kubevirt/kubevirt-tekton-tasks/modules/shared/pkg/exit"
 )
 
 func main() {
@@ -23,7 +24,7 @@ func main() {
 	if err := cliOptions.Init(); err != nil {
 		exit.ExitOrDieFromError(InvalidArguments, err)
 	}
-	executor := execute.NewExecutor(cliOptions, DiskImagePath)
+	executor := execute.NewExecutor(cliOptions, DiskImagePath, "virt-customize")
 
 	if err := executor.PrepareGuestFSAppliance(); err != nil {
 		exit.ExitOrDieFromError(PrepareGuestFSApplianceFailed, err)

diff --git a/cmd/disk-virt-sysprep/main.go b/cmd/disk-virt-sysprep/main.go
@@ -2,12 +2,13 @@ package main
 
 import (
 	goarg "github.com/alexflint/go-arg"
-	. "github.com/kubevirt/kubevirt-tekton-tasks/modules/disk-virt-sysprep/pkg/constants"
-	"github.com/kubevirt/kubevirt-tekton-tasks/modules/disk-virt-sysprep/pkg/execute"
-	"github.com/kubevirt/kubevirt-tekton-tasks/modules/disk-virt-sysprep/pkg/utils/log"
-	"github.com/kubevirt/kubevirt-tekton-tasks/modules/disk-virt-sysprep/pkg/utils/parse"
-	"github.com/kubevirt/kubevirt-tekton-tasks/modules/shared/pkg/exit"
 	"go.uber.org/zap"
+
+	. "github.com/kubevirt/kubevirt-tekton-tasks/modules/disk-virt/pkg/constants"
+	"github.com/kubevirt/kubevirt-tekton-tasks/modules/disk-virt/pkg/execute"
+	"github.com/kubevirt/kubevirt-tekton-tasks/modules/disk-virt/pkg/utils/log"
+	"github.com/kubevirt/kubevirt-tekton-tasks/modules/disk-virt/pkg/utils/parse"
+	"github.com/kubevirt/kubevirt-tekton-tasks/modules/shared/pkg/exit"
 )
 
 func main() {
@@ -23,7 +24,7 @@ func main() {
 	if err := cliOptions.Init(); err != nil {
 		exit.ExitOrDieFromError(InvalidArguments, err)
 	}
-	executor := execute.NewExecutor(cliOptions, DiskImagePath)
+	executor := execute.NewExecutor(cliOptions, DiskImagePath, "virt-sysprep")
 
 	if err := executor.PrepareGuestFSAppliance(); err != nil {
 		exit.ExitOrDieFromError(PrepareGuestFSApplianceFailed, err)

diff --git a/examples/pipelines/server-deployer/server-deployer-pipeline.yaml b/examples/pipelines/server-deployer/server-deployer-pipeline.yaml
@@ -42,7 +42,7 @@ spec:
       params:
         - name: pvc
           value: "$(tasks.modify-data-object.results.name)"
-        - name: customizeCommands
+        - name: virtCommands
           value: |
             install git,vim,pip
             run-command pip install flask

diff --git a/examples/pipelines/virt-sysprep-updater/virt-sysprep-updater-pipeline.yaml b/examples/pipelines/virt-sysprep-updater/virt-sysprep-updater-pipeline.yaml
@@ -33,10 +33,10 @@ spec:
       params:
         - name: pvc
           value: "$(tasks.modify-data-object.results.name)"
-        - name: sysprepCommands
+        - name: virtCommands
           value: |
             run-command yum update -y
-        - name: additionalOptions
+        - name: additionalVirtOptions
           value: "--network"
       taskRef:
         kind: Task

diff --git a/modules/disk-virt-customize/pkg/constants/constants.go b/modules/disk-virt-customize/pkg/constants/constants.go
diff --git a/modules/disk-virt-customize/pkg/execute/execute_suite_test.go b/modules/disk-virt-customize/pkg/execute/execute_suite_test.go
diff --git a/modules/disk-virt-customize/pkg/execute/executor.go b/modules/disk-virt-customize/pkg/execute/executor.go
diff --git a/modules/disk-virt-customize/pkg/execute/virt-customize-opts.go b/modules/disk-virt-customize/pkg/execute/virt-customize-opts.go
diff --git a/modules/disk-virt-customize/pkg/execute/virt-customize-opts_test.go b/modules/disk-virt-customize/pkg/execute/virt-customize-opts_test.go
diff --git a/modules/disk-virt-customize/pkg/utils/log/log_test.go b/modules/disk-virt-customize/pkg/utils/log/log_test.go
diff --git a/modules/disk-virt-customize/pkg/utils/parse/clioptions.go b/modules/disk-virt-customize/pkg/utils/parse/clioptions.go
diff --git a/modules/disk-virt-customize/pkg/utils/parse/clioptions_test.go b/modules/disk-virt-customize/pkg/utils/parse/clioptions_test.go