From 7b556d90b12c6253400807956f073824206f2106 Mon Sep 17 00:00:00 2001 From: Nahshon Unna-Tsameret Date: Tue, 6 Oct 2020 15:28:17 +0300 Subject: [PATCH] V2V image is now with the same tag as vm-import Signed-off-by: Nahshon Unna-Tsameret --- ...yperconverged-operator.v1.3.0.clusterserviceversion.yaml | 6 +++--- deploy/operator.yaml | 2 +- hack/build-manifests.sh | 2 +- hack/config | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/deploy/olm-catalog/kubevirt-hyperconverged/1.3.0/kubevirt-hyperconverged-operator.v1.3.0.clusterserviceversion.yaml b/deploy/olm-catalog/kubevirt-hyperconverged/1.3.0/kubevirt-hyperconverged-operator.v1.3.0.clusterserviceversion.yaml index c1a63966d..c879d179c 100644 --- a/deploy/olm-catalog/kubevirt-hyperconverged/1.3.0/kubevirt-hyperconverged-operator.v1.3.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/kubevirt-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 index 907a2d431..222b55315 100644 --- 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 index 3eb5f93f5..797877a73 100755 --- 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 index 5a8b75adc..2fbf1a8d1 100644 --- 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"