Use the new webhook image in deployment/CI/CSV (#974)

* Use the new webhook image in deployment/CI/CSV

Signed-off-by: Nahshon Unna-Tsameret <nunnatsa@redhat.com>

* fix Dockerfile.webhook and use a new quay.io image for webhook

Signed-off-by: Nahshon Unna-Tsameret <nunnatsa@redhat.com>

build/Dockerfile.webhook

@@ -19,7 +19,7 @@ RUN mkdir -p ${HOME} && \
     # runtime user will need to be able to self-insert in /etc/passwd
     chmod g+rw /etc/passwd
 
-COPY --from=builder /go/src/github.com/kubevirt/hyperconverged-cluster-operator/_out/hyperconverged-cluster-webhook $APP
+COPY --from=builder /go/src/github.com/kubevirt/hyperconverged-cluster-operator/_out/hyperconverged-cluster-webhook $WEBHOOK
 ENTRYPOINT ["/usr/local/bin/entrypoint"]
 USER ${USER_UID}
 

cluster/sync.sh

@@ -13,10 +13,11 @@ cp -r deploy _out/
 
 # Sed from quay.io to local registry
 sed -r -i 's|: quay.io/kubevirt/hyperconverged-cluster-operator(@sha256)?:.*$|: registry:5000/kubevirt/hyperconverged-cluster-operator:latest|g' _out/operator.yaml
+sed -r -i 's|: quay.io/kubevirt/hyperconverged-cluster-webhook(@sha256)?:.*$|: registry:5000/kubevirt/hyperconverged-cluster-webhook:latest|g' _out/operator.yaml
 
 CMD="./cluster/kubectl.sh" ./hack/clean.sh
 
-IMAGE_REGISTRY=$registry make container-build-operator container-push-operator
+IMAGE_REGISTRY=$registry make container-build-operator container-push-operator container-build-webhook container-push-webhook
 
 nodes=()
 if [[ $KUBEVIRT_PROVIDER =~ (okd|ocp).* ]]; then
@@ -36,10 +37,11 @@ docker ps -a
 
 for node in ${nodes[@]}; do
     ./cluster/ssh.sh ${node} "echo registry:5000/kubevirt/hyperconverged-cluster-operator | xargs \-\-max-args=1 sudo ${pull_command} pull"
+    ./cluster/ssh.sh ${node} "echo registry:5000/kubevirt/hyperconverged-cluster-webhook | xargs \-\-max-args=1 sudo ${pull_command} pull"
     # Temporary until image is updated with provisioner that sets this field
     # This field is required by buildah tool
     ./cluster/ssh.sh ${node} "echo user.max_user_namespaces=1024 | xargs \-\-max-args=1 sudo sysctl -w"
 done
 
 # Deploy the HCO
-CMD="./cluster/kubectl.sh" HCO_IMAGE="registry:5000/kubevirt/hyperconverged-cluster-operator:latest" ./hack/deploy.sh
+CMD="./cluster/kubectl.sh" HCO_IMAGE="registry:5000/kubevirt/hyperconverged-cluster-operator:latest" WEBHOOK_IMAGE="registry:5000/kubevirt/hyperconverged-cluster-webhook:latest" ./hack/deploy.sh

deploy/images.csv

@@ -19,6 +19,7 @@ VMIMPORT_OPERATOR_IMAGE,quay.io/kubevirt/vm-import-operator,VM_IMPORT_VERSION,74
 VMIMPORT_CONTROLLER_IMAGE,quay.io/kubevirt/vm-import-controller,VM_IMPORT_VERSION,481f4a493a66d1310734ac135e8dbaa5dc01c9d93f6e9ecc9326b81c1c08dbfe
 VMIMPORT_VIRTV2V_IMAGE,quay.io/kubevirt/vm-import-virtv2v,VM_IMPORT_VERSION,97caccb965d771afefd901c71381b6c1126e4177b477d47f2ca5ca57c5b06593
 HCO_OPERATOR_IMAGE,quay.io/kubevirt/hyperconverged-cluster-operator,CSV_VERSION,60eecee0ed3ac42710f0ea2fdbcd643763cb4f68830ded0e7a74cc33413c9de1
+HCO_WEBHOOK_IMAGE,quay.io/kubevirt/hyperconverged-cluster-webhook,CSV_VERSION,3958b53411549f216b7ba05d9fc67fab64c7930d979bddf8df26f29bd860281c
 NMO_IMAGE,quay.io/kubevirt/node-maintenance-operator,NMO_VERSION,71bb8de714dc0de0616050d66405ccb58841930fc1562a61399e1b964a0b678a
 CONVERSION_IMAGE,quay.io/kubevirt/kubevirt-v2v-conversion,CONVERSION_CONTAINER_VERSION,c620233c71b805004c2cd38927c421b69d99b27cb40af521967e655882b2f815
 VMWARE_IMAGE,quay.io/kubevirt/kubevirt-vmware,VMWARE_CONTAINER_VERSION,ae5ccd98a49ab9e154ce482d2fa73f044b00211f273210a9cd371b40746d3c92

deploy/images.env

@@ -18,7 +18,8 @@ VMIMPORT_OPERATOR_IMAGE=quay.io/kubevirt/vm-import-operator@sha256:74fc74dab0671
 VMIMPORT_CONTROLLER_IMAGE=quay.io/kubevirt/vm-import-controller@sha256:481f4a493a66d1310734ac135e8dbaa5dc01c9d93f6e9ecc9326b81c1c08dbfe
 VMIMPORT_VIRTV2V_IMAGE=quay.io/kubevirt/vm-import-virtv2v@sha256:97caccb965d771afefd901c71381b6c1126e4177b477d47f2ca5ca57c5b06593
 HCO_OPERATOR_IMAGE=quay.io/kubevirt/hyperconverged-cluster-operator@sha256:60eecee0ed3ac42710f0ea2fdbcd643763cb4f68830ded0e7a74cc33413c9de1
+HCO_WEBHOOK_IMAGE=quay.io/kubevirt/hyperconverged-cluster-webhook@sha256:3958b53411549f216b7ba05d9fc67fab64c7930d979bddf8df26f29bd860281c
 NMO_IMAGE=quay.io/kubevirt/node-maintenance-operator@sha256:71bb8de714dc0de0616050d66405ccb58841930fc1562a61399e1b964a0b678a
 CONVERSION_IMAGE=quay.io/kubevirt/kubevirt-v2v-conversion@sha256:c620233c71b805004c2cd38927c421b69d99b27cb40af521967e655882b2f815
 VMWARE_IMAGE=quay.io/kubevirt/kubevirt-vmware@sha256:ae5ccd98a49ab9e154ce482d2fa73f044b00211f273210a9cd371b40746d3c92
-DIGEST_LIST=docker.io/kubevirt/virt-operator@sha256:494f1bfde54677e217ea621ff845c71bb1311d27064ba3b9f3811cb2244e54bf,docker.io/kubevirt/virt-api@sha256:bf38c1997f3c60a71d53b956f235973834d37c0c604b5711084b2a7ef8cd3c7b,docker.io/kubevirt/virt-controller@sha256:7b81c59034df51c1a1f54d3180e0df678469790b6a8ac4fcc5fcaa615b1ca84c,docker.io/kubevirt/virt-launcher@sha256:a6d9f1dada1d33a218ba9ed0494d2e2cd09f5596eff5eb5b8d70bfe1fd4f8812,docker.io/kubevirt/virt-handler@sha256:14b4bd6d62b585ef2f4dbacafc75a66a6c575c64ed630835cf4ef6c0f77d40d1,quay.io/kubevirt/cluster-network-addons-operator@sha256:b59aa2b6ae71d6ea6b08aa666252c14ec17cd035cc78c1e5c0b61505d39071ba,quay.io/fromani/kubevirt-ssp-operator-container@sha256:13ecfd8bc5779721378cfed69109bcc99392b0dcd589ddd600eb2648de9fce8c,docker.io/kubevirt/cdi-operator@sha256:8ab1445d8fe40c15c8101b8b9754ef0877025ec19242703f93c35920a57a5ccc,docker.io/kubevirt/cdi-controller@sha256:8135370750adf2eaa269b346a68f40ed9c93400f34e2a9817704dbe466aa8e92,docker.io/kubevirt/cdi-apiserver@sha256:0867622188ebb92b97b1f3f57f3fdfab4be6c9d06a9fb88552b234a0116f8de5,docker.io/kubevirt/cdi-cloner@sha256:5b4a4c484ce7395214b1a732837bbffa5109663a5d8b5160e8c546866cabfd39,docker.io/kubevirt/cdi-importer@sha256:d3dd042cc8643c05369eae4c2d2de3d72a801615b24f3ab849bf324b2910235d,docker.io/kubevirt/cdi-uploadproxy@sha256:f8abeba7bbb6f7e8327879c5a4b20703f2c93bafba2ac4dac77a445cafc6d217,docker.io/kubevirt/cdi-uploadserver@sha256:1a5e811ec425e65551f749727fb0c703f04b6bde7d2fd12b773122efd61c0310,quay.io/kubevirt/hostpath-provisioner-operator@sha256:4285a9b7a624b2f300a4060a035d506195dc9b342928f98adc5f7784d8478929,quay.io/kubevirt/hostpath-provisioner@sha256:9d92c216bc50d7fbfc787f315ad77dabd2ac26d981702efd545a1dd1f2b37c6c,quay.io/kubevirt/vm-import-operator@sha256:74fc74dab0671ef1098e69872e47bcb6f85a40b4b18a1e23fd6d3cfc36dfee32,quay.io/kubevirt/vm-import-controller@sha256:481f4a493a66d1310734ac135e8dbaa5dc01c9d93f6e9ecc9326b81c1c08dbfe,quay.io/kubevirt/vm-import-virtv2v@sha256:97caccb965d771afefd901c71381b6c1126e4177b477d47f2ca5ca57c5b06593,quay.io/kubevirt/hyperconverged-cluster-operator@sha256:60eecee0ed3ac42710f0ea2fdbcd643763cb4f68830ded0e7a74cc33413c9de1,quay.io/kubevirt/node-maintenance-operator@sha256:71bb8de714dc0de0616050d66405ccb58841930fc1562a61399e1b964a0b678a,quay.io/kubevirt/kubevirt-v2v-conversion@sha256:c620233c71b805004c2cd38927c421b69d99b27cb40af521967e655882b2f815,quay.io/kubevirt/kubevirt-vmware@sha256:ae5ccd98a49ab9e154ce482d2fa73f044b00211f273210a9cd371b40746d3c92
+DIGEST_LIST=docker.io/kubevirt/virt-operator@sha256:494f1bfde54677e217ea621ff845c71bb1311d27064ba3b9f3811cb2244e54bf,docker.io/kubevirt/virt-api@sha256:bf38c1997f3c60a71d53b956f235973834d37c0c604b5711084b2a7ef8cd3c7b,docker.io/kubevirt/virt-controller@sha256:7b81c59034df51c1a1f54d3180e0df678469790b6a8ac4fcc5fcaa615b1ca84c,docker.io/kubevirt/virt-launcher@sha256:a6d9f1dada1d33a218ba9ed0494d2e2cd09f5596eff5eb5b8d70bfe1fd4f8812,docker.io/kubevirt/virt-handler@sha256:14b4bd6d62b585ef2f4dbacafc75a66a6c575c64ed630835cf4ef6c0f77d40d1,quay.io/kubevirt/cluster-network-addons-operator@sha256:b59aa2b6ae71d6ea6b08aa666252c14ec17cd035cc78c1e5c0b61505d39071ba,quay.io/fromani/kubevirt-ssp-operator-container@sha256:13ecfd8bc5779721378cfed69109bcc99392b0dcd589ddd600eb2648de9fce8c,docker.io/kubevirt/cdi-operator@sha256:8ab1445d8fe40c15c8101b8b9754ef0877025ec19242703f93c35920a57a5ccc,docker.io/kubevirt/cdi-controller@sha256:8135370750adf2eaa269b346a68f40ed9c93400f34e2a9817704dbe466aa8e92,docker.io/kubevirt/cdi-apiserver@sha256:0867622188ebb92b97b1f3f57f3fdfab4be6c9d06a9fb88552b234a0116f8de5,docker.io/kubevirt/cdi-cloner@sha256:5b4a4c484ce7395214b1a732837bbffa5109663a5d8b5160e8c546866cabfd39,docker.io/kubevirt/cdi-importer@sha256:d3dd042cc8643c05369eae4c2d2de3d72a801615b24f3ab849bf324b2910235d,docker.io/kubevirt/cdi-uploadproxy@sha256:f8abeba7bbb6f7e8327879c5a4b20703f2c93bafba2ac4dac77a445cafc6d217,docker.io/kubevirt/cdi-uploadserver@sha256:1a5e811ec425e65551f749727fb0c703f04b6bde7d2fd12b773122efd61c0310,quay.io/kubevirt/hostpath-provisioner-operator@sha256:4285a9b7a624b2f300a4060a035d506195dc9b342928f98adc5f7784d8478929,quay.io/kubevirt/hostpath-provisioner@sha256:9d92c216bc50d7fbfc787f315ad77dabd2ac26d981702efd545a1dd1f2b37c6c,quay.io/kubevirt/vm-import-operator@sha256:74fc74dab0671ef1098e69872e47bcb6f85a40b4b18a1e23fd6d3cfc36dfee32,quay.io/kubevirt/vm-import-controller@sha256:481f4a493a66d1310734ac135e8dbaa5dc01c9d93f6e9ecc9326b81c1c08dbfe,quay.io/kubevirt/vm-import-virtv2v@sha256:97caccb965d771afefd901c71381b6c1126e4177b477d47f2ca5ca57c5b06593,quay.io/kubevirt/hyperconverged-cluster-operator@sha256:60eecee0ed3ac42710f0ea2fdbcd643763cb4f68830ded0e7a74cc33413c9de1,quay.io/kubevirt/hyperconverged-cluster-webhook@sha256:3958b53411549f216b7ba05d9fc67fab64c7930d979bddf8df26f29bd860281c,quay.io/kubevirt/node-maintenance-operator@sha256:71bb8de714dc0de0616050d66405ccb58841930fc1562a61399e1b964a0b678a,quay.io/kubevirt/kubevirt-v2v-conversion@sha256:c620233c71b805004c2cd38927c421b69d99b27cb40af521967e655882b2f815,quay.io/kubevirt/kubevirt-vmware@sha256:ae5ccd98a49ab9e154ce482d2fa73f044b00211f273210a9cd371b40746d3c92

deploy/index-image/kubevirt-hyperconverged/1.3.0/kubevirt-hyperconverged-operator.v1.3.0.clusterserviceversion.yaml

@@ -1784,7 +1784,7 @@ spec:
                 - name: APP
                   value: WEBHOOK
                 - name: OPERATOR_IMAGE
-                  value: +IMAGE_TO_REPLACE+
+                  value: +WEBHOOK_IMAGE_TO_REPLACE+
                 - name: OPERATOR_NAME
                   value: hyperconverged-cluster-webhook
                 - name: OPERATOR_NAMESPACE
@@ -1794,7 +1794,7 @@ spec:
                     fieldRef:
                       fieldPath: metadata.name
                 - name: WATCH_NAMESPACE
-                image: +IMAGE_TO_REPLACE+
+                image: +WEBHOOK_IMAGE_TO_REPLACE+
                 imagePullPolicy: IfNotPresent
                 livenessProbe:
                   failureThreshold: 1
@@ -2354,6 +2354,8 @@ spec:
     name: hostpath-provisioner-operator
   - image: +IMAGE_TO_REPLACE+
     name: hyperconverged-cluster-operator
+  - image: +WEBHOOK_IMAGE_TO_REPLACE+
+    name: hyperconverged-cluster-webhook
   - image: quay.io/kubevirt/kubemacpool@sha256:79c4534d418c4a350a663e38499c22d54dc68c400f517aead4479f6d862b408e
     name: kubemacpool
   - image: quay.io/nmstate/kubernetes-nmstate-handler@sha256:3feeb377a4a89caf37fdab45d13f93620e1cf5ff8cbc91aa19ae32cd5cfa3a32

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:60eecee0ed3ac42710f0ea2fdbcd643763cb4f68830ded0e7a74cc33413c9de1
-    createdAt: "2020-11-27 12:05:46"
+    createdAt: "2020-11-29 16:30:50"
     description: |-
       **HyperConverged Cluster Operator** is an Operator pattern for managing multi-operator products.
       Specifcally, the HyperConverged Cluster Operator manages the deployment of KubeVirt,
@@ -1784,7 +1784,7 @@ spec:
                 - name: APP
                   value: WEBHOOK
                 - name: OPERATOR_IMAGE
-                  value: quay.io/kubevirt/hyperconverged-cluster-operator@sha256:60eecee0ed3ac42710f0ea2fdbcd643763cb4f68830ded0e7a74cc33413c9de1
+                  value: quay.io/kubevirt/hyperconverged-cluster-webhook@sha256:3958b53411549f216b7ba05d9fc67fab64c7930d979bddf8df26f29bd860281c
                 - name: OPERATOR_NAME
                   value: hyperconverged-cluster-webhook
                 - name: OPERATOR_NAMESPACE
@@ -1794,7 +1794,7 @@ spec:
                     fieldRef:
                       fieldPath: metadata.name
                 - name: WATCH_NAMESPACE
-                image: quay.io/kubevirt/hyperconverged-cluster-operator@sha256:60eecee0ed3ac42710f0ea2fdbcd643763cb4f68830ded0e7a74cc33413c9de1
+                image: quay.io/kubevirt/hyperconverged-cluster-webhook@sha256:3958b53411549f216b7ba05d9fc67fab64c7930d979bddf8df26f29bd860281c
                 imagePullPolicy: IfNotPresent
                 livenessProbe:
                   failureThreshold: 1
@@ -2354,6 +2354,8 @@ spec:
     name: hostpath-provisioner-operator
   - image: quay.io/kubevirt/hyperconverged-cluster-operator@sha256:60eecee0ed3ac42710f0ea2fdbcd643763cb4f68830ded0e7a74cc33413c9de1
     name: hyperconverged-cluster-operator
+  - image: quay.io/kubevirt/hyperconverged-cluster-webhook@sha256:3958b53411549f216b7ba05d9fc67fab64c7930d979bddf8df26f29bd860281c
+    name: hyperconverged-cluster-webhook
   - image: quay.io/kubevirt/kubemacpool@sha256:79c4534d418c4a350a663e38499c22d54dc68c400f517aead4479f6d862b408e
     name: kubemacpool
   - image: quay.io/nmstate/kubernetes-nmstate-handler@sha256:3feeb377a4a89caf37fdab45d13f93620e1cf5ff8cbc91aa19ae32cd5cfa3a32

deploy/operator.yaml

@@ -112,7 +112,7 @@ spec:
         - name: APP
           value: WEBHOOK
         - name: OPERATOR_IMAGE
-          value: quay.io/kubevirt/hyperconverged-cluster-operator@sha256:60eecee0ed3ac42710f0ea2fdbcd643763cb4f68830ded0e7a74cc33413c9de1
+          value: quay.io/kubevirt/hyperconverged-cluster-webhook@sha256:3958b53411549f216b7ba05d9fc67fab64c7930d979bddf8df26f29bd860281c
         - name: OPERATOR_NAME
           value: hyperconverged-cluster-webhook
         - name: OPERATOR_NAMESPACE
@@ -122,7 +122,7 @@ spec:
             fieldRef:
               fieldPath: metadata.name
         - name: WATCH_NAMESPACE
-        image: quay.io/kubevirt/hyperconverged-cluster-operator@sha256:60eecee0ed3ac42710f0ea2fdbcd643763cb4f68830ded0e7a74cc33413c9de1
+        image: quay.io/kubevirt/hyperconverged-cluster-webhook@sha256:3958b53411549f216b7ba05d9fc67fab64c7930d979bddf8df26f29bd860281c
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 1

hack/deploy.sh

@@ -23,6 +23,7 @@ source hack/common.sh
 source hack/compare_scc.sh
 
 HCO_IMAGE=${HCO_IMAGE:-quay.io/kubevirt/hyperconverged-cluster-operator:latest}
+WEBHOOK_IMAGE=${WEBHOOK_IMAGE:-quay.io/kubevirt/hyperconverged-cluster-webhook:latest}
 HCO_NAMESPACE="kubevirt-hyperconverged"
 HCO_KIND="hyperconvergeds"
 HCO_RESOURCE_NAME="kubevirt-hyperconverged"
@@ -53,6 +54,7 @@ if [ -n "${IMAGE_FORMAT}" ]; then
 fi
 
 sed -i -r "s|: quay.io/kubevirt/hyperconverged-cluster-operator(@sha256)?:.*$|: ${HCO_IMAGE}|g" _out/operator.yaml
+sed -i -r "s|: quay.io/kubevirt/hyperconverged-cluster-webhook(@sha256)?:.*$|: ${WEBHOOK_IMAGE}|g" _out/operator.yaml
 
 WORKERS=$(${CMD} get nodes -l "node-role.kubernetes.io/master!=" -o name)
 WORKERS_ARR=(${WORKERS})