From 7a24b829aa163ea2427ee9b3c57d70de817777aa Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Tue, 1 Sep 2020 17:08:52 +0300 Subject: [PATCH] Use calico/cni with fix for node name issue --- upup/models/bindata.go | 4 ++-- .../networking.projectcalico.org/k8s-1.16.yaml.template | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/upup/models/bindata.go b/upup/models/bindata.go index 48814747d1eeb..adab29ede30ca 100644 --- a/upup/models/bindata.go +++ b/upup/models/bindata.go @@ -12477,7 +12477,7 @@ spec: # It can be deleted if this is a fresh installation, or if you have already # upgraded to use calico-ipam. - name: upgrade-ipam - image: calico/cni:v3.16.0 + image: calico/cni:v3.16.0-2-gf6793aa command: ["/opt/cni/bin/calico-ipam", "-upgrade"] envFrom: - configMapRef: @@ -12504,7 +12504,7 @@ spec: # This container installs the CNI binaries # and CNI network config file on each node. - name: install-cni - image: calico/cni:v3.16.0 + image: calico/cni:v3.16.0-2-gf6793aa command: ["/opt/cni/bin/install"] envFrom: - configMapRef: diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template index b5646c40012db..70fd70a2c15b2 100644 --- a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template @@ -3709,7 +3709,7 @@ spec: # It can be deleted if this is a fresh installation, or if you have already # upgraded to use calico-ipam. - name: upgrade-ipam - image: calico/cni:v3.16.0 + image: calico/cni:v3.16.0-2-gf6793aa command: ["/opt/cni/bin/calico-ipam", "-upgrade"] envFrom: - configMapRef: @@ -3736,7 +3736,7 @@ spec: # This container installs the CNI binaries # and CNI network config file on each node. - name: install-cni - image: calico/cni:v3.16.0 + image: calico/cni:v3.16.0-2-gf6793aa command: ["/opt/cni/bin/install"] envFrom: - configMapRef: