WIP: sidecar shim digest

Wait for: kubevirt/kubevirt#11272 to get the --sidecar-shim-image parameter on the CSV generator on kubevirt oeprator Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
kubevirt · Feb 28, 2024 · 902cc2d · 902cc2d
1 parent 448793d
commit 902cc2d
Show file tree

Hide file tree

Showing 6 changed files with 25 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,23a9883bd694a94ef386c0c42bd780ed83fd193fdedfe00e500bb25a9b0d2f12
 KUBEVIRT_EXPORTPROXY_IMAGE,quay.io/kubevirt/virt-exportproxy,KUBEVIRT_VERSION,085d40539ee4f413fbecdbd173a2eb6f27d43b8ae073edc0556f460d7c2b44d7
 KUBEVIRT_EXPORSERVER_IMAGE,quay.io/kubevirt/virt-exportserver,KUBEVIRT_VERSION,5f4c2749dbe33a4b5e126d0393be07060b07171d229cc9b8fcdf9b18ce2af4f3
+KUBEVIRT_PR_HELPER,quay.io/kubevirt/pr-helper,KUBEVIRT_VERSION,f3a0fe72820cd390aec1f3dadceb16c10303a671ecc9dff90e7796dab24e9e33
+KUBEVIRT_SIDECAR_SHIM,quay.io/kubevirt/sidecar-shim,KUBEVIRT_VERSION,cc3bff064f71bfd873d6bd8ba6e9b1173062e769e2f32cd2918902dd27f9521c
 CNA_OPERATOR_IMAGE,quay.io/kubevirt/cluster-network-addons-operator,NETWORK_ADDONS_VERSION,bf17da674ed6dac95aa4fd7637173fd4e026ebb4523b66f529c0eff394a25bcc
 SSP_OPERATOR_IMAGE,quay.io/kubevirt/ssp-operator,SSP_VERSION,d57ef05fea09c4690dbe728ebe6a39d9df1a3574dfa7d18346bf3fe66afed702
 SSP_VALIDATOR_IMAGE,quay.io/kubevirt/kubevirt-template-validator,SSP_VERSION,f6db539fe4d4b752644c6bc8a308f5a80ae09a71da5c5d535114dc4c3cf18e0a

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:23a9883bd694a94ef386c0c42bd780ed83fd193fdedfe00e500bb25a9b0d2f12
 KUBEVIRT_EXPORTPROXY_IMAGE=quay.io/kubevirt/virt-exportproxy@sha256:085d40539ee4f413fbecdbd173a2eb6f27d43b8ae073edc0556f460d7c2b44d7
 KUBEVIRT_EXPORSERVER_IMAGE=quay.io/kubevirt/virt-exportserver@sha256:5f4c2749dbe33a4b5e126d0393be07060b07171d229cc9b8fcdf9b18ce2af4f3
+KUBEVIRT_PR_HELPER=quay.io/kubevirt/pr-helper@sha256:f3a0fe72820cd390aec1f3dadceb16c10303a671ecc9dff90e7796dab24e9e33
+KUBEVIRT_SIDECAR_SHIM=quay.io/kubevirt/sidecar-shim@sha256:cc3bff064f71bfd873d6bd8ba6e9b1173062e769e2f32cd2918902dd27f9521c
 CNA_OPERATOR_IMAGE=quay.io/kubevirt/cluster-network-addons-operator@sha256:bf17da674ed6dac95aa4fd7637173fd4e026ebb4523b66f529c0eff394a25bcc
 SSP_OPERATOR_IMAGE=quay.io/kubevirt/ssp-operator@sha256:d57ef05fea09c4690dbe728ebe6a39d9df1a3574dfa7d18346bf3fe66afed702
 SSP_VALIDATOR_IMAGE=quay.io/kubevirt/kubevirt-template-validator@sha256:f6db539fe4d4b752644c6bc8a308f5a80ae09a71da5c5d535114dc4c3cf18e0a
@@ -42,6 +44,8 @@ DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/virtio-container-disk@sha256:f8e71a
 DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/libguestfs-tools@sha256:23a9883bd694a94ef386c0c42bd780ed83fd193fdedfe00e500bb25a9b0d2f12"
 DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/virt-exportproxy@sha256:085d40539ee4f413fbecdbd173a2eb6f27d43b8ae073edc0556f460d7c2b44d7"
 DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/virt-exportserver@sha256:5f4c2749dbe33a4b5e126d0393be07060b07171d229cc9b8fcdf9b18ce2af4f3"
+DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/pr-helper@sha256:f3a0fe72820cd390aec1f3dadceb16c10303a671ecc9dff90e7796dab24e9e33"
+DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/sidecar-shim@sha256:cc3bff064f71bfd873d6bd8ba6e9b1173062e769e2f32cd2918902dd27f9521c"
 DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cluster-network-addons-operator@sha256:bf17da674ed6dac95aa4fd7637173fd4e026ebb4523b66f529c0eff394a25bcc"
 DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/ssp-operator@sha256:d57ef05fea09c4690dbe728ebe6a39d9df1a3574dfa7d18346bf3fe66afed702"
 DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/kubevirt-template-validator@sha256:f6db539fe4d4b752644c6bc8a308f5a80ae09a71da5c5d535114dc4c3cf18e0a"

diff --git a/...rged/1.12.0/manifests/kubevirt-hyperconverged-operator.v1.12.0.clusterserviceversion.yaml b/...rged/1.12.0/manifests/kubevirt-hyperconverged-operator.v1.12.0.clusterserviceversion.yaml
@@ -3599,6 +3599,8 @@ spec:
                   value: quay.io/kubevirt/virt-exportserver@sha256:5f4c2749dbe33a4b5e126d0393be07060b07171d229cc9b8fcdf9b18ce2af4f3
                 - name: GS_IMAGE
                   value: quay.io/kubevirt/libguestfs-tools@sha256:23a9883bd694a94ef386c0c42bd780ed83fd193fdedfe00e500bb25a9b0d2f12
+                - name: PR_HELPER_IMAGE
+                  value: quay.io/kubevirt/pr-helper@sha256:f3a0fe72820cd390aec1f3dadceb16c10303a671ecc9dff90e7796dab24e9e33
                 - name: KUBEVIRT_VERSION
                   value: v1.2.0-rc.0
                 image: quay.io/kubevirt/virt-operator@sha256:9dbd5134aedcad2fe7ade95f869fb293df5182cadf62fdae9c1fe25b098bcc8a
@@ -4826,6 +4828,10 @@ spec:
     name: origin-kube-rbac-proxy
   - image: quay.io/kubevirt/ovs-cni-plugin@sha256:e16ac74343da21abb8fb668ce71e728053d00503a992dae2164b9e94a280113e
     name: ovs-cni-plugin
+  - image: quay.io/kubevirt/pr-helper@sha256:f3a0fe72820cd390aec1f3dadceb16c10303a671ecc9dff90e7796dab24e9e33
+    name: pr-helper
+  - image: quay.io/kubevirt/sidecar-shim@sha256:cc3bff064f71bfd873d6bd8ba6e9b1173062e769e2f32cd2918902dd27f9521c
+    name: sidecar-shim
   - image: quay.io/kubevirt/ssp-operator@sha256:d57ef05fea09c4690dbe728ebe6a39d9df1a3574dfa7d18346bf3fe66afed702
     name: ssp-operator
   - image: quay.io/kubevirt/virt-api@sha256:e84b611532dbfbcf30ce47b9f5065a1d46a81defbe5c1f664216ce2217c5ef8e

diff --git a/...rged/1.12.0/manifests/kubevirt-hyperconverged-operator.v1.12.0.clusterserviceversion.yaml b/...rged/1.12.0/manifests/kubevirt-hyperconverged-operator.v1.12.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.12.0-unstable
-    createdAt: "2024-02-15 05:13:56"
+    createdAt: "2024-02-28 16:18:36"
     description: A unified operator deploying and controlling KubeVirt and its supporting
       operators with opinionated defaults
     features.operators.openshift.io/cnf: "false"
@@ -3599,6 +3599,8 @@ spec:
                   value: quay.io/kubevirt/virt-exportserver@sha256:5f4c2749dbe33a4b5e126d0393be07060b07171d229cc9b8fcdf9b18ce2af4f3
                 - name: GS_IMAGE
                   value: quay.io/kubevirt/libguestfs-tools@sha256:23a9883bd694a94ef386c0c42bd780ed83fd193fdedfe00e500bb25a9b0d2f12
+                - name: PR_HELPER_IMAGE
+                  value: quay.io/kubevirt/pr-helper@sha256:f3a0fe72820cd390aec1f3dadceb16c10303a671ecc9dff90e7796dab24e9e33
                 - name: KUBEVIRT_VERSION
                   value: v1.2.0-rc.0
                 image: quay.io/kubevirt/virt-operator@sha256:9dbd5134aedcad2fe7ade95f869fb293df5182cadf62fdae9c1fe25b098bcc8a
@@ -4826,6 +4828,10 @@ spec:
     name: origin-kube-rbac-proxy
   - image: quay.io/kubevirt/ovs-cni-plugin@sha256:e16ac74343da21abb8fb668ce71e728053d00503a992dae2164b9e94a280113e
     name: ovs-cni-plugin
+  - image: quay.io/kubevirt/pr-helper@sha256:f3a0fe72820cd390aec1f3dadceb16c10303a671ecc9dff90e7796dab24e9e33
+    name: pr-helper
+  - image: quay.io/kubevirt/sidecar-shim@sha256:cc3bff064f71bfd873d6bd8ba6e9b1173062e769e2f32cd2918902dd27f9521c
+    name: sidecar-shim
   - image: quay.io/kubevirt/ssp-operator@sha256:d57ef05fea09c4690dbe728ebe6a39d9df1a3574dfa7d18346bf3fe66afed702
     name: ssp-operator
   - image: quay.io/kubevirt/virt-api@sha256:e84b611532dbfbcf30ce47b9f5065a1d46a81defbe5c1f664216ce2217c5ef8e

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -422,6 +422,8 @@ spec:
           value: quay.io/kubevirt/virt-exportserver@sha256:5f4c2749dbe33a4b5e126d0393be07060b07171d229cc9b8fcdf9b18ce2af4f3
         - name: GS_IMAGE
           value: quay.io/kubevirt/libguestfs-tools@sha256:23a9883bd694a94ef386c0c42bd780ed83fd193fdedfe00e500bb25a9b0d2f12
+        - name: PR_HELPER_IMAGE
+          value: quay.io/kubevirt/pr-helper@sha256:f3a0fe72820cd390aec1f3dadceb16c10303a671ecc9dff90e7796dab24e9e33
         - name: KUBEVIRT_VERSION
           value: v1.2.0-rc.0
         image: quay.io/kubevirt/virt-operator@sha256:9dbd5134aedcad2fe7ade95f869fb293df5182cadf62fdae9c1fe25b098bcc8a

diff --git a/hack/build-manifests.sh b/hack/build-manifests.sh
@@ -98,6 +98,9 @@ function create_virt_csv() {
   local operatorName="kubevirt"
   local dumpCRDsArg="--dumpCRDs"
   local operatorArgs
+  # TODO: add another parameter for --sidecar-shim-image
+  # once https://github.com/kubevirt/kubevirt/pull/11272
+  # get merged
   operatorArgs=" \
     --namespace=${OPERATOR_NAMESPACE} \
     --csvVersion=${CSV_VERSION} \
@@ -110,6 +113,7 @@ function create_virt_csv() {
     --virt-export-proxy-image="${KUBEVIRT_EXPORTPROXY_IMAGE}" \
     --virt-export-server-image="${KUBEVIRT_EXPORSERVER_IMAGE}" \
     --gs-image="${KUBEVIRT_LIBGUESTFS_TOOLS_IMAGE}" \
+    --pr-helper-image="${KUBEVIRT_PR_HELPER}" \
     --virt-operator-image="${KUBEVIRT_OPERATOR_IMAGE}"
   "