Update components versions for release-1.4 (#1452)

* Update components versions for release-1.4 Signed-off-by: orenc1 <ocohen@redhat.com> * increase the timeout for hco-operator after upgrade to 30m Signed-off-by: orenc1 <ocohen@redhat.com>
kubevirt · Jul 27, 2021 · 351e9c5 · 351e9c5
1 parent e507bcf
commit 351e9c5
Show file tree

Hide file tree

Showing 17 changed files with 1,499 additions and 4,729 deletions.
diff --git a/...verged/1.4.0/manifests/kubevirt-hyperconverged-operator.v1.4.0.clusterserviceversion.yaml b/...verged/1.4.0/manifests/kubevirt-hyperconverged-operator.v1.4.0.clusterserviceversion.yaml
@@ -1839,15 +1839,15 @@ spec:
                 - name: KUBEVIRT_VERSION
                   value: v0.41.0
                 - name: CDI_VERSION
-                  value: v1.35.0
+                  value: v1.34.1
                 - name: NETWORK_ADDONS_VERSION
-                  value: v0.56.0
+                  value: v0.53.6
                 - name: SSP_VERSION
                   value: v0.11.2
                 - name: NMO_VERSION
-                  value: v0.9.0
+                  value: v0.9.1
                 - name: HPPO_VERSION
-                  value: v0.8.0
+                  value: v0.8.2
                 - name: VM_IMPORT_VERSION
                   value: v0.3.6
                 image: +IMAGE_TO_REPLACE+
@@ -1979,7 +1979,7 @@ spec:
                 - name: OPERATOR_NAME
                   value: cluster-network-addons-operator
                 - name: OPERATOR_VERSION
-                  value: v0.56.0
+                  value: v0.53.6
                 - name: OPERATOR_NAMESPACE
                   valueFrom:
                     fieldRef:
@@ -2178,7 +2178,7 @@ spec:
                 - name: DEPLOY_CLUSTER_RESOURCES
                   value: "true"
                 - name: OPERATOR_VERSION
-                  value: v1.35.0
+                  value: v1.34.1
                 - name: CONTROLLER_IMAGE
                   value: quay.io/kubevirt/cdi-controller@sha256:069a2a57643ca17231d5af1d3469dfae8a0c8fe8c65caad12e206a56426ed5f3
                 - name: IMPORTER_IMAGE

diff --git a/...verged/1.4.0/manifests/kubevirt-hyperconverged-operator.v1.4.0.clusterserviceversion.yaml b/...verged/1.4.0/manifests/kubevirt-hyperconverged-operator.v1.4.0.clusterserviceversion.yaml
@@ -9,7 +9,7 @@ metadata:
     categories: OpenShift Optional
     certified: "false"
     containerImage: quay.io/kubevirt/hyperconverged-cluster-operator:1.4.0-unstable
-    createdAt: "2021-06-16 16:35:56"
+    createdAt: "2021-07-26 11:28:22"
     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":{}}'
@@ -1839,15 +1839,15 @@ spec:
                 - name: KUBEVIRT_VERSION
                   value: v0.41.0
                 - name: CDI_VERSION
-                  value: v1.35.0
+                  value: v1.34.1
                 - name: NETWORK_ADDONS_VERSION
-                  value: v0.56.0
+                  value: v0.53.6
                 - name: SSP_VERSION
                   value: v0.11.2
                 - name: NMO_VERSION
-                  value: v0.9.0
+                  value: v0.9.1
                 - name: HPPO_VERSION
-                  value: v0.8.0
+                  value: v0.8.2
                 - name: VM_IMPORT_VERSION
                   value: v0.3.6
                 image: quay.io/kubevirt/hyperconverged-cluster-operator:1.4.0-unstable
@@ -1979,7 +1979,7 @@ spec:
                 - name: OPERATOR_NAME
                   value: cluster-network-addons-operator
                 - name: OPERATOR_VERSION
-                  value: v0.56.0
+                  value: v0.53.6
                 - name: OPERATOR_NAMESPACE
                   valueFrom:
                     fieldRef:
@@ -2178,7 +2178,7 @@ spec:
                 - name: DEPLOY_CLUSTER_RESOURCES
                   value: "true"
                 - name: OPERATOR_VERSION
-                  value: v1.35.0
+                  value: v1.34.1
                 - name: CONTROLLER_IMAGE
                   value: quay.io/kubevirt/cdi-controller@sha256:069a2a57643ca17231d5af1d3469dfae8a0c8fe8c65caad12e206a56426ed5f3
                 - name: IMPORTER_IMAGE

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -60,15 +60,15 @@ spec:
         - name: KUBEVIRT_VERSION
           value: v0.41.0
         - name: CDI_VERSION
-          value: v1.35.0
+          value: v1.34.1
         - name: NETWORK_ADDONS_VERSION
-          value: v0.56.0
+          value: v0.53.6
         - name: SSP_VERSION
           value: v0.11.2
         - name: NMO_VERSION
-          value: v0.9.0
+          value: v0.9.1
         - name: HPPO_VERSION
-          value: v0.8.0
+          value: v0.8.2
         - name: VM_IMPORT_VERSION
           value: v0.3.6
         image: quay.io/kubevirt/hyperconverged-cluster-operator:1.4.0-unstable
@@ -221,7 +221,7 @@ spec:
         - name: OPERATOR_NAME
           value: cluster-network-addons-operator
         - name: OPERATOR_VERSION
-          value: v0.56.0
+          value: v0.53.6
         - name: OPERATOR_NAMESPACE
           valueFrom:
             fieldRef:
@@ -442,7 +442,7 @@ spec:
         - name: DEPLOY_CLUSTER_RESOURCES
           value: "true"
         - name: OPERATOR_VERSION
-          value: v1.35.0
+          value: v1.34.1
         - name: CONTROLLER_IMAGE
           value: quay.io/kubevirt/cdi-controller@sha256:069a2a57643ca17231d5af1d3469dfae8a0c8fe8c65caad12e206a56426ed5f3
         - name: IMPORTER_IMAGE

diff --git a/go.mod b/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/google/uuid v1.1.4
 	github.com/googleapis/gnostic v0.5.3 // indirect
 	github.com/imdario/mergo v0.3.11
-	github.com/kubevirt/cluster-network-addons-operator v0.56.0
+	github.com/kubevirt/cluster-network-addons-operator v0.53.6
 	github.com/kubevirt/vm-import-operator v0.3.6
 	github.com/onsi/ginkgo v1.16.1
 	github.com/onsi/gomega v1.11.0
@@ -45,7 +45,7 @@ require (
 	k8s.io/client-go v12.0.0+incompatible
 	k8s.io/kube-openapi v0.0.0-20210113233702-8566a335510f
 	kubevirt.io/client-go v0.41.0
-	kubevirt.io/containerized-data-importer v1.35.0
+	kubevirt.io/containerized-data-importer v1.34.1
 	kubevirt.io/controller-lifecycle-operator-sdk v0.2.0
 	kubevirt.io/kubevirt v0.41.0
 	kubevirt.io/qe-tools v0.1.7

diff --git a/go.sum b/go.sum
@@ -919,8 +919,8 @@ github.com/kubernetes-csi/csi-test v2.0.0+incompatible/go.mod h1:YxJ4UiuPWIhMBkx
 github.com/kubernetes-csi/external-snapshotter/v2 v2.1.1 h1:t5bmB3Y8nCaLA4aFrIpX0zjHEF/HUkJp6f5rm7BsVzM=
 github.com/kubernetes-csi/external-snapshotter/v2 v2.1.1/go.mod h1:dV5oB3U62KBdlf9ADWkMmjGd3USauqQtwIm2OZb5mqI=
 github.com/kubernetes-sigs/kube-storage-version-migrator v0.0.0-20191127225502-51849bc15f17/go.mod h1:enH0BVV+4+DAgWdwSlMefG8bBzTfVMTr1lApzdLZ/cc=
-github.com/kubevirt/cluster-network-addons-operator v0.56.0 h1:tZtppPmQgTxNIdOyL/V/1EOClyrAu5AdrXlWXT7l00Q=
-github.com/kubevirt/cluster-network-addons-operator v0.56.0/go.mod h1:FDgI0XZI5rQrd9OcVffJ+lJl1iplpCLX6u6qRGqgFu4=
+github.com/kubevirt/cluster-network-addons-operator v0.53.6 h1:VgpG5l0lkxQIDnca0bp9zmfeaIREJUWLwZHfRDaHqys=
+github.com/kubevirt/cluster-network-addons-operator v0.53.6/go.mod h1:FDgI0XZI5rQrd9OcVffJ+lJl1iplpCLX6u6qRGqgFu4=
 github.com/kubevirt/vm-import-operator v0.3.6 h1:ILJs3U+RXaTjH/5P99xWuZ7sZql5+2u5UT5DVG9dSug=
 github.com/kubevirt/vm-import-operator v0.3.6/go.mod h1:vMW9982ayVHdRBGqO9/ybzLeL5Yl6OBkhMiNgnKqjMI=
 github.com/kylelemons/godebug v0.0.0-20160406211939-eadb3ce320cb/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
@@ -2140,11 +2140,10 @@ kubevirt.io/client-go v0.41.0 h1:SQ1ZlZtxdwENabMhNhbAg+GERzmSMdLd1FAWMnpfY3w=
 kubevirt.io/client-go v0.41.0/go.mod h1:OFwGvBEhxmNoQSQfNmCDOYW0jddmStDzof6J8GrVNNM=
 kubevirt.io/containerized-data-importer v1.27.0/go.mod h1:gV0UGj0JybVFobLjkUzRxFJFgeUUhZb7zs1HgvnDsOQ=
 kubevirt.io/containerized-data-importer v1.31.0/go.mod h1:ur+s6O4/uYD8re3OIVgyiyGzVLIxOUL3kB5E7pR9SIQ=
-kubevirt.io/containerized-data-importer v1.35.0 h1:N0vv25nBSm0jpXjYvqoUwmvUjr2F8CwyxJNFzJX5eMU=
-kubevirt.io/containerized-data-importer v1.35.0/go.mod h1:4TbKL1HJekxbv2DtuaCu2BlQxwU9YkYxgb1qU3HTF4s=
+kubevirt.io/containerized-data-importer v1.34.1 h1:Zqs/DyV2oDIfLO8tr/fOnYtH0I8N9jR7tSkRn4Px/lE=
+kubevirt.io/containerized-data-importer v1.34.1/go.mod h1:0s5/wkzXWI5JyG/GFOmFoji9BIm+LS0iXm2xDbU7mYY=
 kubevirt.io/controller-lifecycle-operator-sdk v0.1.1/go.mod h1:M+UuZsp90mmKUVGb5zXDZtIIY1noY5pJk9i2YCQwSnk=
 kubevirt.io/controller-lifecycle-operator-sdk v0.1.2/go.mod h1:M+UuZsp90mmKUVGb5zXDZtIIY1noY5pJk9i2YCQwSnk=
-kubevirt.io/controller-lifecycle-operator-sdk v0.1.3-0.20210112105647-bbf16167410b h1:8JEGhjEuI6qfYk2l2a82PJl6XNWolFm88+yFpOLCRw8=
 kubevirt.io/controller-lifecycle-operator-sdk v0.1.3-0.20210112105647-bbf16167410b/go.mod h1:dlEFdrw5MFYMvBA64LlthxkTkTVldvYgtHju2CEIUfQ=
 kubevirt.io/controller-lifecycle-operator-sdk v0.2.0 h1:/6baCbfeFl3z09nCPNAeCgTR2704yqj/HV+sv7ZhHNI=
 kubevirt.io/controller-lifecycle-operator-sdk v0.2.0/go.mod h1:ZJhLceiY2Gl5CXFGSp5eMGt/sksOiJP0289nAZFCQf0=

diff --git a/hack/config b/hack/config
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 KUBEVIRT_VERSION="v0.41.0"
-CDI_VERSION="v1.35.0"
-NETWORK_ADDONS_VERSION="v0.56.0"
+CDI_VERSION="v1.34.1"
+NETWORK_ADDONS_VERSION="v0.53.6"
 SSP_VERSION="v0.11.2"
-NMO_VERSION="v0.9.0"
-HPPO_VERSION="v0.8.0"
+NMO_VERSION="v0.9.1"
+HPPO_VERSION="v0.8.2"
 HPP_VERSION="v0.8.0"
 CONVERSION_CONTAINER_VERSION="v2.0.0"
 VMWARE_CONTAINER_VERSION="v2.0.0-9"

diff --git a/hack/upgrade-test-index-image.sh b/hack/upgrade-test-index-image.sh
@@ -155,8 +155,8 @@ Msg "Verify the subscription's currentCSV and installedCSV have moved to the new
 ${CMD} get pods -n ${HCO_NAMESPACE}
 ./hack/retry.sh 30 60 "${CMD} get deployment -n ${HCO_NAMESPACE} | grep ${HCO_DEPLOYMENT_NAME}"
 
-${CMD} wait deployment ${HCO_DEPLOYMENT_NAME} --for condition=Available -n ${HCO_NAMESPACE} --timeout="1200s"
-${CMD} wait deployment ${HCO_WH_DEPLOYMENT_NAME} --for condition=Available -n ${HCO_NAMESPACE} --timeout="1200s"
+${CMD} wait deployment ${HCO_DEPLOYMENT_NAME} --for condition=Available -n ${HCO_NAMESPACE} --timeout="30m"
+${CMD} wait deployment ${HCO_WH_DEPLOYMENT_NAME} --for condition=Available -n ${HCO_NAMESPACE} --timeout="30m"
 
 ./hack/retry.sh 30 60 "${CMD} get subscriptions -n ${HCO_NAMESPACE} -o yaml | grep currentCSV   | grep v${TARGET_VERSION}"
 ./hack/retry.sh  2 30 "${CMD} get subscriptions -n ${HCO_NAMESPACE} -o yaml | grep installedCSV | grep v${TARGET_VERSION}"

diff --git a/vendor/github.com/kubevirt/cluster-network-addons-operator/pkg/names/names.go b/vendor/github.com/kubevirt/cluster-network-addons-operator/pkg/names/names.go