V2V image is now with the same tag as vm-import

Signed-off-by: Nahshon Unna-Tsameret <[email protected]>
kubevirt · Oct 6, 2020 · 7b556d9 · 7b556d9
1 parent acbb0ea
commit 7b556d9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/...t-hyperconverged/1.3.0/kubevirt-hyperconverged-operator.v1.3.0.clusterserviceversion.yaml b/...t-hyperconverged/1.3.0/kubevirt-hyperconverged-operator.v1.3.0.clusterserviceversion.yaml
@@ -8,7 +8,7 @@ metadata:
     categories: OpenShift Optional
     certified: "false"
     containerImage: quay.io/kubevirt/hyperconverged-cluster-operator@sha256:95c8c3e9002ebe55254b9371757a98a3d29991ba83e3edfe405a9174c596365a
-    createdAt: "2020-10-06 12:31:48"
+    createdAt: "2020-10-06 15:26:30"
     description: |-
       **HyperConverged Cluster Operator** is an Operator pattern for managing multi-operator products.
       Specifcally, the HyperConverged Cluster Operator manages the deployment of KubeVirt,
@@ -2021,7 +2021,7 @@ spec:
                 - name: MONITORING_NAMESPACE
                   value: openshift-monitoring
                 - name: VIRTV2V_IMAGE
-                  value: quay.io/kubevirt/vm-import-virtv2v@sha256:461fb77b555f851b05f81b5e61c43f3ad555a0d299921bf6842f505e7bece4af
+                  value: quay.io/kubevirt/vm-import-virtv2v@sha256:f66d3167976340d9a65145ea5bc3d2e94cf0ab3855616a2641b27f1d2243624b
                 image: quay.io/kubevirt/vm-import-operator@sha256:62706b1ce8df1d4427f591f0b6a75a73560e724d8d5fc860144467ecf5be1edc
                 imagePullPolicy: IfNotPresent
                 name: vm-import-operator
@@ -2251,7 +2251,7 @@ spec:
     name: vm-import-controller
   - image: quay.io/kubevirt/vm-import-operator@sha256:62706b1ce8df1d4427f591f0b6a75a73560e724d8d5fc860144467ecf5be1edc
     name: vm-import-operator
-  - image: quay.io/kubevirt/vm-import-virtv2v@sha256:461fb77b555f851b05f81b5e61c43f3ad555a0d299921bf6842f505e7bece4af
+  - image: quay.io/kubevirt/vm-import-virtv2v@sha256:f66d3167976340d9a65145ea5bc3d2e94cf0ab3855616a2641b27f1d2243624b
     name: vm-import-virtv2v
   replaces: kubevirt-hyperconverged-operator.v1.2.0
   selector:

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -449,7 +449,7 @@ spec:
         - name: MONITORING_NAMESPACE
           value: openshift-monitoring
         - name: VIRTV2V_IMAGE
-          value: quay.io/kubevirt/vm-import-virtv2v@sha256:461fb77b555f851b05f81b5e61c43f3ad555a0d299921bf6842f505e7bece4af
+          value: quay.io/kubevirt/vm-import-virtv2v@sha256:f66d3167976340d9a65145ea5bc3d2e94cf0ab3855616a2641b27f1d2243624b
         image: quay.io/kubevirt/vm-import-operator@sha256:62706b1ce8df1d4427f591f0b6a75a73560e724d8d5fc860144467ecf5be1edc
         imagePullPolicy: IfNotPresent
         name: vm-import-operator

diff --git a/hack/build-manifests.sh b/hack/build-manifests.sh
@@ -267,7 +267,7 @@ function create_vm_import_csv() {
   local controllerDigest
   controllerDigest=$(get_image_digest "${containerPrefix}/vm-import-controller:${tag}")
   local virtv2vImage
-  virtv2vImage=$(get_image_digest "${containerPrefix}/vm-import-virtv2v:${VIRTV2V_IMAGE_VERSION}")
+  virtv2vImage=$(get_image_digest "${containerPrefix}/vm-import-virtv2v:${tag}")
 
   local dumpCRDsArg="--dump-crds"
   local operatorArgs=" \

diff --git a/hack/config b/hack/config
@@ -12,7 +12,6 @@ HPP_VERSION="v0.5.1"
 CONVERSION_CONTAINER_VERSION="v2.0.0"
 VMWARE_CONTAINER_VERSION="v2.0.0-9"
 VM_IMPORT_VERSION="v0.2.3"
-VIRTV2V_IMAGE_VERSION="v0.2.2"
 
 CONTAINER_REGISTRY="quay.io/kubevirt"