feat: replace clusterTask with tasks

clusterTasks are deprecated https://tekton.dev/docs/pipelines/tasks/#task-vs-clustertask. This PR changes all clusterTasks to tasks and do all necessary modifications. Signed-off-by: Karel Šimon <[email protected]>
kubevirt · Apr 10, 2023 · 8a561a3 · 8a561a3
1 parent 4e7d80e
commit 8a561a3
Show file tree

Hide file tree

Showing 68 changed files with 153 additions and 223 deletions.
diff --git a/automation/e2e-deploy-resources.sh b/automation/e2e-deploy-resources.sh
@@ -42,9 +42,9 @@ kubectl apply -f "https://github.com/kubevirt/containerized-data-importer/releas
 # wait for tekton pipelines
 kubectl rollout status -n openshift-operators deployment/openshift-pipelines-operator --timeout 10m
 
-# wait until clustertasks tekton CRD is properly deployed
+# wait until tasks tekton CRD is properly deployed
 timeout 10m bash <<- EOF
-  until kubectl get crd clustertasks.tekton.dev; do
+  until kubectl get crd tasks.tekton.dev; do
     sleep 5
   done
 EOF

diff --git a/automation/e2e-tests.sh b/automation/e2e-tests.sh
@@ -2,7 +2,6 @@
 
 set -ex
 
-export SCOPE="${SCOPE:-cluster}"
 export DEV_MODE="${DEV_MODE:-false}"
 export STORAGE_CLASS="${STORAGE_CLASS:-}"
 export DEPLOY_NAMESPACE="${DEPLOY_NAMESPACE:-e2e-tests-$(shuf -i10000-99999 -n1)}"

diff --git a/docs/getting-started.md b/docs/getting-started.md
@@ -35,12 +35,6 @@ make cluster-sync
 ./scripts/cluster-sync.sh execute-in-vm
 ```
 
-You can also change the scope of the tasks to be single namespace only:
-
-```bash
-SCOPE=namespace make cluster-sync
-```
-
 ## Testing
 
 ### Running Unit Tests
@@ -55,8 +49,6 @@ make test
 ### Running E2E Tests
 ```bash
 NUM_NODES=4 make cluster-test
-# for namespace scope use
-SCOPE=namespace NUM_NODES=4 make cluster-test
 
 # clean all used resources, namespaces and images
 make cluster-clean

diff --git a/examples/pipelines/server-deployer/server-deployer-pipeline.yaml b/examples/pipelines/server-deployer/server-deployer-pipeline.yaml
@@ -27,7 +27,7 @@ spec:
         - name: waitForSuccess
           value: 'true'
       taskRef:
-        kind: ClusterTask
+        kind: Task
         name: modify-data-object
     - name: generate-ssh-keys
       params:
@@ -36,7 +36,7 @@ spec:
             - 'user:fedora'
             - 'disable-strict-host-key-checking:true'
       taskRef:
-        kind: ClusterTask
+        kind: Task
         name: generate-ssh-keys
     - name: disk-virt-customize
       params:
@@ -47,7 +47,7 @@ spec:
             install git,vim,pip
             run-command pip install flask
       taskRef:
-        kind: ClusterTask
+        kind: Task
         name: disk-virt-customize
       runAfter:
         - modify-data-object
@@ -118,7 +118,7 @@ spec:
         - disk-virt-customize
         - generate-ssh-keys
       taskRef:
-        kind: ClusterTask
+        kind: Task
         name: create-vm-from-manifest
     - name: execute-in-vm
       params:
@@ -138,5 +138,5 @@ spec:
       runAfter:
         - create-vm-from-manifest
       taskRef:
-        kind: ClusterTask
+        kind: Task
         name: execute-in-vm
diff --git a/examples/pipelines/unit-tester/unit-tester-pipeline.yaml b/examples/pipelines/unit-tester/unit-tester-pipeline.yaml
@@ -25,7 +25,7 @@ spec:
             - 'user:fedora'
             - 'disable-strict-host-key-checking:true'
       taskRef:
-        kind: ClusterTask
+        kind: Task
         name: generate-ssh-keys
     - name: create-vm-from-manifest
       params:
@@ -87,7 +87,7 @@ spec:
       runAfter:
         - generate-ssh-keys
       taskRef:
-        kind: ClusterTask
+        kind: Task
         name: create-vm-from-manifest
     - name: execute-in-vm
       params:
@@ -110,7 +110,7 @@ spec:
       runAfter:
         - create-vm-from-manifest
       taskRef:
-        kind: ClusterTask
+        kind: Task
         name: execute-in-vm
   finally:
     - name: cleanup-vm
@@ -135,5 +135,5 @@ spec:
               cat ${RESULT_FILES}
             fi
       taskRef:
-        kind: ClusterTask
+        kind: Task
         name: cleanup-vm
diff --git a/examples/pipelines/virt-sysprep-updater/virt-sysprep-updater-pipeline.yaml b/examples/pipelines/virt-sysprep-updater/virt-sysprep-updater-pipeline.yaml
@@ -27,7 +27,7 @@ spec:
         - name: waitForSuccess
           value: 'true'
       taskRef:
-        kind: ClusterTask
+        kind: Task
         name: modify-data-object
     - name: disk-virt-sysprep
       params:
@@ -39,7 +39,7 @@ spec:
         - name: additionalOptions
           value: "--network"
       taskRef:
-        kind: ClusterTask
+        kind: Task
         name: disk-virt-sysprep
       runAfter:
         - modify-data-object
@@ -102,5 +102,5 @@ spec:
       runAfter:
         - disk-virt-sysprep
       taskRef:
-        kind: ClusterTask
+        kind: Task
         name: create-vm-from-manifest
diff --git a/modules/tests/test/constants/constants.go b/modules/tests/test/constants/constants.go
@@ -1,9 +1,10 @@
 package constants
 
 import (
-	"github.com/kubevirt/kubevirt-tekton-tasks/modules/sharedtest/testconstants"
 	"strings"
 	"time"
+
+	"github.com/kubevirt/kubevirt-tekton-tasks/modules/sharedtest/testconstants"
 )
 
 const e2eNamespacePrefix = "e2e-tests"
@@ -22,13 +23,6 @@ const (
 	EmptyTargetNS  TargetNamespace = "empty"
 )
 
-type TestScope string
-
-const (
-	ClusterTestScope   TestScope = "cluster"
-	NamespaceTestScope TestScope = "namespace"
-)
-
 type EnvScope string
 
 const (

diff --git a/modules/tests/test/constants/copy-template.go b/modules/tests/test/constants/copy-template.go
@@ -1,10 +1,11 @@
 package constants
 
 const (
-	CopyTemplateClusterTaskName    = "copy-template"
-	CopyTemplateServiceAccountName = "copy-template-task"
-	CopyTemplateTaskRunName        = "taskrun-copy-template"
-	NewTemplateName                = "test-template"
+	CopyTemplateTaskName                     = "copy-template"
+	CopyTemplateServiceAccountName           = "copy-template-task"
+	CopyTemplateServiceAccountNameNamespaced = "copy-template-test"
+	CopyTemplateTaskRunName                  = "taskrun-copy-template"
+	NewTemplateName                          = "test-template"
 
 	SourceTemplateNameOptionName      = "sourceTemplateName"
 	SourceTemplateNamespaceOptionName = "sourceTemplateNamespace"

diff --git a/modules/tests/test/constants/create-data-object.go b/modules/tests/test/constants/create-data-object.go
@@ -1,9 +1,10 @@
 package constants
 
 const (
-	ModifyDataObjectClusterTaskName    = "modify-data-object"
-	ModifyDataObjectServiceAccountName = "modify-data-object-task"
-	ModifyDataObjectTaskrunName        = "taskrun-modify-data-object"
+	ModifyDataObjectTaskName                     = "modify-data-object"
+	ModifyDataObjectServiceAccountName           = "modify-data-object-task"
+	ModifyDataObjectServiceAccountNameNamespaced = "modify-data-object-test"
+	ModifyDataObjectTaskrunName                  = "taskrun-modify-data-object"
 
 	UnusualRestartCountThreshold = 3
 	ReasonError                  = "Error"

diff --git a/modules/tests/test/constants/create-vm.go b/modules/tests/test/constants/create-vm.go
@@ -1,10 +1,12 @@
 package constants
 
-const CreateVMFromTemplateClusterTaskName = "create-vm-from-template"
+const CreateVMFromTemplateTaskName = "create-vm-from-template"
 const CreateVMFromTemplateServiceAccountName = "create-vm-from-template-task"
+const CreateVMFromTemplateServiceAccountNameNamespaced = "create-vm-from-template-test"
 
-const CreateVMFromManifestClusterTaskName = "create-vm-from-manifest"
+const CreateVMFromManifestTaskName = "create-vm-from-manifest"
 const CreateVMFromManifestServiceAccountName = "create-vm-from-manifest-task"
+const CreateVMFromManifestServiceAccountNameNamespaced = "create-vm-from-manifest-test"
 
 type createVMParams struct {
 	DataVolumes               string

diff --git a/modules/tests/test/constants/disk-virt-libguestfs-tasks.go b/modules/tests/test/constants/disk-virt-libguestfs-tasks.go
@@ -1,7 +1,7 @@
 package constants
 
-const DiskVirtCustomizeClusterTaskName = "disk-virt-customize"
-const DiskVirtSysprepClusterTaskName = "disk-virt-sysprep"
+const DiskVirtCustomizeTaskName = "disk-virt-customize"
+const DiskVirtSysprepTaskName = "disk-virt-sysprep"
 
 type diskVirtLibguestfsTasksParams struct {
 	PVCName           string

diff --git a/modules/tests/test/constants/execute-in-vm.go b/modules/tests/test/constants/execute-in-vm.go
@@ -1,9 +1,9 @@
 package constants
 
-const ExecuteInVMClusterTaskName = "execute-in-vm"
+const ExecuteInVMTaskName = "execute-in-vm"
 const ExecuteInVMServiceAccountName = "execute-in-vm-task"
 
-const CleanupVMClusterTaskName = "cleanup-vm"
+const CleanupVMTaskName = "cleanup-vm"
 const CleanupVMServiceAccountName = "cleanup-vm-task"
 
 type executeOrCleanupVMParams struct {

diff --git a/modules/tests/test/constants/generate-ssh-keys.go b/modules/tests/test/constants/generate-ssh-keys.go
@@ -1,8 +1,9 @@
 package constants
 
 const (
-	GenerateSshKeysClusterTaskName    = "generate-ssh-keys"
-	GenerateSshKeysServiceAccountName = "generate-ssh-keys-task"
+	GenerateSshKeysTaskName                     = "generate-ssh-keys"
+	GenerateSshKeysServiceAccountName           = "generate-ssh-keys-task"
+	GenerateSshKeysServiceAccountNameNamespaced = "generate-ssh-keys-test"
 )
 
 type generateSshKeysParams struct {

diff --git a/modules/tests/test/constants/modify-vm-template.go b/modules/tests/test/constants/modify-vm-template.go
@@ -8,9 +8,10 @@ import (
 )
 
 const (
-	ModifyTemplateClusterTaskName    = "modify-vm-template"
-	ModifyTemplateServiceAccountName = "modify-vm-template-task"
-	ModifyTemplateTaskRunName        = "taskrun-modify-vm-template"
+	ModifyTemplateTaskName                     = "modify-vm-template"
+	ModifyTemplateServiceAccountName           = "modify-vm-template-task"
+	ModifyTemplateServiceAccountNameNamespaced = "modify-vm-template-test"
+	ModifyTemplateTaskRunName                  = "taskrun-modify-vm-template"
 
 	TemplateNameOptionName             = "templateName"
 	TemplateNamespaceOptionName        = "templateNamespace"

diff --git a/modules/tests/test/constants/wait-for-vmi-status.go b/modules/tests/test/constants/wait-for-vmi-status.go
@@ -1,8 +1,9 @@
 package constants
 
 const (
-	WaitForVMIStatusClusterTaskName    = "wait-for-vmi-status"
-	WaitForVMIStatusServiceAccountName = "wait-for-vmi-status-task"
+	WaitForVMIStatusTaskName                     = "wait-for-vmi-status"
+	WaitForVMIStatusServiceAccountName           = "wait-for-vmi-status-task"
+	WaitForVMIStatusServiceAccountNameNamespaced = "wait-for-vmi-status-test"
 )
 
 type waitForVMIStatusTasksParams struct {

diff --git a/modules/tests/test/copy_template_test.go b/modules/tests/test/copy_template_test.go
@@ -55,11 +55,10 @@ var _ = Describe("Copy template task", func() {
 					SourceTemplateName: testtemplate.CirrosTemplateName,
 				},
 			}),
-			Entry("[NAMESPACE SCOPED] cannot copy template in different namespace", &testconfigs.CopyTemplateTestConfig{
+			Entry("cannot copy template in different namespace", &testconfigs.CopyTemplateTestConfig{
 				TaskRunTestConfig: testconfigs.TaskRunTestConfig{
-					ServiceAccount: CopyTemplateServiceAccountName,
-					ExpectedLogs:   "templates.template.openshift.io is forbidden",
-					LimitTestScope: NamespaceTestScope,
+					ServiceAccount: CopyTemplateServiceAccountNameNamespaced,
+					ExpectedLogs:   "cannot get resource \"templates\"",
 				},
 				TaskData: testconfigs.CopyTemplateTaskData{
 					SourceTemplateName:      testtemplate.CirrosTemplateName,
@@ -107,7 +106,6 @@ var _ = Describe("Copy template task", func() {
 			Entry("should create template in different namespace", &testconfigs.CopyTemplateTestConfig{
 				TaskRunTestConfig: testconfigs.TaskRunTestConfig{
 					ServiceAccount: CopyTemplateServiceAccountName,
-					LimitTestScope: ClusterTestScope,
 				},
 				TaskData: testconfigs.CopyTemplateTaskData{
 					SourceTemplateName:      testtemplate.CirrosTemplateName,
@@ -166,7 +164,6 @@ var _ = Describe("Copy template task", func() {
 			config := &testconfigs.CopyTemplateTestConfig{
 				TaskRunTestConfig: testconfigs.TaskRunTestConfig{
 					ServiceAccount: CopyTemplateServiceAccountName,
-					LimitTestScope: ClusterTestScope,
 				},
 				TaskData: testconfigs.CopyTemplateTaskData{
 					SourceTemplateName:      testtemplate.RhelTemplateName,
@@ -214,7 +211,6 @@ var _ = Describe("Copy template task", func() {
 			config := &testconfigs.CopyTemplateTestConfig{
 				TaskRunTestConfig: testconfigs.TaskRunTestConfig{
 					ServiceAccount: CopyTemplateServiceAccountName,
-					LimitTestScope: ClusterTestScope,
 					ExpectedLogs:   "templates.template.openshift.io \"test-template\" already exists",
 				},
 				TaskData: testconfigs.CopyTemplateTaskData{
@@ -247,7 +243,6 @@ var _ = Describe("Copy template task", func() {
 			config := &testconfigs.CopyTemplateTestConfig{
 				TaskRunTestConfig: testconfigs.TaskRunTestConfig{
 					ServiceAccount: CopyTemplateServiceAccountName,
-					LimitTestScope: ClusterTestScope,
 				},
 				TaskData: testconfigs.CopyTemplateTaskData{
 					SourceTemplateName:      testtemplate.CirrosTemplateName,

diff --git a/modules/tests/test/create_vm_from_manifest_test.go b/modules/tests/test/create_vm_from_manifest_test.go
@@ -107,22 +107,20 @@ var _ = Describe("Create VM from manifest", func() {
 				VM: testobjects.NewTestAlpineVM("vm-with-non-existent-pvc").WithNonMatchingDisk().Build(),
 			},
 		}),
-		Entry("[NAMESPACE SCOPED] cannot create a VM in different namespace", &testconfigs.CreateVMTestConfig{
+		Entry("cannot create a VM in different namespace", &testconfigs.CreateVMTestConfig{
 			TaskRunTestConfig: testconfigs.TaskRunTestConfig{
-				ServiceAccount: CreateVMFromManifestServiceAccountName,
+				ServiceAccount: CreateVMFromManifestServiceAccountNameNamespaced,
 				ExpectedLogs:   "cannot create resource \"virtualmachines\" in API group \"kubevirt.io\"",
-				LimitTestScope: NamespaceTestScope,
 			},
 			TaskData: testconfigs.CreateVMTaskData{
 				VM:                testobjects.NewTestAlpineVM("different-ns-namespace-scope").Build(),
 				VMTargetNamespace: SystemTargetNS,
 			},
 		}),
-		Entry("[NAMESPACE SCOPED] cannot create a VM in different namespace in manifest", &testconfigs.CreateVMTestConfig{
+		Entry("cannot create a VM in different namespace in manifest", &testconfigs.CreateVMTestConfig{
 			TaskRunTestConfig: testconfigs.TaskRunTestConfig{
-				ServiceAccount: CreateVMFromManifestServiceAccountName,
+				ServiceAccount: CreateVMFromManifestServiceAccountNameNamespaced,
 				ExpectedLogs:   "cannot create resource \"virtualmachines\" in API group \"kubevirt.io\"",
-				LimitTestScope: NamespaceTestScope,
 			},
 			TaskData: testconfigs.CreateVMTaskData{
 				VM:                        testobjects.NewTestAlpineVM("different-ns-namespace-scope-in-manifest").Build(),

diff --git a/modules/tests/test/create_vm_from_template_test.go b/modules/tests/test/create_vm_from_template_test.go
@@ -176,11 +176,10 @@ var _ = Describe("Create VM from template", func() {
 				},
 			},
 		}),
-		Entry("[NAMESPACE SCOPED] cannot create a VM in different namespace", &testconfigs.CreateVMTestConfig{
+		Entry("cannot create a VM in different namespace", &testconfigs.CreateVMTestConfig{
 			TaskRunTestConfig: testconfigs.TaskRunTestConfig{
-				ServiceAccount: CreateVMFromTemplateServiceAccountName,
-				ExpectedLogs:   "processedtemplates.template.openshift.io is forbidden",
-				LimitTestScope: NamespaceTestScope,
+				ServiceAccount: CreateVMFromTemplateServiceAccountNameNamespaced,
+				ExpectedLogs:   "cannot get resource \"templates\"",
 			},
 			TaskData: testconfigs.CreateVMTaskData{
 				Template: testtemplate.NewCirrosServerTinyTemplate().Build(),
@@ -190,11 +189,10 @@ var _ = Describe("Create VM from template", func() {
 				VMTargetNamespace: SystemTargetNS,
 			},
 		}),
-		Entry("[NAMESPACE SCOPED] cannot use template from a different namespace", &testconfigs.CreateVMTestConfig{
+		Entry("cannot use template from a different namespace", &testconfigs.CreateVMTestConfig{
 			TaskRunTestConfig: testconfigs.TaskRunTestConfig{
-				ServiceAccount: CreateVMFromTemplateServiceAccountName,
+				ServiceAccount: CreateVMFromTemplateServiceAccountNameNamespaced,
 				ExpectedLogs:   "templates.template.openshift.io \"unreachable-template\" is forbidden",
-				LimitTestScope: NamespaceTestScope,
 			},
 			TaskData: testconfigs.CreateVMTaskData{
 				TemplateTargetNamespace: SystemTargetNS,
@@ -301,18 +299,17 @@ var _ = Describe("Create VM from template", func() {
 				},
 			},
 		}),
-		Entry("[CLUSTER SCOPED] works also in the same namespace as deploy", &testconfigs.CreateVMTestConfig{
+		Entry("works also in the same namespace as deploy", &testconfigs.CreateVMTestConfig{
 			TaskRunTestConfig: testconfigs.TaskRunTestConfig{
 				ServiceAccount: CreateVMFromTemplateServiceAccountName,
-				LimitTestScope: ClusterTestScope,
 				ExpectedLogs:   ExpectedSuccessfulVMCreation,
 			},
 			TaskData: testconfigs.CreateVMTaskData{
 				Template:                testtemplate.NewCirrosServerTinyTemplate().Build(),
 				TemplateTargetNamespace: DeployTargetNS,
 				VMTargetNamespace:       DeployTargetNS,
 				TemplateParams: []string{
-					testtemplate.TemplateParam(testtemplate.NameParam, E2ETestsRandomName("same-ns-cluster-scope")),
+					testtemplate.TemplateParam(testtemplate.NameParam, E2ETestsRandomName("same-ns")),
 				},
 			},
 		}),