Merge pull request #550 from ksimon1/update-pipelines

feat: rework example pipelines

automation/e2e-tekton/example-pipelines-test.sh

@@ -29,17 +29,22 @@ done
 # SECRET
 accessKeyId="/tmp/secrets/accessKeyId"
 secretKey="/tmp/secrets/secretKey"
+namespace="kubevirt"
+if [[ $TARGET =~ windows10.* ]]; then
+  namespace="kubevirt-os-images"
+  oc create namespace ${namespace}
+fi
 
 if test -f "$accessKeyId" && test -f "$secretKey"; then
   id=$(cat $accessKeyId | tr -d '\n' | base64)
   token=$(cat $secretKey | tr -d '\n' | base64 | tr -d ' \n')
 
-  oc apply -n kubevirt -f - <<EOF
+  oc apply -n ${namespace} -f - <<EOF
 apiVersion: v1
 kind: Secret
 metadata:
   name: tekton-operator-container-disk-puller
-  namespace: kubevirt
+  namespace: ${namespace}
 type: Opaque
 data:
   accessKeyId: "${id}"
@@ -76,22 +81,22 @@ function wait_for_pipelinerun() {
 oc patch cdi cdi --type merge -p '{"spec":{"cloneStrategyOverride":"copy"}}'
 
 echo "Creating datavolume with windows iso"
-oc apply -f "automation/e2e-tekton/test-files/${TARGET}-dv.yaml"
+oc apply -n ${namespace} -f "automation/e2e-tekton/test-files/${TARGET}-dv.yaml"
 
 echo "Waiting for pvc to be created"
-wait_until_exists "pvc -n kubevirt iso-dv -o jsonpath='{.metadata.annotations.cdi\.kubevirt\.io/storage\.pod\.phase}'"
-oc wait -n kubevirt pvc iso-dv --timeout=10m --for=jsonpath='{.metadata.annotations.cdi\.kubevirt\.io/storage\.pod\.phase}'='Succeeded'
+wait_until_exists "pvc -n ${namespace} iso-dv -o jsonpath='{.metadata.annotations.cdi\.kubevirt\.io/storage\.pod\.phase}'"
+oc wait -n ${namespace}  pvc iso-dv --timeout=10m --for=jsonpath='{.metadata.annotations.cdi\.kubevirt\.io/storage\.pod\.phase}'='Succeeded'
 
 echo "Create config map for http server"
-oc apply -f "automation/e2e-tekton/test-files/configmap.yaml"
+oc apply -n ${namespace} -f "automation/e2e-tekton/test-files/configmap.yaml"
 
 echo "Deploying http-server to serve iso file to pipeline"
-oc apply -f "automation/e2e-tekton/test-files/http-server.yaml"
+oc apply -n ${namespace} -f "automation/e2e-tekton/test-files/http-server.yaml"
 
-wait_until_exists "pods -n kubevirt -l app=http-server"
+wait_until_exists "pods -n ${namespace} -l app=http-server"
 
 echo "Waiting for http server to be ready"
-oc wait -n kubevirt --for=condition=Ready pod -l app=http-server --timeout=10m
+oc wait -n ${namespace}  --for=condition=Ready pod -l app=http-server --timeout=10m
 
 echo "Deploy SSP operator"
 make deploy

automation/e2e-tekton/test-files/configmap.yaml

@@ -2,7 +2,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: nginx-conf
-  namespace: kubevirt
 data:
   nginx.conf: |
     worker_processes  3;

automation/e2e-tekton/test-files/http-server.yaml

@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: http-server
-  namespace: kubevirt
   labels:
     app: http-server
 spec:
@@ -38,7 +37,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: http-server
-  namespace: kubevirt
   labels:
     app: http-server
 spec:

automation/e2e-tekton/test-files/windows10-customize-pipelinerun.yaml

@@ -6,29 +6,13 @@ metadata:
     pipelinerun: windows10-customize-run
 spec:
   params:
-    - name: allowReplaceGoldenTemplate
-      value: true
-    - name: allowReplaceCustomizationTemplate
-      value: true
-    - name: sourceTemplateNamespace
-      value: kubevirt
+    - name: sourceDiskImageName
+      value: win10
+    - name: baseDvName
+      value: win10-customized
+    - name: preferenceName
+      value: "windows.10"
   pipelineRef:
     name: windows-customize
-  taskRunSpecs:
-    - pipelineTaskName: copy-template-customize
-      taskServiceAccountName: copy-template-task
-    - pipelineTaskName: modify-vm-template-customize
-      taskServiceAccountName: modify-vm-template-task
-    - pipelineTaskName: create-vm-from-template
-      taskServiceAccountName: create-vm-from-template-task
-    - pipelineTaskName: wait-for-vmi-status
-      taskServiceAccountName: wait-for-vmi-status-task
-    - pipelineTaskName: create-base-dv
-      taskServiceAccountName: modify-data-object-task
-    - pipelineTaskName: cleanup-vm
-      taskServiceAccountName: cleanup-vm-task
-    - pipelineTaskName: copy-template-golden
-      taskServiceAccountName: copy-template-task
-    - pipelineTaskName: modify-vm-template-golden
-      taskServiceAccountName: modify-vm-template-task
+  serviceAccountName: pipeline
 status: {}

automation/e2e-tekton/test-files/windows10-dv.yaml

@@ -2,7 +2,6 @@ apiVersion: cdi.kubevirt.io/v1beta1
 kind: DataVolume
 metadata:
   name: "iso-dv"
-  namespace: kubevirt
   annotations:
     cdi.kubevirt.io/storage.bind.immediate.requested: "true"
 spec:

automation/e2e-tekton/test-files/windows10-installer-pipelinerun.yaml

@@ -8,21 +8,7 @@ spec:
   params:
   - name: winImageDownloadURL
     value: http://http-server/disk.img
-  - name: sourceTemplateNamespace
-    value: kubevirt
   pipelineRef:
     name: windows-bios-installer
-  taskRunSpecs:
-    - pipelineTaskName: copy-template
-      taskServiceAccountName: copy-template-task
-    - pipelineTaskName: modify-vm-template
-      taskServiceAccountName: modify-vm-template-task
-    - pipelineTaskName: create-vm-from-template
-      taskServiceAccountName: create-vm-from-template-task
-    - pipelineTaskName: wait-for-vmi-status
-      taskServiceAccountName: wait-for-vmi-status-task
-    - pipelineTaskName: create-base-dv
-      taskServiceAccountName: modify-data-object-task
-    - pipelineTaskName: cleanup-vm
-      taskServiceAccountName: cleanup-vm-task
+  serviceAccountName: pipeline
 status: {}

automation/e2e-tekton/test-files/windows11-customize-pipelinerun.yaml

@@ -5,32 +5,7 @@ metadata:
   labels: 
     pipelinerun: windows11-customize-run
 spec:
-  params:
-    - name: sourceTemplateName
-      value: windows11-desktop-large
-    - name: sourceTemplateNamespace
-      value: kubevirt
-    - name: customizeTemplateName
-      value: windows11-desktop-large-customize-sqlserver
-    - name: goldenTemplateName
-      value: windows11-desktop-large-golden-sqlserver
   pipelineRef:
     name: windows-customize
-  taskRunSpecs:
-    - pipelineTaskName: copy-template-customize
-      taskServiceAccountName: copy-template-task
-    - pipelineTaskName: modify-vm-template-customize
-      taskServiceAccountName: modify-vm-template-task
-    - pipelineTaskName: create-vm-from-template
-      taskServiceAccountName: create-vm-from-template-task
-    - pipelineTaskName: wait-for-vmi-status
-      taskServiceAccountName: wait-for-vmi-status-task
-    - pipelineTaskName: create-base-dv
-      taskServiceAccountName: modify-data-object-task
-    - pipelineTaskName: cleanup-vm
-      taskServiceAccountName: cleanup-vm-task
-    - pipelineTaskName: copy-template-golden
-      taskServiceAccountName: copy-template-task
-    - pipelineTaskName: modify-vm-template-golden
-      taskServiceAccountName: modify-vm-template-task
+  serviceAccountName: pipeline
 status: {}

automation/e2e-tekton/test-files/windows11-dv.yaml

@@ -2,7 +2,6 @@ apiVersion: cdi.kubevirt.io/v1beta1
 kind: DataVolume
 metadata:
   name: "iso-dv"
-  namespace: kubevirt
   annotations:
     cdi.kubevirt.io/storage.bind.immediate.requested: "true"
 spec:

automation/e2e-tekton/test-files/windows11-installer-pipelinerun.yaml

@@ -8,23 +8,10 @@ spec:
   params:
   - name: winImageDownloadURL
     value: http://http-server/disk.img
-  - name: sourceTemplateNamespace
-    value: kubevirt
   pipelineRef:
     name: windows-efi-installer
+  serviceAccountName: pipeline
   taskRunSpecs:
-    - pipelineTaskName: copy-template
-      taskServiceAccountName: copy-template-task
-    - pipelineTaskName: modify-vm-template
-      taskServiceAccountName: modify-vm-template-task
-    - pipelineTaskName: create-vm-from-template
-      taskServiceAccountName: create-vm-from-template-task
-    - pipelineTaskName: wait-for-vmi-status
-      taskServiceAccountName: wait-for-vmi-status-task
-    - pipelineTaskName: create-base-dv
-      taskServiceAccountName: modify-data-object-task
-    - pipelineTaskName: cleanup-vm
-      taskServiceAccountName: cleanup-vm-task
     - pipelineTaskName: "modify-windows-iso-file"
       taskPodTemplate:
         securityContext:

automation/e2e-tekton/test-files/windows2k22-customize-pipelinerun.yaml

@@ -6,33 +6,15 @@ metadata:
     pipelinerun: windows2k22-customize-run
 spec:
   params:
-    - name: sourceTemplateName
-      value: windows2k22-server-large
-    - name: customizeTemplateName
-      value: windows2k22-desktop-large-customize-sqlserver
-    - name: goldenTemplateName
-      value: windows2k22-desktop-large-golden-sqlserver
+    - name: sourceDiskImageName
+      value: win2k22
+    - name: baseDvName
+      value: win2k22-customized
+    - name: preferenceName
+      value: "windows.2k22"
     - name: customizeConfigMapName
       value: windows-sqlserver
-    - name: sourceTemplateNamespace
-      value: kubevirt
   pipelineRef:
     name: windows-customize
-  taskRunSpecs:
-    - pipelineTaskName: copy-template-customize
-      taskServiceAccountName: copy-template-task
-    - pipelineTaskName: modify-vm-template-customize
-      taskServiceAccountName: modify-vm-template-task
-    - pipelineTaskName: create-vm-from-template
-      taskServiceAccountName: create-vm-from-template-task
-    - pipelineTaskName: wait-for-vmi-status
-      taskServiceAccountName: wait-for-vmi-status-task
-    - pipelineTaskName: create-base-dv
-      taskServiceAccountName: modify-data-object-task
-    - pipelineTaskName: cleanup-vm
-      taskServiceAccountName: cleanup-vm-task
-    - pipelineTaskName: copy-template-golden
-      taskServiceAccountName: copy-template-task
-    - pipelineTaskName: modify-vm-template-golden
-      taskServiceAccountName: modify-vm-template-task
+  serviceAccountName: pipeline
 status: {}

automation/e2e-tekton/test-files/windows2k22-dv.yaml

@@ -2,7 +2,6 @@ apiVersion: cdi.kubevirt.io/v1beta1
 kind: DataVolume
 metadata:
   name: "iso-dv"
-  namespace: kubevirt
   annotations:
     cdi.kubevirt.io/storage.bind.immediate.requested: "true"
 spec:

automation/e2e-tekton/test-files/windows2k22-installer-pipelinerun.yaml

@@ -8,29 +8,18 @@ spec:
   params:
   - name: winImageDownloadURL
     value: http://http-server/disk.img
+  - name: preferenceName
+    value: "windows.2k22"
   - name: autounattendConfigMapName
     value: windows2k22-autounattend
-  - name: sourceTemplateName
-    value: windows2k22-server-large
-  - name: sourceTemplateNamespace
-    value: kubevirt
   - name: baseDvName
     value: win2k22
+  - name: isoDVName
+    value: win2k22
   pipelineRef:
     name: windows-efi-installer
+  serviceAccountName: pipeline
   taskRunSpecs:
-    - pipelineTaskName: copy-template
-      taskServiceAccountName: copy-template-task
-    - pipelineTaskName: modify-vm-template
-      taskServiceAccountName: modify-vm-template-task
-    - pipelineTaskName: create-vm-from-template
-      taskServiceAccountName: create-vm-from-template-task
-    - pipelineTaskName: wait-for-vmi-status
-      taskServiceAccountName: wait-for-vmi-status-task
-    - pipelineTaskName: create-base-dv
-      taskServiceAccountName: modify-data-object-task
-    - pipelineTaskName: cleanup-vm
-      taskServiceAccountName: cleanup-vm-task
     - pipelineTaskName: "modify-windows-iso-file"
       taskPodTemplate:
         securityContext:

controllers/setup.go

@@ -63,7 +63,7 @@ func setupManager(ctx context.Context, cancel context.CancelFunc, mgr controller
 		return fmt.Errorf("failed to read vm-console-proxy bundle: %w", err)
 	}
 
-	tektonPipelinesBundle, err := tekton_bundle.ReadPipelineBundle(runningOnOpenShift)
+	tektonPipelinesBundle, err := tekton_bundle.ReadPipelineBundle()
 	if err != nil {
 		return err
 	}