Skip to content

Commit

Permalink
Bump KUBEVIRT to v0.47.1 and adapt the code (#1582)
Browse files Browse the repository at this point in the history
Bump KUBEVIRT to v0.47.1 and adapt the code
for its new client-go struct introduced with
kubevirt/kubevirt#6661

v0.47.0_rc.0 and v0.47.0 never got accepted
because they were failing the upgrade tests,
trying now with v0.47.1.

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
  • Loading branch information
tiraboschi committed Nov 12, 2021
1 parent 6fcf71e commit 72d3317
Show file tree
Hide file tree
Showing 39 changed files with 1,889 additions and 1,538 deletions.
6 changes: 3 additions & 3 deletions cmd/hyperconverged-cluster-operator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import (
"github.com/kubevirt/hyperconverged-cluster-operator/pkg/controller/hyperconverged"
"github.com/kubevirt/hyperconverged-cluster-operator/pkg/controller/operands"
hcoutil "github.com/kubevirt/hyperconverged-cluster-operator/pkg/util"
kubevirtv1 "kubevirt.io/client-go/api/v1"
kubevirtcorev1 "kubevirt.io/client-go/apis/core/v1"
cdiv1beta1 "kubevirt.io/containerized-data-importer/pkg/apis/core/v1beta1"
sspv1beta1 "kubevirt.io/ssp-operator/api/v1beta1"
)
Expand All @@ -69,7 +69,7 @@ var (
openshiftroutev1.Install,
monitoringv1.AddToScheme,
apiextensionsv1.AddToScheme,
kubevirtv1.AddToScheme,
kubevirtcorev1.AddToScheme,
coordinationv1.AddToScheme,
operatorsapiv2.AddToScheme,
}
Expand Down Expand Up @@ -183,7 +183,7 @@ func getNewManagerCache(operatorNamespace string) cache.NewCacheFunc {
cache.Options{
SelectorsByObject: cache.SelectorsByObject{
&hcov1beta1.HyperConverged{}: {},
&kubevirtv1.KubeVirt{}: {},
&kubevirtcorev1.KubeVirt{}: {},
&cdiv1beta1.CDI{}: {},
&networkaddonsv1.NetworkAddonsConfig{}: {},
&sspv1beta1.SSP{}: {},
Expand Down
4 changes: 2 additions & 2 deletions cmd/hyperconverged-cluster-webhook/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/kubevirt/hyperconverged-cluster-operator/pkg/apis"
hcoutil "github.com/kubevirt/hyperconverged-cluster-operator/pkg/util"
"github.com/kubevirt/hyperconverged-cluster-operator/pkg/webhooks"
kubevirtv1 "kubevirt.io/client-go/api/v1"
kubevirtcorev1 "kubevirt.io/client-go/apis/core/v1"
cdiv1beta1 "kubevirt.io/containerized-data-importer/pkg/apis/core/v1beta1"
sspv1beta1 "kubevirt.io/ssp-operator/api/v1beta1"
)
Expand All @@ -39,7 +39,7 @@ var (
sspv1beta1.AddToScheme,
admissionregistrationv1.AddToScheme,
openshiftconfigv1.Install,
kubevirtv1.AddToScheme,
kubevirtcorev1.AddToScheme,
}
)

Expand Down
52 changes: 52 additions & 0 deletions deploy/cluster_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,14 @@ rules:
- get
- list
- watch
- apiGroups:
- flavor.kubevirt.io
resources:
- virtualmachineflavors
- virtualmachineclusterflavors
verbs:
- list
- watch
- apiGroups:
- ""
resources:
Expand Down Expand Up @@ -994,6 +1002,14 @@ rules:
- get
- list
- watch
- apiGroups:
- flavor.kubevirt.io
resources:
- virtualmachineflavors
- virtualmachineclusterflavors
verbs:
- list
- watch
- apiGroups:
- kubevirt.io
resources:
Expand Down Expand Up @@ -1118,6 +1134,20 @@ rules:
- list
- watch
- deletecollection
- apiGroups:
- flavor.kubevirt.io
resources:
- virtualmachineflavors
- virtualmachineclusterflavors
verbs:
- get
- delete
- create
- update
- patch
- list
- watch
- deletecollection
- apiGroups:
- subresources.kubevirt.io
resources:
Expand Down Expand Up @@ -1177,6 +1207,19 @@ rules:
- patch
- list
- watch
- apiGroups:
- flavor.kubevirt.io
resources:
- virtualmachineflavors
- virtualmachineclusterflavors
verbs:
- get
- delete
- create
- update
- patch
- list
- watch
- apiGroups:
- kubevirt.io
resources:
Expand Down Expand Up @@ -1214,6 +1257,15 @@ rules:
- get
- list
- watch
- apiGroups:
- flavor.kubevirt.io
resources:
- virtualmachineflavors
- virtualmachineclusterflavors
verbs:
- get
- list
- watch
- apiGroups:
- authentication.k8s.io
resources:
Expand Down
12 changes: 6 additions & 6 deletions deploy/images.csv
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
image_var,name,tag,digest
KUBEVIRT_OPERATOR_IMAGE,quay.io/kubevirt/virt-operator,KUBEVIRT_VERSION,579e4813c1e0c6ddedfbb7abff471412f9c6872664879abd6ab2cb1d10aef204
KUBEVIRT_API_IMAGE,quay.io/kubevirt/virt-api,KUBEVIRT_VERSION,964aa8fb240cc706198d1f4109f3c5b46a50958fdee8307b75c1150d36dd566f
KUBEVIRT_CONTROLLER_IMAGE,quay.io/kubevirt/virt-controller,KUBEVIRT_VERSION,9abe0658de8405234614d395dfe0f4e8d2f8de6c17fa92c36f901edef3dac305
KUBEVIRT_LAUNCHER_IMAGE,quay.io/kubevirt/virt-launcher,KUBEVIRT_VERSION,7e2b251daca5fcbd44152c8b951c0b93d1ceff195eb13a4d0d889e98a5b66391
KUBEVIRT_HANDLER_IMAGE,quay.io/kubevirt/virt-handler,KUBEVIRT_VERSION,7781518a7aa948c72d4a0ded5d6a987d3da5b847bed5c31052cb9095b9919a44
KUBEVIRT_OPERATOR_IMAGE,quay.io/kubevirt/virt-operator,KUBEVIRT_VERSION,ea1e52cc304b83f23f4ea7795a585dc696f10223abcffcba9d5970781d1bbebb
KUBEVIRT_API_IMAGE,quay.io/kubevirt/virt-api,KUBEVIRT_VERSION,06dcb1b0e430cb1e7d6cedec57179f5b8cb4fb0488a9860db6948c018db0b91c
KUBEVIRT_CONTROLLER_IMAGE,quay.io/kubevirt/virt-controller,KUBEVIRT_VERSION,d85bf1a8275c4d3d21bcd75864e19e3451f688e5d24faaabb359cb84091ca1c2
KUBEVIRT_LAUNCHER_IMAGE,quay.io/kubevirt/virt-launcher,KUBEVIRT_VERSION,05165d5d1818fa449935e22acc0a0f41f4bd9c9e40034f80f14df079758b4a29
KUBEVIRT_HANDLER_IMAGE,quay.io/kubevirt/virt-handler,KUBEVIRT_VERSION,d2e44a76f5d80c7aceeffb34135de09b3b71379f306ccd829cd33da9d9efda50
KUBEVIRT_VIRTIO_IMAGE,quay.io/kubevirt/virtio-container-disk,KUBEVIRT_VERSION,77c448875247bf4dbeaa0b9b1b720c0f30bb8177628061c592ce7a68863a96c2
KUBEVIRT_LIBGUESTFS_TOOLS_IMAGE,quay.io/kubevirt/libguestfs-tools,KUBEVIRT_VERSION,ca4aa4e1d65d35c7f98837dde75ee6b094ce1a9565f7ee823879f82cff6ac69f
KUBEVIRT_LIBGUESTFS_TOOLS_IMAGE,quay.io/kubevirt/libguestfs-tools,KUBEVIRT_VERSION,db7540db4a8840661d5c9005b206e9d1348eb585d2e6b19f09b52a5e59324e86
CNA_OPERATOR_IMAGE,quay.io/kubevirt/cluster-network-addons-operator,NETWORK_ADDONS_VERSION,4db419287975532b4ac003dbeb31c4be049abc67d41dc5c16d8e7cf027c1ced4
SSP_OPERATOR_IMAGE,quay.io/kubevirt/ssp-operator,SSP_VERSION,97d8d7627b3ade23614e427d1efc814917ce71115e5336c1e990297569b931ff
CDI_OPERATOR_IMAGE,quay.io/kubevirt/cdi-operator,CDI_VERSION,35b1351d0d5128409083ee9fa0772d32699fa660b4c2c34061c1e8b69842a0f4
Expand Down
24 changes: 12 additions & 12 deletions deploy/images.env
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
KUBEVIRT_OPERATOR_IMAGE=quay.io/kubevirt/virt-operator@sha256:579e4813c1e0c6ddedfbb7abff471412f9c6872664879abd6ab2cb1d10aef204
KUBEVIRT_API_IMAGE=quay.io/kubevirt/virt-api@sha256:964aa8fb240cc706198d1f4109f3c5b46a50958fdee8307b75c1150d36dd566f
KUBEVIRT_CONTROLLER_IMAGE=quay.io/kubevirt/virt-controller@sha256:9abe0658de8405234614d395dfe0f4e8d2f8de6c17fa92c36f901edef3dac305
KUBEVIRT_LAUNCHER_IMAGE=quay.io/kubevirt/virt-launcher@sha256:7e2b251daca5fcbd44152c8b951c0b93d1ceff195eb13a4d0d889e98a5b66391
KUBEVIRT_HANDLER_IMAGE=quay.io/kubevirt/virt-handler@sha256:7781518a7aa948c72d4a0ded5d6a987d3da5b847bed5c31052cb9095b9919a44
KUBEVIRT_OPERATOR_IMAGE=quay.io/kubevirt/virt-operator@sha256:ea1e52cc304b83f23f4ea7795a585dc696f10223abcffcba9d5970781d1bbebb
KUBEVIRT_API_IMAGE=quay.io/kubevirt/virt-api@sha256:06dcb1b0e430cb1e7d6cedec57179f5b8cb4fb0488a9860db6948c018db0b91c
KUBEVIRT_CONTROLLER_IMAGE=quay.io/kubevirt/virt-controller@sha256:d85bf1a8275c4d3d21bcd75864e19e3451f688e5d24faaabb359cb84091ca1c2
KUBEVIRT_LAUNCHER_IMAGE=quay.io/kubevirt/virt-launcher@sha256:05165d5d1818fa449935e22acc0a0f41f4bd9c9e40034f80f14df079758b4a29
KUBEVIRT_HANDLER_IMAGE=quay.io/kubevirt/virt-handler@sha256:d2e44a76f5d80c7aceeffb34135de09b3b71379f306ccd829cd33da9d9efda50
KUBEVIRT_VIRTIO_IMAGE=quay.io/kubevirt/virtio-container-disk@sha256:77c448875247bf4dbeaa0b9b1b720c0f30bb8177628061c592ce7a68863a96c2
KUBEVIRT_LIBGUESTFS_TOOLS_IMAGE=quay.io/kubevirt/libguestfs-tools@sha256:ca4aa4e1d65d35c7f98837dde75ee6b094ce1a9565f7ee823879f82cff6ac69f
KUBEVIRT_LIBGUESTFS_TOOLS_IMAGE=quay.io/kubevirt/libguestfs-tools@sha256:db7540db4a8840661d5c9005b206e9d1348eb585d2e6b19f09b52a5e59324e86
CNA_OPERATOR_IMAGE=quay.io/kubevirt/cluster-network-addons-operator@sha256:4db419287975532b4ac003dbeb31c4be049abc67d41dc5c16d8e7cf027c1ced4
SSP_OPERATOR_IMAGE=quay.io/kubevirt/ssp-operator@sha256:97d8d7627b3ade23614e427d1efc814917ce71115e5336c1e990297569b931ff
CDI_OPERATOR_IMAGE=quay.io/kubevirt/cdi-operator@sha256:35b1351d0d5128409083ee9fa0772d32699fa660b4c2c34061c1e8b69842a0f4
Expand All @@ -17,13 +17,13 @@ CDI_UPLOADSERVER_IMAGE=quay.io/kubevirt/cdi-uploadserver@sha256:b11dd982e050cf6d
HPPO_IMAGE=quay.io/kubevirt/hostpath-provisioner-operator@sha256:97e4f5b01051bde5d78bad46b2265275d59f445d99e819d67b1b900187be1929
HPP_IMAGE=quay.io/kubevirt/hostpath-provisioner@sha256:12fea4b3c6fe5c98b7887d31c3af8e6693a336ff20be8d6b4dd6ff9de60f0da9
NMO_IMAGE=quay.io/kubevirt/node-maintenance-operator@sha256:c4636d17a446b0491362d4c5ef9d91c5059f5c5f6305fc7750afc1780c384c0c
DIGEST_LIST="quay.io/kubevirt/virt-operator@sha256:579e4813c1e0c6ddedfbb7abff471412f9c6872664879abd6ab2cb1d10aef204"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/virt-api@sha256:964aa8fb240cc706198d1f4109f3c5b46a50958fdee8307b75c1150d36dd566f"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/virt-controller@sha256:9abe0658de8405234614d395dfe0f4e8d2f8de6c17fa92c36f901edef3dac305"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/virt-launcher@sha256:7e2b251daca5fcbd44152c8b951c0b93d1ceff195eb13a4d0d889e98a5b66391"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/virt-handler@sha256:7781518a7aa948c72d4a0ded5d6a987d3da5b847bed5c31052cb9095b9919a44"
DIGEST_LIST="quay.io/kubevirt/virt-operator@sha256:ea1e52cc304b83f23f4ea7795a585dc696f10223abcffcba9d5970781d1bbebb"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/virt-api@sha256:06dcb1b0e430cb1e7d6cedec57179f5b8cb4fb0488a9860db6948c018db0b91c"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/virt-controller@sha256:d85bf1a8275c4d3d21bcd75864e19e3451f688e5d24faaabb359cb84091ca1c2"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/virt-launcher@sha256:05165d5d1818fa449935e22acc0a0f41f4bd9c9e40034f80f14df079758b4a29"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/virt-handler@sha256:d2e44a76f5d80c7aceeffb34135de09b3b71379f306ccd829cd33da9d9efda50"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/virtio-container-disk@sha256:77c448875247bf4dbeaa0b9b1b720c0f30bb8177628061c592ce7a68863a96c2"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/libguestfs-tools@sha256:ca4aa4e1d65d35c7f98837dde75ee6b094ce1a9565f7ee823879f82cff6ac69f"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/libguestfs-tools@sha256:db7540db4a8840661d5c9005b206e9d1348eb585d2e6b19f09b52a5e59324e86"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cluster-network-addons-operator@sha256:4db419287975532b4ac003dbeb31c4be049abc67d41dc5c16d8e7cf027c1ced4"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/ssp-operator@sha256:97d8d7627b3ade23614e427d1efc814917ce71115e5336c1e990297569b931ff"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cdi-operator@sha256:35b1351d0d5128409083ee9fa0772d32699fa660b4c2c34061c1e8b69842a0f4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,14 @@ spec:
- get
- list
- watch
- apiGroups:
- flavor.kubevirt.io
resources:
- virtualmachineflavors
- virtualmachineclusterflavors
verbs:
- list
- watch
- apiGroups:
- ""
resources:
Expand Down Expand Up @@ -888,6 +896,14 @@ spec:
- get
- list
- watch
- apiGroups:
- flavor.kubevirt.io
resources:
- virtualmachineflavors
- virtualmachineclusterflavors
verbs:
- list
- watch
- apiGroups:
- kubevirt.io
resources:
Expand Down Expand Up @@ -1012,6 +1028,20 @@ spec:
- list
- watch
- deletecollection
- apiGroups:
- flavor.kubevirt.io
resources:
- virtualmachineflavors
- virtualmachineclusterflavors
verbs:
- get
- delete
- create
- update
- patch
- list
- watch
- deletecollection
- apiGroups:
- subresources.kubevirt.io
resources:
Expand Down Expand Up @@ -1071,6 +1101,19 @@ spec:
- patch
- list
- watch
- apiGroups:
- flavor.kubevirt.io
resources:
- virtualmachineflavors
- virtualmachineclusterflavors
verbs:
- get
- delete
- create
- update
- patch
- list
- watch
- apiGroups:
- kubevirt.io
resources:
Expand Down Expand Up @@ -1108,6 +1151,15 @@ spec:
- get
- list
- watch
- apiGroups:
- flavor.kubevirt.io
resources:
- virtualmachineflavors
- virtualmachineclusterflavors
verbs:
- get
- list
- watch
- apiGroups:
- authentication.k8s.io
resources:
Expand Down Expand Up @@ -1927,7 +1979,7 @@ spec:
- name: HCO_KV_IO_VERSION
value: 1.6.0
- name: KUBEVIRT_VERSION
value: v0.46.1
value: v0.47.1
- name: CDI_VERSION
value: v1.40.0
- name: NETWORK_ADDONS_VERSION
Expand Down Expand Up @@ -2171,7 +2223,7 @@ spec:
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.6.0
kubevirt.io: virt-operator
prometheus.kubevirt.io: ""
prometheus.kubevirt.io: "true"
name: virt-operator
spec:
affinity:
Expand All @@ -2195,24 +2247,24 @@ spec:
- "2"
env:
- name: OPERATOR_IMAGE
value: quay.io/kubevirt/virt-operator@sha256:579e4813c1e0c6ddedfbb7abff471412f9c6872664879abd6ab2cb1d10aef204
value: quay.io/kubevirt/virt-operator@sha256:ea1e52cc304b83f23f4ea7795a585dc696f10223abcffcba9d5970781d1bbebb
- name: WATCH_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.annotations['olm.targetNamespaces']
- name: KUBEVIRT_VERSION
value: v0.46.1
value: v0.47.1
- name: VIRT_API_SHASUM
value: sha256:964aa8fb240cc706198d1f4109f3c5b46a50958fdee8307b75c1150d36dd566f
value: sha256:06dcb1b0e430cb1e7d6cedec57179f5b8cb4fb0488a9860db6948c018db0b91c
- name: VIRT_CONTROLLER_SHASUM
value: sha256:9abe0658de8405234614d395dfe0f4e8d2f8de6c17fa92c36f901edef3dac305
value: sha256:d85bf1a8275c4d3d21bcd75864e19e3451f688e5d24faaabb359cb84091ca1c2
- name: VIRT_HANDLER_SHASUM
value: sha256:7781518a7aa948c72d4a0ded5d6a987d3da5b847bed5c31052cb9095b9919a44
value: sha256:d2e44a76f5d80c7aceeffb34135de09b3b71379f306ccd829cd33da9d9efda50
- name: VIRT_LAUNCHER_SHASUM
value: sha256:7e2b251daca5fcbd44152c8b951c0b93d1ceff195eb13a4d0d889e98a5b66391
value: sha256:05165d5d1818fa449935e22acc0a0f41f4bd9c9e40034f80f14df079758b4a29
- name: GS_SHASUM
value: sha256:ca4aa4e1d65d35c7f98837dde75ee6b094ce1a9565f7ee823879f82cff6ac69f
image: quay.io/kubevirt/virt-operator@sha256:579e4813c1e0c6ddedfbb7abff471412f9c6872664879abd6ab2cb1d10aef204
value: sha256:db7540db4a8840661d5c9005b206e9d1348eb585d2e6b19f09b52a5e59324e86
image: quay.io/kubevirt/virt-operator@sha256:ea1e52cc304b83f23f4ea7795a585dc696f10223abcffcba9d5970781d1bbebb
imagePullPolicy: IfNotPresent
name: virt-operator
ports:
Expand Down Expand Up @@ -2780,7 +2832,7 @@ spec:
name: kubemacpool
- image: quay.io/nmstate/kubernetes-nmstate-handler@sha256:93587c172172fd758d2cd8f8eeeb5da9412cd0144f69db8d813edb1aa63651b3
name: kubernetes-nmstate-handler
- image: quay.io/kubevirt/libguestfs-tools@sha256:ca4aa4e1d65d35c7f98837dde75ee6b094ce1a9565f7ee823879f82cff6ac69f
- image: quay.io/kubevirt/libguestfs-tools@sha256:db7540db4a8840661d5c9005b206e9d1348eb585d2e6b19f09b52a5e59324e86
name: libguestfs-tools
- image: quay.io/kubevirt/macvtap-cni@sha256:961f1d1079840fa657f2e115835afdf5d0c7520623bbc302e46f2b67e36f8349
name: macvtap-cni
Expand All @@ -2792,15 +2844,15 @@ spec:
name: ovs-cni-plugin
- image: quay.io/kubevirt/ssp-operator@sha256:97d8d7627b3ade23614e427d1efc814917ce71115e5336c1e990297569b931ff
name: ssp-operator
- image: quay.io/kubevirt/virt-api@sha256:964aa8fb240cc706198d1f4109f3c5b46a50958fdee8307b75c1150d36dd566f
- image: quay.io/kubevirt/virt-api@sha256:06dcb1b0e430cb1e7d6cedec57179f5b8cb4fb0488a9860db6948c018db0b91c
name: virt-api
- image: quay.io/kubevirt/virt-controller@sha256:9abe0658de8405234614d395dfe0f4e8d2f8de6c17fa92c36f901edef3dac305
- image: quay.io/kubevirt/virt-controller@sha256:d85bf1a8275c4d3d21bcd75864e19e3451f688e5d24faaabb359cb84091ca1c2
name: virt-controller
- image: quay.io/kubevirt/virt-handler@sha256:7781518a7aa948c72d4a0ded5d6a987d3da5b847bed5c31052cb9095b9919a44
- image: quay.io/kubevirt/virt-handler@sha256:d2e44a76f5d80c7aceeffb34135de09b3b71379f306ccd829cd33da9d9efda50
name: virt-handler
- image: quay.io/kubevirt/virt-launcher@sha256:7e2b251daca5fcbd44152c8b951c0b93d1ceff195eb13a4d0d889e98a5b66391
- image: quay.io/kubevirt/virt-launcher@sha256:05165d5d1818fa449935e22acc0a0f41f4bd9c9e40034f80f14df079758b4a29
name: virt-launcher
- image: quay.io/kubevirt/virt-operator@sha256:579e4813c1e0c6ddedfbb7abff471412f9c6872664879abd6ab2cb1d10aef204
- image: quay.io/kubevirt/virt-operator@sha256:ea1e52cc304b83f23f4ea7795a585dc696f10223abcffcba9d5970781d1bbebb
name: virt-operator
- image: quay.io/kubevirt/virtio-container-disk@sha256:77c448875247bf4dbeaa0b9b1b720c0f30bb8177628061c592ce7a68863a96c2
name: virtio-container-disk
Expand Down

0 comments on commit 72d3317

Please sign in to comment.