From eb6671cdc79f71864f003b4dd33122dfd1805a4e Mon Sep 17 00:00:00 2001 From: hco-bot <71450783+hco-bot@users.noreply.github.com> Date: Fri, 10 Feb 2023 12:19:08 +0200 Subject: [PATCH] Bump HPP to v0.15.0 (#2241) Signed-off-by: HCO Bump Bot Co-authored-by: kubevirt-bot --- deploy/images.csv | 2 +- deploy/images.env | 4 ++-- ...yperconverged-operator.v1.9.0.clusterserviceversion.yaml | 4 ++-- ...yperconverged-operator.v1.9.0.clusterserviceversion.yaml | 6 +++--- deploy/operator.yaml | 2 +- hack/config | 2 +- tests/go.mod | 2 +- .../api/v1beta1/hyperconverged_types.go | 4 ++++ tests/vendor/modules.txt | 2 +- 9 files changed, 16 insertions(+), 12 deletions(-) diff --git a/deploy/images.csv b/deploy/images.csv index ea0a363ac9..1cbd4a59d4 100644 --- a/deploy/images.csv +++ b/deploy/images.csv @@ -19,7 +19,7 @@ CDI_UPLOADPROXY_IMAGE,quay.io/kubevirt/cdi-uploadproxy,CDI_VERSION,5d19ed696e02d CDI_UPLOADSERVER_IMAGE,quay.io/kubevirt/cdi-uploadserver,CDI_VERSION,a4333ccd149390661d1e997088c775210e68ee829d7f11f3e30bd1d78dcc7bc4 TTO_OPERATOR_IMAGE,quay.io/kubevirt/tekton-tasks-operator,TTO_VERSION,a1693a2c6676095c00203a4a938b7d2730ec3080aa9c802c496c60de70626507 HPPO_IMAGE,quay.io/kubevirt/hostpath-provisioner-operator,HPPO_VERSION,bc99b32091b39d64881200a01bb859682288fc0c8dd3aa4e0482d5d436b7b355 -HPP_IMAGE,quay.io/kubevirt/hostpath-provisioner,HPP_VERSION,b798bf44ed83c58c94a2f9a8344cb13661203c00bd05062592e8c0e5522d60d2 +HPP_IMAGE,quay.io/kubevirt/hostpath-provisioner,HPP_VERSION,4592c7249fecfb68fd5d86dd9ce9a1ff19cf11af4b88dd27f58d15480f91fda2 HPP_CSI_IMAGE,quay.io/kubevirt/hostpath-csi-driver,HPP_CSI_VERSION,c4c57725f677e0413e5b2c1b1e8e2dd473dd7f1d88cdaf76106708056ef3a78d NODE_DRIVER_REG_IMAGE,k8s.gcr.io/sig-storage/csi-node-driver-registrar,NODE_DRIVER_REG_VERSION,2dee3fe5fe861bb66c3a4ac51114f3447a4cd35870e0f2e2b558c7a400d89589 LIVENESS_PROBE_IMAGE,k8s.gcr.io/sig-storage/livenessprobe,LIVENESS_PROBE_VERSION,1b7c978a792a8fa4e96244e8059bd71bb49b07e2e5a897fb0c867bdc6db20d5d diff --git a/deploy/images.env b/deploy/images.env index aa02c3797d..424bb6d905 100755 --- a/deploy/images.env +++ b/deploy/images.env @@ -18,7 +18,7 @@ CDI_UPLOADPROXY_IMAGE=quay.io/kubevirt/cdi-uploadproxy@sha256:5d19ed696e02d9b06b CDI_UPLOADSERVER_IMAGE=quay.io/kubevirt/cdi-uploadserver@sha256:a4333ccd149390661d1e997088c775210e68ee829d7f11f3e30bd1d78dcc7bc4 TTO_OPERATOR_IMAGE=quay.io/kubevirt/tekton-tasks-operator@sha256:a1693a2c6676095c00203a4a938b7d2730ec3080aa9c802c496c60de70626507 HPPO_IMAGE=quay.io/kubevirt/hostpath-provisioner-operator@sha256:bc99b32091b39d64881200a01bb859682288fc0c8dd3aa4e0482d5d436b7b355 -HPP_IMAGE=quay.io/kubevirt/hostpath-provisioner@sha256:b798bf44ed83c58c94a2f9a8344cb13661203c00bd05062592e8c0e5522d60d2 +HPP_IMAGE=quay.io/kubevirt/hostpath-provisioner@sha256:4592c7249fecfb68fd5d86dd9ce9a1ff19cf11af4b88dd27f58d15480f91fda2 HPP_CSI_IMAGE=quay.io/kubevirt/hostpath-csi-driver@sha256:c4c57725f677e0413e5b2c1b1e8e2dd473dd7f1d88cdaf76106708056ef3a78d NODE_DRIVER_REG_IMAGE=k8s.gcr.io/sig-storage/csi-node-driver-registrar@sha256:2dee3fe5fe861bb66c3a4ac51114f3447a4cd35870e0f2e2b558c7a400d89589 LIVENESS_PROBE_IMAGE=k8s.gcr.io/sig-storage/livenessprobe@sha256:1b7c978a792a8fa4e96244e8059bd71bb49b07e2e5a897fb0c867bdc6db20d5d @@ -46,7 +46,7 @@ DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cdi-uploadproxy@sha256:5d19ed696e02 DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cdi-uploadserver@sha256:a4333ccd149390661d1e997088c775210e68ee829d7f11f3e30bd1d78dcc7bc4" DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/tekton-tasks-operator@sha256:a1693a2c6676095c00203a4a938b7d2730ec3080aa9c802c496c60de70626507" DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/hostpath-provisioner-operator@sha256:bc99b32091b39d64881200a01bb859682288fc0c8dd3aa4e0482d5d436b7b355" -DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/hostpath-provisioner@sha256:b798bf44ed83c58c94a2f9a8344cb13661203c00bd05062592e8c0e5522d60d2" +DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/hostpath-provisioner@sha256:4592c7249fecfb68fd5d86dd9ce9a1ff19cf11af4b88dd27f58d15480f91fda2" DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/hostpath-csi-driver@sha256:c4c57725f677e0413e5b2c1b1e8e2dd473dd7f1d88cdaf76106708056ef3a78d" DIGEST_LIST="${DIGEST_LIST},k8s.gcr.io/sig-storage/csi-node-driver-registrar@sha256:2dee3fe5fe861bb66c3a4ac51114f3447a4cd35870e0f2e2b558c7a400d89589" DIGEST_LIST="${DIGEST_LIST},k8s.gcr.io/sig-storage/livenessprobe@sha256:1b7c978a792a8fa4e96244e8059bd71bb49b07e2e5a897fb0c867bdc6db20d5d" diff --git a/deploy/index-image/community-kubevirt-hyperconverged/1.9.0/manifests/kubevirt-hyperconverged-operator.v1.9.0.clusterserviceversion.yaml b/deploy/index-image/community-kubevirt-hyperconverged/1.9.0/manifests/kubevirt-hyperconverged-operator.v1.9.0.clusterserviceversion.yaml index e016e1e4df..ed78e1956a 100644 --- a/deploy/index-image/community-kubevirt-hyperconverged/1.9.0/manifests/kubevirt-hyperconverged-operator.v1.9.0.clusterserviceversion.yaml +++ b/deploy/index-image/community-kubevirt-hyperconverged/1.9.0/manifests/kubevirt-hyperconverged-operator.v1.9.0.clusterserviceversion.yaml @@ -3262,7 +3262,7 @@ spec: - name: OPERATOR_IMAGE value: quay.io/kubevirt/hostpath-provisioner-operator@sha256:bc99b32091b39d64881200a01bb859682288fc0c8dd3aa4e0482d5d436b7b355 - name: PROVISIONER_IMAGE - value: quay.io/kubevirt/hostpath-provisioner@sha256:b798bf44ed83c58c94a2f9a8344cb13661203c00bd05062592e8c0e5522d60d2 + value: quay.io/kubevirt/hostpath-provisioner@sha256:4592c7249fecfb68fd5d86dd9ce9a1ff19cf11af4b88dd27f58d15480f91fda2 - name: CSI_PROVISIONER_IMAGE value: quay.io/kubevirt/hostpath-csi-driver@sha256:c4c57725f677e0413e5b2c1b1e8e2dd473dd7f1d88cdaf76106708056ef3a78d - name: NODE_DRIVER_REG_IMAGE @@ -3743,7 +3743,7 @@ spec: name: csi-snapshotter - image: quay.io/kubevirt/hostpath-csi-driver@sha256:c4c57725f677e0413e5b2c1b1e8e2dd473dd7f1d88cdaf76106708056ef3a78d name: hostpath-csi-driver - - image: quay.io/kubevirt/hostpath-provisioner@sha256:b798bf44ed83c58c94a2f9a8344cb13661203c00bd05062592e8c0e5522d60d2 + - image: quay.io/kubevirt/hostpath-provisioner@sha256:4592c7249fecfb68fd5d86dd9ce9a1ff19cf11af4b88dd27f58d15480f91fda2 name: hostpath-provisioner - image: quay.io/kubevirt/hostpath-provisioner-operator@sha256:bc99b32091b39d64881200a01bb859682288fc0c8dd3aa4e0482d5d436b7b355 name: hostpath-provisioner-operator diff --git a/deploy/olm-catalog/community-kubevirt-hyperconverged/1.9.0/manifests/kubevirt-hyperconverged-operator.v1.9.0.clusterserviceversion.yaml b/deploy/olm-catalog/community-kubevirt-hyperconverged/1.9.0/manifests/kubevirt-hyperconverged-operator.v1.9.0.clusterserviceversion.yaml index 1ecfd13171..00c3feaf79 100644 --- a/deploy/olm-catalog/community-kubevirt-hyperconverged/1.9.0/manifests/kubevirt-hyperconverged-operator.v1.9.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/community-kubevirt-hyperconverged/1.9.0/manifests/kubevirt-hyperconverged-operator.v1.9.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.9.0-unstable - createdAt: "2023-02-06 18:27:23" + createdAt: "2023-02-10 05:14:26" description: A unified operator deploying and controlling KubeVirt and its supporting operators with opinionated defaults operatorframework.io/initialization-resource: '{"apiVersion":"hco.kubevirt.io/v1beta1","kind":"HyperConverged","metadata":{"annotations":{"deployOVS":"false"},"name":"kubevirt-hyperconverged","namespace":"kubevirt-hyperconverged"},"spec":{}}' @@ -3262,7 +3262,7 @@ spec: - name: OPERATOR_IMAGE value: quay.io/kubevirt/hostpath-provisioner-operator@sha256:bc99b32091b39d64881200a01bb859682288fc0c8dd3aa4e0482d5d436b7b355 - name: PROVISIONER_IMAGE - value: quay.io/kubevirt/hostpath-provisioner@sha256:b798bf44ed83c58c94a2f9a8344cb13661203c00bd05062592e8c0e5522d60d2 + value: quay.io/kubevirt/hostpath-provisioner@sha256:4592c7249fecfb68fd5d86dd9ce9a1ff19cf11af4b88dd27f58d15480f91fda2 - name: CSI_PROVISIONER_IMAGE value: quay.io/kubevirt/hostpath-csi-driver@sha256:c4c57725f677e0413e5b2c1b1e8e2dd473dd7f1d88cdaf76106708056ef3a78d - name: NODE_DRIVER_REG_IMAGE @@ -3743,7 +3743,7 @@ spec: name: csi-snapshotter - image: quay.io/kubevirt/hostpath-csi-driver@sha256:c4c57725f677e0413e5b2c1b1e8e2dd473dd7f1d88cdaf76106708056ef3a78d name: hostpath-csi-driver - - image: quay.io/kubevirt/hostpath-provisioner@sha256:b798bf44ed83c58c94a2f9a8344cb13661203c00bd05062592e8c0e5522d60d2 + - image: quay.io/kubevirt/hostpath-provisioner@sha256:4592c7249fecfb68fd5d86dd9ce9a1ff19cf11af4b88dd27f58d15480f91fda2 name: hostpath-provisioner - image: quay.io/kubevirt/hostpath-provisioner-operator@sha256:bc99b32091b39d64881200a01bb859682288fc0c8dd3aa4e0482d5d436b7b355 name: hostpath-provisioner-operator diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 251c551a6c..8d2332ce72 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -770,7 +770,7 @@ spec: - name: OPERATOR_IMAGE value: quay.io/kubevirt/hostpath-provisioner-operator@sha256:bc99b32091b39d64881200a01bb859682288fc0c8dd3aa4e0482d5d436b7b355 - name: PROVISIONER_IMAGE - value: quay.io/kubevirt/hostpath-provisioner@sha256:b798bf44ed83c58c94a2f9a8344cb13661203c00bd05062592e8c0e5522d60d2 + value: quay.io/kubevirt/hostpath-provisioner@sha256:4592c7249fecfb68fd5d86dd9ce9a1ff19cf11af4b88dd27f58d15480f91fda2 - name: CSI_PROVISIONER_IMAGE value: quay.io/kubevirt/hostpath-csi-driver@sha256:c4c57725f677e0413e5b2c1b1e8e2dd473dd7f1d88cdaf76106708056ef3a78d - name: NODE_DRIVER_REG_IMAGE diff --git a/hack/config b/hack/config index 2589047e3a..34a985b560 100644 --- a/hack/config +++ b/hack/config @@ -6,7 +6,7 @@ NETWORK_ADDONS_VERSION="v0.85.0" SSP_VERSION="v0.16.2" TTO_VERSION="v0.4.1" HPPO_VERSION="v0.14.0" -HPP_VERSION="v0.14.0" +HPP_VERSION="v0.15.0" HPP_CSI_VERSION="v0.12.0" NODE_DRIVER_REG_VERSION="v2.2.0" LIVENESS_PROBE_VERSION="v2.3.0" diff --git a/tests/go.mod b/tests/go.mod index 8e4b901e2d..663c3551d7 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -15,7 +15,7 @@ require ( k8s.io/api v0.26.1 k8s.io/apimachinery v0.26.1 k8s.io/client-go v12.0.0+incompatible - kubevirt.io/api v0.59.0-alpha.2 + kubevirt.io/api v0.59.0-rc.0 kubevirt.io/client-go v0.59.0-alpha.2 kubevirt.io/kubevirt v0.59.0-alpha.2 kubevirt.io/qe-tools v0.1.8 diff --git a/tests/vendor/github.com/kubevirt/hyperconverged-cluster-operator/api/v1beta1/hyperconverged_types.go b/tests/vendor/github.com/kubevirt/hyperconverged-cluster-operator/api/v1beta1/hyperconverged_types.go index 5f82510cbd..5f49e95a54 100644 --- a/tests/vendor/github.com/kubevirt/hyperconverged-cluster-operator/api/v1beta1/hyperconverged_types.go +++ b/tests/vendor/github.com/kubevirt/hyperconverged-cluster-operator/api/v1beta1/hyperconverged_types.go @@ -498,6 +498,10 @@ type HyperConvergedStatus struct { // DataImportCronTemplates is a list of the actual DataImportCronTemplates as HCO update in the SSP CR. The list // contains both the common and the custom templates, including any modification done by HCO. DataImportCronTemplates []DataImportCronTemplateStatus `json:"dataImportCronTemplates,omitempty"` + + // SystemHealthStatus reflects the health of HCO and its secondary resources, based on the aggregated conditions. + // +optional + SystemHealthStatus string `json:"systemHealthStatus,omitempty"` } type Version struct { diff --git a/tests/vendor/modules.txt b/tests/vendor/modules.txt index 7a28a2af68..4a9b07e649 100644 --- a/tests/vendor/modules.txt +++ b/tests/vendor/modules.txt @@ -829,7 +829,7 @@ k8s.io/utils/internal/third_party/forked/golang/net k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/trace -# kubevirt.io/api v0.59.0-alpha.2 => kubevirt.io/api v0.59.0-alpha.2 +# kubevirt.io/api v0.59.0-rc.0 => kubevirt.io/api v0.59.0-alpha.2 ## explicit; go 1.17 kubevirt.io/api/clone kubevirt.io/api/clone/v1alpha1