Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the VIRTV2V_IMAGE environment variable to the CSV #863

Merged
merged 2 commits into from
Oct 6, 2020
Merged

Add the VIRTV2V_IMAGE environment variable to the CSV #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acbb0ea
Add the VIRTV2V_IMAGE environment variable to the CSV
nunnatsa Oct 6, 2020
7b556d9
V2V image is now with the same tag as vm-import
nunnatsa Oct 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...t-hyperconverged/1.3.0/kubevirt-hyperconverged-operator.v1.3.0.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
categories: OpenShift Optional
certified: "false"
containerImage: quay.io/kubevirt/hyperconverged-cluster-operator@sha256:95c8c3e9002ebe55254b9371757a98a3d29991ba83e3edfe405a9174c596365a
createdAt: "2020-10-06 08:40:46"
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,
Expand Down Expand Up @@ -2021,6 +2021,7 @@ spec:
- name: MONITORING_NAMESPACE
value: openshift-monitoring
- name: VIRTV2V_IMAGE
value: quay.io/kubevirt/vm-import-virtv2v@sha256:f66d3167976340d9a65145ea5bc3d2e94cf0ab3855616a2641b27f1d2243624b
image: quay.io/kubevirt/vm-import-operator@sha256:62706b1ce8df1d4427f591f0b6a75a73560e724d8d5fc860144467ecf5be1edc
imagePullPolicy: IfNotPresent
name: vm-import-operator
Expand Down Expand Up @@ -2250,6 +2251,8 @@ 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:f66d3167976340d9a65145ea5bc3d2e94cf0ab3855616a2641b27f1d2243624b
name: vm-import-virtv2v
replaces: kubevirt-hyperconverged-operator.v1.2.0
selector:
matchLabels:
Expand Down
1 change: 1 addition & 0 deletions deploy/operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,7 @@ spec:
- name: MONITORING_NAMESPACE
value: openshift-monitoring
- name: VIRTV2V_IMAGE
value: quay.io/kubevirt/vm-import-virtv2v@sha256:f66d3167976340d9a65145ea5bc3d2e94cf0ab3855616a2641b27f1d2243624b
image: quay.io/kubevirt/vm-import-operator@sha256:62706b1ce8df1d4427f591f0b6a75a73560e724d8d5fc860144467ecf5be1edc
imagePullPolicy: IfNotPresent
name: vm-import-operator
Expand Down
4 changes: 4 additions & 0 deletions hack/build-manifests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,13 +266,17 @@ function create_vm_import_csv() {
local tag="${VM_IMPORT_IMAGE/*:/}"
local controllerDigest
controllerDigest=$(get_image_digest "${containerPrefix}/vm-import-controller:${tag}")
local virtv2vImage
virtv2vImage=$(get_image_digest "${containerPrefix}/vm-import-virtv2v:${tag}")

local dumpCRDsArg="--dump-crds"
local operatorArgs=" \
--csv-version=${CSV_VERSION} \
--operator-version=${VM_IMPORT_VERSION} \
--operator-image=${operatorDigest} \
--controller-image=${controllerDigest} \
--namespace=${OPERATOR_NAMESPACE} \
--virtv2v-image=${virtv2vImage} \
--pull-policy=IfNotPresent \
"

Expand Down