From 5324021253aa0ea0b55b9076fad923d0bdf7bd0c Mon Sep 17 00:00:00 2001 From: Enrique Llorente Pastora Date: Thu, 9 Jul 2020 11:15:39 +0200 Subject: [PATCH] Bump CNAO to 0.39.2 (#400) * Bump CNAO to 0.39.2 It includes a lot of fixes from 0.35 Signed-off-by: Quique Llorente * Update shas Signed-off-by: Quique Llorente --- .../cnao/network-addons-config.crd.yaml | 1 + .../k8s/1.17/manifests/cnao/operator.yaml | 20 +++++++++---------- .../cnao/network-addons-config.crd.yaml | 1 + .../k8s/1.18/manifests/cnao/operator.yaml | 20 +++++++++---------- cluster-up/cluster/images.sh | 4 ++-- 5 files changed, 24 insertions(+), 22 deletions(-) diff --git a/cluster-provision/k8s/1.17/manifests/cnao/network-addons-config.crd.yaml b/cluster-provision/k8s/1.17/manifests/cnao/network-addons-config.crd.yaml index 6c835ba528..e23ebc5afd 100644 --- a/cluster-provision/k8s/1.17/manifests/cnao/network-addons-config.crd.yaml +++ b/cluster-provision/k8s/1.17/manifests/cnao/network-addons-config.crd.yaml @@ -26,6 +26,7 @@ spec: type: object status: type: object + type: object version: v1alpha1 versions: - name: v1alpha1 diff --git a/cluster-provision/k8s/1.17/manifests/cnao/operator.yaml b/cluster-provision/k8s/1.17/manifests/cnao/operator.yaml index 8fd7643875..b86caf6243 100644 --- a/cluster-provision/k8s/1.17/manifests/cnao/operator.yaml +++ b/cluster-provision/k8s/1.17/manifests/cnao/operator.yaml @@ -121,7 +121,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - networkaddonsoperator.network.kubevirt.io/version: 0.35.0 + networkaddonsoperator.network.kubevirt.io/version: 0.39.2 name: cluster-network-addons-operator namespace: cluster-network-addons spec: @@ -141,25 +141,25 @@ spec: - name: MULTUS_IMAGE value: nfvpe/multus:v3.4.1 - name: LINUX_BRIDGE_IMAGE - value: quay.io/kubevirt/cni-default-plugins:v0.8.1 + value: quay.io/kubevirt/cni-default-plugins:v0.8.6 - name: LINUX_BRIDGE_MARKER_IMAGE - value: quay.io/kubevirt/bridge-marker:0.2.0 + value: quay.io/kubevirt/bridge-marker:0.3.0 - name: NMSTATE_HANDLER_IMAGE - value: quay.io/nmstate/kubernetes-nmstate-handler:v0.17.0 + value: quay.io/nmstate/kubernetes-nmstate-handler:v0.21.0 - name: OVS_CNI_IMAGE - value: quay.io/kubevirt/ovs-cni-plugin:v0.11.0 + value: quay.io/kubevirt/ovs-cni-plugin:v0.12.0 - name: OVS_MARKER_IMAGE - value: quay.io/kubevirt/ovs-cni-marker:v0.11.0 + value: quay.io/kubevirt/ovs-cni-marker:v0.12.0 - name: KUBEMACPOOL_IMAGE - value: quay.io/kubevirt/kubemacpool:v0.8.3 + value: quay.io/kubevirt/kubemacpool:v0.14.5 - name: MACVTAP_CNI_IMAGE value: quay.io/kubevirt/macvtap-cni:v0.2.0 - name: OPERATOR_IMAGE - value: quay.io/kubevirt/cluster-network-addons-operator:0.35.0 + value: quay.io/kubevirt/cluster-network-addons-operator:0.39.2 - name: OPERATOR_NAME value: cluster-network-addons-operator - name: OPERATOR_VERSION - value: 0.35.0 + value: 0.39.2 - name: OPERATOR_NAMESPACE valueFrom: fieldRef: @@ -173,7 +173,7 @@ spec: fieldRef: fieldPath: metadata.name - name: WATCH_NAMESPACE - image: quay.io/kubevirt/cluster-network-addons-operator:0.35.0 + image: quay.io/kubevirt/cluster-network-addons-operator:0.39.2 imagePullPolicy: Always name: cluster-network-addons-operator resources: {} diff --git a/cluster-provision/k8s/1.18/manifests/cnao/network-addons-config.crd.yaml b/cluster-provision/k8s/1.18/manifests/cnao/network-addons-config.crd.yaml index 6c835ba528..e23ebc5afd 100644 --- a/cluster-provision/k8s/1.18/manifests/cnao/network-addons-config.crd.yaml +++ b/cluster-provision/k8s/1.18/manifests/cnao/network-addons-config.crd.yaml @@ -26,6 +26,7 @@ spec: type: object status: type: object + type: object version: v1alpha1 versions: - name: v1alpha1 diff --git a/cluster-provision/k8s/1.18/manifests/cnao/operator.yaml b/cluster-provision/k8s/1.18/manifests/cnao/operator.yaml index 8fd7643875..b86caf6243 100644 --- a/cluster-provision/k8s/1.18/manifests/cnao/operator.yaml +++ b/cluster-provision/k8s/1.18/manifests/cnao/operator.yaml @@ -121,7 +121,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - networkaddonsoperator.network.kubevirt.io/version: 0.35.0 + networkaddonsoperator.network.kubevirt.io/version: 0.39.2 name: cluster-network-addons-operator namespace: cluster-network-addons spec: @@ -141,25 +141,25 @@ spec: - name: MULTUS_IMAGE value: nfvpe/multus:v3.4.1 - name: LINUX_BRIDGE_IMAGE - value: quay.io/kubevirt/cni-default-plugins:v0.8.1 + value: quay.io/kubevirt/cni-default-plugins:v0.8.6 - name: LINUX_BRIDGE_MARKER_IMAGE - value: quay.io/kubevirt/bridge-marker:0.2.0 + value: quay.io/kubevirt/bridge-marker:0.3.0 - name: NMSTATE_HANDLER_IMAGE - value: quay.io/nmstate/kubernetes-nmstate-handler:v0.17.0 + value: quay.io/nmstate/kubernetes-nmstate-handler:v0.21.0 - name: OVS_CNI_IMAGE - value: quay.io/kubevirt/ovs-cni-plugin:v0.11.0 + value: quay.io/kubevirt/ovs-cni-plugin:v0.12.0 - name: OVS_MARKER_IMAGE - value: quay.io/kubevirt/ovs-cni-marker:v0.11.0 + value: quay.io/kubevirt/ovs-cni-marker:v0.12.0 - name: KUBEMACPOOL_IMAGE - value: quay.io/kubevirt/kubemacpool:v0.8.3 + value: quay.io/kubevirt/kubemacpool:v0.14.5 - name: MACVTAP_CNI_IMAGE value: quay.io/kubevirt/macvtap-cni:v0.2.0 - name: OPERATOR_IMAGE - value: quay.io/kubevirt/cluster-network-addons-operator:0.35.0 + value: quay.io/kubevirt/cluster-network-addons-operator:0.39.2 - name: OPERATOR_NAME value: cluster-network-addons-operator - name: OPERATOR_VERSION - value: 0.35.0 + value: 0.39.2 - name: OPERATOR_NAMESPACE valueFrom: fieldRef: @@ -173,7 +173,7 @@ spec: fieldRef: fieldPath: metadata.name - name: WATCH_NAMESPACE - image: quay.io/kubevirt/cluster-network-addons-operator:0.35.0 + image: quay.io/kubevirt/cluster-network-addons-operator:0.39.2 imagePullPolicy: Always name: cluster-network-addons-operator resources: {} diff --git a/cluster-up/cluster/images.sh b/cluster-up/cluster/images.sh index 73dc62b84b..2322b1ef1c 100644 --- a/cluster-up/cluster/images.sh +++ b/cluster-up/cluster/images.sh @@ -6,8 +6,8 @@ declare -A IMAGES IMAGES[gocli]="gocli@sha256:2ce75db868bbf2811395dfe4f73a68160d2ad700b1e08aeee6956b4943ceb237" if [ -z $KUBEVIRTCI_PROVISION_CHECK ]; then IMAGES[k8s-fedora-1.17.0]="k8s-fedora-1.17.0@sha256:aebf67b8b1b499c721f4d98a7ab9542c680553a14cbc144d1fa701fe611f3c0d" - IMAGES[k8s-1.18]="k8s-1.18@sha256:91ea0c4e10a356fe315049e4e56801ce62b73b5b5d901e6e0eccbcc171070674" - IMAGES[k8s-1.17]="k8s-1.17@sha256:17fec14930cae00bda913cb690c46b9738dbc9b06b11b858a58369d7f9419688" + IMAGES[k8s-1.18]="k8s-1.18@sha256:fcf196a188cdb600d35e594b26b39804106e4ad263deea012a8a9a863232c4e4" + IMAGES[k8s-1.17]="k8s-1.17@sha256:789c57e011101c1ba3840809898c17a7e108a20c95a12f6a713ea1d98fa0a19c" IMAGES[k8s-1.16]="k8s-1.16@sha256:1e153fb62c9a30ce6bc6ddc1af21bb28a56b780ec93ab15e113d729bf664469a" IMAGES[k8s-1.15]="k8s-1.15@sha256:c58cb9d79968590f24e070bc2517088d44fa2f83ba73e989a7e0f690ad08460b" IMAGES[k8s-1.14]="k8s-1.14@sha256:46e449b292dcb420f0944cac0a7a5c667c6f19bba2a4192737380e8e77f27ed0"