From 59c0f40b5fd785dfab4f4f2720b7080be0ef78dd Mon Sep 17 00:00:00 2001
From: Adrien <adrien@reslinger.net>
Date: Thu, 22 Oct 2020 19:28:04 +0200
Subject: [PATCH] Update from upstream

---
 files/calico-kube-controllers-Deployment.yaml | 2 +-
 files/calico-node-ClusterRole.yaml            | 8 --------
 files/calico-node-DaemonSet.yaml              | 8 ++++----
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/files/calico-kube-controllers-Deployment.yaml b/files/calico-kube-controllers-Deployment.yaml
index 19d8c78..f217b51 100644
--- a/files/calico-kube-controllers-Deployment.yaml
+++ b/files/calico-kube-controllers-Deployment.yaml
@@ -34,7 +34,7 @@ spec:
       priorityClassName: system-cluster-critical
       containers:
         - name: calico-kube-controllers
-          image: calico/kube-controllers:v3.16.3
+          image: calico/kube-controllers:v3.16.4
           env:
             # Choose which controllers to run.
             - name: ENABLED_CONTROLLERS
diff --git a/files/calico-node-ClusterRole.yaml b/files/calico-node-ClusterRole.yaml
index c10da51..9ca41ad 100644
--- a/files/calico-node-ClusterRole.yaml
+++ b/files/calico-node-ClusterRole.yaml
@@ -14,14 +14,6 @@ rules:
       - namespaces
     verbs:
       - get
-  - apiGroups: [""]
-    resources:
-      - secrets
-    verbs:
-      # Needed when configuring bgp password in bgppeer
-      - watch
-      - list
-      - get
   - apiGroups: [""]
     resources:
       - endpoints
diff --git a/files/calico-node-DaemonSet.yaml b/files/calico-node-DaemonSet.yaml
index 41cd0b5..a544e6e 100644
--- a/files/calico-node-DaemonSet.yaml
+++ b/files/calico-node-DaemonSet.yaml
@@ -44,7 +44,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.3
+          image: calico/cni:v3.16.4
           command: ["/opt/cni/bin/calico-ipam", "-upgrade"]
           envFrom:
           - configMapRef:
@@ -71,7 +71,7 @@ spec:
         # This container installs the CNI binaries
         # and CNI network config file on each node.
         - name: install-cni
-          image: calico/cni:v3.16.3
+          image: calico/cni:v3.16.4
           command: ["/opt/cni/bin/install"]
           envFrom:
           - configMapRef:
@@ -112,7 +112,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: calico/pod2daemon-flexvol:v3.16.3
+          image: calico/pod2daemon-flexvol:v3.16.4
           volumeMounts:
           - name: flexvol-driver-host
             mountPath: /host/driver
@@ -123,7 +123,7 @@ spec:
         # container programs network policy and routes on each
         # host.
         - name: calico-node
-          image: calico/node:v3.16.3
+          image: calico/node:v3.16.4
           envFrom:
           - configMapRef:
               # Allow KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT to be overridden for eBPF mode.