Reference Kubevirt ancillary images by digest

Correctly reference two Kubevirt ancillary images (quay.io/kubevirt/pr-helper and quay.io/kubevirt/sidecar-shim) by digest instead of having them eventually pulled by tag according to Kubevirt operator version. Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
kubevirt · Aug 21, 2024 · e24af3f · e24af3f
1 parent d7a9407
commit e24af3f
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 1 deletion.
diff --git a/deploy/images.csv b/deploy/images.csv
@@ -8,6 +8,8 @@ KUBEVIRT_VIRTIO_IMAGE,quay.io/kubevirt/virtio-container-disk,KUBEVIRT_VERSION,f8
 KUBEVIRT_LIBGUESTFS_TOOLS_IMAGE,quay.io/kubevirt/libguestfs-tools,KUBEVIRT_VERSION,e138aeab10ea50853af0afa403d408b6080b1e4521288b5f066aaae78dfc3d78
 KUBEVIRT_EXPORTPROXY_IMAGE,quay.io/kubevirt/virt-exportproxy,KUBEVIRT_VERSION,341cb4fc2dc2f9760445554d8cd07220d2ea7db87644d76d5abff338834f304e
 KUBEVIRT_EXPORSERVER_IMAGE,quay.io/kubevirt/virt-exportserver,KUBEVIRT_VERSION,471339141fecb94c40a9e3314f054c9f4d86dd2475b323309f72d8b60f8846f2
+KUBEVIRT_PR_HELPER,quay.io/kubevirt/pr-helper,KUBEVIRT_VERSION,e9cfe1c0d1f72e371ed8e69b9ff7da38dc3fcf53d40da54c37e2712f385380e4
+KUBEVIRT_SIDECAR_SHIM,quay.io/kubevirt/sidecar-shim,KUBEVIRT_VERSION,658a7b34c53b07752ad39295c673481728508c020476e7d64f36c4ecdf4a736b
 PRIMARY_USER_DEFINED_NETWORK_BINDING_IMAGE,quay.io/kubevirt/network-passt-binding,KUBEVIRT_VERSION,3fb5f9fb87a9ab1f06bed2b2358ad862ef66bc47dc73044f1076a3eb9a4c55ff
 CNA_OPERATOR_IMAGE,quay.io/kubevirt/cluster-network-addons-operator,NETWORK_ADDONS_VERSION,935b837a9f0c23d24bc7b20909928edb5ffe1ca9f6aa160567a652c2951785ea
 SSP_OPERATOR_IMAGE,quay.io/kubevirt/ssp-operator,SSP_VERSION,f1215c0e6e6c94df60691c838de7140fad338f702c685d204a43610179fb31c1

diff --git a/deploy/images.env b/deploy/images.env
@@ -7,6 +7,8 @@ KUBEVIRT_VIRTIO_IMAGE=quay.io/kubevirt/virtio-container-disk@sha256:f8e71a3a930c
 KUBEVIRT_LIBGUESTFS_TOOLS_IMAGE=quay.io/kubevirt/libguestfs-tools@sha256:e138aeab10ea50853af0afa403d408b6080b1e4521288b5f066aaae78dfc3d78
 KUBEVIRT_EXPORTPROXY_IMAGE=quay.io/kubevirt/virt-exportproxy@sha256:341cb4fc2dc2f9760445554d8cd07220d2ea7db87644d76d5abff338834f304e
 KUBEVIRT_EXPORSERVER_IMAGE=quay.io/kubevirt/virt-exportserver@sha256:471339141fecb94c40a9e3314f054c9f4d86dd2475b323309f72d8b60f8846f2
+KUBEVIRT_PR_HELPER=quay.io/kubevirt/pr-helper@sha256:e9cfe1c0d1f72e371ed8e69b9ff7da38dc3fcf53d40da54c37e2712f385380e4
+KUBEVIRT_SIDECAR_SHIM=quay.io/kubevirt/sidecar-shim@sha256:658a7b34c53b07752ad39295c673481728508c020476e7d64f36c4ecdf4a736b
 PRIMARY_USER_DEFINED_NETWORK_BINDING_IMAGE=quay.io/kubevirt/network-passt-binding@sha256:3fb5f9fb87a9ab1f06bed2b2358ad862ef66bc47dc73044f1076a3eb9a4c55ff
 CNA_OPERATOR_IMAGE=quay.io/kubevirt/cluster-network-addons-operator@sha256:935b837a9f0c23d24bc7b20909928edb5ffe1ca9f6aa160567a652c2951785ea
 SSP_OPERATOR_IMAGE=quay.io/kubevirt/ssp-operator@sha256:f1215c0e6e6c94df60691c838de7140fad338f702c685d204a43610179fb31c1
@@ -40,6 +42,8 @@ DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/virtio-container-disk@sha256:f8e71a
 DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/libguestfs-tools@sha256:e138aeab10ea50853af0afa403d408b6080b1e4521288b5f066aaae78dfc3d78"
 DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/virt-exportproxy@sha256:341cb4fc2dc2f9760445554d8cd07220d2ea7db87644d76d5abff338834f304e"
 DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/virt-exportserver@sha256:471339141fecb94c40a9e3314f054c9f4d86dd2475b323309f72d8b60f8846f2"
+DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/pr-helper@sha256:e9cfe1c0d1f72e371ed8e69b9ff7da38dc3fcf53d40da54c37e2712f385380e4"
+DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/sidecar-shim@sha256:658a7b34c53b07752ad39295c673481728508c020476e7d64f36c4ecdf4a736b"
 DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/network-passt-binding@sha256:3fb5f9fb87a9ab1f06bed2b2358ad862ef66bc47dc73044f1076a3eb9a4c55ff"
 DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cluster-network-addons-operator@sha256:935b837a9f0c23d24bc7b20909928edb5ffe1ca9f6aa160567a652c2951785ea"
 DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/ssp-operator@sha256:f1215c0e6e6c94df60691c838de7140fad338f702c685d204a43610179fb31c1"

diff --git a/...rged/1.13.0/manifests/kubevirt-hyperconverged-operator.v1.13.0.clusterserviceversion.yaml b/...rged/1.13.0/manifests/kubevirt-hyperconverged-operator.v1.13.0.clusterserviceversion.yaml
@@ -3476,6 +3476,10 @@ spec:
                   value: quay.io/kubevirt/virt-exportserver@sha256:471339141fecb94c40a9e3314f054c9f4d86dd2475b323309f72d8b60f8846f2
                 - name: GS_IMAGE
                   value: quay.io/kubevirt/libguestfs-tools@sha256:e138aeab10ea50853af0afa403d408b6080b1e4521288b5f066aaae78dfc3d78
+                - name: PR_HELPER_IMAGE
+                  value: quay.io/kubevirt/pr-helper@sha256:e9cfe1c0d1f72e371ed8e69b9ff7da38dc3fcf53d40da54c37e2712f385380e4
+                - name: SIDECAR_SHIM_IMAGE
+                  value: quay.io/kubevirt/sidecar-shim@sha256:658a7b34c53b07752ad39295c673481728508c020476e7d64f36c4ecdf4a736b
                 - name: KUBEVIRT_VERSION
                   value: v1.3.0
                 image: quay.io/kubevirt/virt-operator@sha256:5f3d7dc740744d8b65016ca0e74eaa313d01a591a42a82498d09b6877f6d57d0
@@ -4668,6 +4672,10 @@ spec:
     name: ovs-cni-plugin
   - image: ghcr.io/kubevirt/passt-binding-cni@sha256:26c19e9292a76c5311c8ff66059ddf4f8085eee9c075d642cd86d645ebc31088
     name: passt-binding-cni
+  - image: quay.io/kubevirt/pr-helper@sha256:e9cfe1c0d1f72e371ed8e69b9ff7da38dc3fcf53d40da54c37e2712f385380e4
+    name: pr-helper
+  - image: quay.io/kubevirt/sidecar-shim@sha256:658a7b34c53b07752ad39295c673481728508c020476e7d64f36c4ecdf4a736b
+    name: sidecar-shim
   - image: quay.io/kubevirt/ssp-operator@sha256:f1215c0e6e6c94df60691c838de7140fad338f702c685d204a43610179fb31c1
     name: ssp-operator
   - image: quay.io/kubevirt/virt-api@sha256:3f1e97424b7563fbab544b128fb06d0b84efea1a209be09178722309f34b215e

diff --git a/...rged/1.13.0/manifests/kubevirt-hyperconverged-operator.v1.13.0.clusterserviceversion.yaml b/...rged/1.13.0/manifests/kubevirt-hyperconverged-operator.v1.13.0.clusterserviceversion.yaml
@@ -9,7 +9,7 @@ metadata:
     certified: "false"
     console.openshift.io/disable-operand-delete: "true"
     containerImage: quay.io/kubevirt/hyperconverged-cluster-operator:1.13.0-unstable
-    createdAt: "2024-08-20 05:04:19"
+    createdAt: "2024-08-21 18:52:56"
     description: A unified operator deploying and controlling KubeVirt and its supporting
       operators with opinionated defaults
     features.operators.openshift.io/cnf: "false"
@@ -3476,6 +3476,10 @@ spec:
                   value: quay.io/kubevirt/virt-exportserver@sha256:471339141fecb94c40a9e3314f054c9f4d86dd2475b323309f72d8b60f8846f2
                 - name: GS_IMAGE
                   value: quay.io/kubevirt/libguestfs-tools@sha256:e138aeab10ea50853af0afa403d408b6080b1e4521288b5f066aaae78dfc3d78
+                - name: PR_HELPER_IMAGE
+                  value: quay.io/kubevirt/pr-helper@sha256:e9cfe1c0d1f72e371ed8e69b9ff7da38dc3fcf53d40da54c37e2712f385380e4
+                - name: SIDECAR_SHIM_IMAGE
+                  value: quay.io/kubevirt/sidecar-shim@sha256:658a7b34c53b07752ad39295c673481728508c020476e7d64f36c4ecdf4a736b
                 - name: KUBEVIRT_VERSION
                   value: v1.3.0
                 image: quay.io/kubevirt/virt-operator@sha256:5f3d7dc740744d8b65016ca0e74eaa313d01a591a42a82498d09b6877f6d57d0
@@ -4668,6 +4672,10 @@ spec:
     name: ovs-cni-plugin
   - image: ghcr.io/kubevirt/passt-binding-cni@sha256:26c19e9292a76c5311c8ff66059ddf4f8085eee9c075d642cd86d645ebc31088
     name: passt-binding-cni
+  - image: quay.io/kubevirt/pr-helper@sha256:e9cfe1c0d1f72e371ed8e69b9ff7da38dc3fcf53d40da54c37e2712f385380e4
+    name: pr-helper
+  - image: quay.io/kubevirt/sidecar-shim@sha256:658a7b34c53b07752ad39295c673481728508c020476e7d64f36c4ecdf4a736b
+    name: sidecar-shim
   - image: quay.io/kubevirt/ssp-operator@sha256:f1215c0e6e6c94df60691c838de7140fad338f702c685d204a43610179fb31c1
     name: ssp-operator
   - image: quay.io/kubevirt/virt-api@sha256:3f1e97424b7563fbab544b128fb06d0b84efea1a209be09178722309f34b215e

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -430,6 +430,10 @@ spec:
           value: quay.io/kubevirt/virt-exportserver@sha256:471339141fecb94c40a9e3314f054c9f4d86dd2475b323309f72d8b60f8846f2
         - name: GS_IMAGE
           value: quay.io/kubevirt/libguestfs-tools@sha256:e138aeab10ea50853af0afa403d408b6080b1e4521288b5f066aaae78dfc3d78
+        - name: PR_HELPER_IMAGE
+          value: quay.io/kubevirt/pr-helper@sha256:e9cfe1c0d1f72e371ed8e69b9ff7da38dc3fcf53d40da54c37e2712f385380e4
+        - name: SIDECAR_SHIM_IMAGE
+          value: quay.io/kubevirt/sidecar-shim@sha256:658a7b34c53b07752ad39295c673481728508c020476e7d64f36c4ecdf4a736b
         - name: KUBEVIRT_VERSION
           value: v1.3.0
         image: quay.io/kubevirt/virt-operator@sha256:5f3d7dc740744d8b65016ca0e74eaa313d01a591a42a82498d09b6877f6d57d0

diff --git a/hack/build-manifests.sh b/hack/build-manifests.sh
@@ -113,6 +113,8 @@ function create_virt_csv() {
     --virt-export-proxy-image="${KUBEVIRT_EXPORTPROXY_IMAGE}" \
     --virt-export-server-image="${KUBEVIRT_EXPORSERVER_IMAGE}" \
     --gs-image="${KUBEVIRT_LIBGUESTFS_TOOLS_IMAGE}" \
+    --sidecar-shim-image="${KUBEVIRT_SIDECAR_SHIM}" \
+    --pr-helper-image="${KUBEVIRT_PR_HELPER}" \
     --virt-operator-image="${KUBEVIRT_OPERATOR_IMAGE}"
   "