From dcadec042dcd865edb27e6d9beaf6692b08ba099 Mon Sep 17 00:00:00 2001
From: Ciprian Hacman <ciprian.hacman@sematext.com>
Date: Fri, 11 Dec 2020 05:36:28 +0200
Subject: [PATCH] Update Calico to v3.17.1

---
 upup/models/bindata.go                               | 12 ++++++------
 .../k8s-1.16.yaml.template                           | 12 ++++++------
 upup/pkg/fi/cloudup/bootstrapchannelbuilder.go       |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/upup/models/bindata.go b/upup/models/bindata.go
index cd1a87c6f0863..b214ca227c46c 100644
--- a/upup/models/bindata.go
+++ b/upup/models/bindata.go
@@ -36955,7 +36955,7 @@ spec:
       securityContext:
         fsGroup: 65534
       containers:
-      - image: docker.io/calico/typha:v3.17.0
+      - image: docker.io/calico/typha:v3.17.1
         name: calico-typha
         ports:
         - containerPort: 5473
@@ -37072,7 +37072,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: docker.io/calico/cni:v3.17.0
+          image: docker.io/calico/cni:v3.17.1
           command: ["/opt/cni/bin/calico-ipam", "-upgrade"]
           envFrom:
           - configMapRef:
@@ -37099,7 +37099,7 @@ spec:
         # This container installs the CNI binaries
         # and CNI network config file on each node.
         - name: install-cni
-          image: docker.io/calico/cni:v3.17.0
+          image: docker.io/calico/cni:v3.17.1
           command: ["/opt/cni/bin/install"]
           envFrom:
           - configMapRef:
@@ -37140,7 +37140,7 @@ spec:
         # Adds a Flex Volume Driver that creates a per-pod Unix Domain Socket to allow Dikastes
         # to communicate with Felix over the Policy Sync API.
         - name: flexvol-driver
-          image: docker.io/calico/pod2daemon-flexvol:v3.17.0
+          image: docker.io/calico/pod2daemon-flexvol:v3.17.1
           volumeMounts:
           - name: flexvol-driver-host
             mountPath: /host/driver
@@ -37151,7 +37151,7 @@ spec:
         # container programs network policy and routes on each
         # host.
         - name: calico-node
-          image: docker.io/calico/node:v3.17.0
+          image: docker.io/calico/node:v3.17.1
           envFrom:
           - configMapRef:
               # Allow KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT to be overridden for eBPF mode.
@@ -37415,7 +37415,7 @@ spec:
       priorityClassName: system-cluster-critical
       containers:
         - name: calico-kube-controllers
-          image: docker.io/calico/kube-controllers:v3.17.0
+          image: docker.io/calico/kube-controllers:v3.17.1
           env:
             # Choose which controllers to run.
             - name: ENABLED_CONTROLLERS
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 53b68cbc2ffcc..02225fa498a04 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
@@ -3625,7 +3625,7 @@ spec:
       securityContext:
         fsGroup: 65534
       containers:
-      - image: docker.io/calico/typha:v3.17.0
+      - image: docker.io/calico/typha:v3.17.1
         name: calico-typha
         ports:
         - containerPort: 5473
@@ -3742,7 +3742,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: docker.io/calico/cni:v3.17.0
+          image: docker.io/calico/cni:v3.17.1
           command: ["/opt/cni/bin/calico-ipam", "-upgrade"]
           envFrom:
           - configMapRef:
@@ -3769,7 +3769,7 @@ spec:
         # This container installs the CNI binaries
         # and CNI network config file on each node.
         - name: install-cni
-          image: docker.io/calico/cni:v3.17.0
+          image: docker.io/calico/cni:v3.17.1
           command: ["/opt/cni/bin/install"]
           envFrom:
           - configMapRef:
@@ -3810,7 +3810,7 @@ spec:
         # Adds a Flex Volume Driver that creates a per-pod Unix Domain Socket to allow Dikastes
         # to communicate with Felix over the Policy Sync API.
         - name: flexvol-driver
-          image: docker.io/calico/pod2daemon-flexvol:v3.17.0
+          image: docker.io/calico/pod2daemon-flexvol:v3.17.1
           volumeMounts:
           - name: flexvol-driver-host
             mountPath: /host/driver
@@ -3821,7 +3821,7 @@ spec:
         # container programs network policy and routes on each
         # host.
         - name: calico-node
-          image: docker.io/calico/node:v3.17.0
+          image: docker.io/calico/node:v3.17.1
           envFrom:
           - configMapRef:
               # Allow KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT to be overridden for eBPF mode.
@@ -4085,7 +4085,7 @@ spec:
       priorityClassName: system-cluster-critical
       containers:
         - name: calico-kube-controllers
-          image: docker.io/calico/kube-controllers:v3.17.0
+          image: docker.io/calico/kube-controllers:v3.17.1
           env:
             # Choose which controllers to run.
             - name: ENABLED_CONTROLLERS
diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
index 6df448e1c33b2..27f08c0e7d532 100644
--- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
+++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -732,7 +732,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
 		key := "networking.projectcalico.org"
 		versions := map[string]string{
 			"k8s-1.12": "3.9.6-kops.1",
-			"k8s-1.16": "3.17.0-kops.1",
+			"k8s-1.16": "3.17.1-kops.1",
 		}
 
 		{