Merge pull request #700 from kubevirt-bot/cherry-pick-696-to-release-…

…v0.18 [release-v0.18] fix: remove "cdi.kubevirt.io/storage.bind.immediate.requested" annotation from pipelines
kubevirt · Oct 11, 2023 · 8d083ed · 8d083ed
2 parents 12b9ba6 + 64dbe60
commit 8d083ed
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/data/tekton-pipelines/windows-bios-installer-pipeline.yaml b/data/tekton-pipelines/windows-bios-installer-pipeline.yaml
@@ -55,8 +55,6 @@ spec:
             apiVersion: cdi.kubevirt.io/v1beta1
             kind: DataVolume
             metadata:
-              annotations:
-                "cdi.kubevirt.io/storage.bind.immediate.requested": "true"
               name: $(params.baseDvName)
               namespace: $(params.baseDvNamespace)
             spec:
@@ -67,7 +65,7 @@ spec:
               source:
                 blank: {}
         - name: waitForSuccess
-          value: true
+          value: false
         - name: allowReplace
           value: true
     - name: create-vm

diff --git a/data/tekton-pipelines/windows-customize-pipeline.yaml b/data/tekton-pipelines/windows-customize-pipeline.yaml
@@ -54,8 +54,6 @@ spec:
             apiVersion: cdi.kubevirt.io/v1beta1
             kind: DataVolume
             metadata:
-              annotations:
-                "cdi.kubevirt.io/storage.bind.immediate.requested": "true"
               name: $(params.baseDvName)
               namespace: $(params.baseDvNamespace)
             spec:
@@ -65,7 +63,7 @@ spec:
                   name: $(params.sourceDiskImageName)
                   namespace: $(params.sourceDiskImageNamespace)
         - name: waitForSuccess
-          value: true
+          value: false
         - name: allowReplace
           value: true
     - name: create-vm

diff --git a/data/tekton-pipelines/windows-efi-installer-pipeline.yaml b/data/tekton-pipelines/windows-efi-installer-pipeline.yaml
@@ -52,8 +52,6 @@ spec:
             apiVersion: cdi.kubevirt.io/v1beta1
             kind: DataVolume
             metadata:
-              annotations:
-                "cdi.kubevirt.io/storage.bind.immediate.requested": "true"
               generateName: $(params.isoDVName)-
             spec:
               source:
@@ -65,7 +63,7 @@ spec:
                   requests:
                     storage: 9Gi
         - name: waitForSuccess
-          value: true
+          value: false
         - name: allowReplace
           value: true
       taskRef:
@@ -91,8 +89,6 @@ spec:
             apiVersion: cdi.kubevirt.io/v1beta1
             kind: DataVolume
             metadata:
-              annotations:
-                "cdi.kubevirt.io/storage.bind.immediate.requested": "true"
               generateName: windows-efi-root-disk-
             spec:
               storage:
@@ -102,7 +98,7 @@ spec:
               source:
                 blank: {}
         - name: waitForSuccess
-          value: true
+          value: false
     - name: create-vm
       params:
         - name: runStrategy
@@ -181,10 +177,10 @@ spec:
             apiVersion: cdi.kubevirt.io/v1beta1
             kind: DataVolume
             metadata:
-              name: $(params.baseDvName)
-              namespace: $(params.baseDvNamespace)
               annotations:
                 "cdi.kubevirt.io/storage.bind.immediate.requested": "true"
+              name: $(params.baseDvName)
+              namespace: $(params.baseDvNamespace)
             spec:
               storage: {}
               source: