From 07df7717a55684e5b5da8dc84563388491408b31 Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Mon, 14 Oct 2019 13:49:21 -0700 Subject: [PATCH] Update Calico to v3.8.3 --- .../calico-policy-controller/calico-node-daemonset.yaml | 8 ++++++-- .../addons/calico-policy-controller/typha-deployment.yaml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cluster/addons/calico-policy-controller/calico-node-daemonset.yaml b/cluster/addons/calico-policy-controller/calico-node-daemonset.yaml index 3f609efc8d2..8b2840c5292 100644 --- a/cluster/addons/calico-policy-controller/calico-node-daemonset.yaml +++ b/cluster/addons/calico-policy-controller/calico-node-daemonset.yaml @@ -28,7 +28,7 @@ spec: terminationGracePeriodSeconds: 0 initContainers: - name: install-cni - image: gcr.io/projectcalico-org/cni:v3.8.2 + image: gcr.io/projectcalico-org/cni:v3.8.3 command: ["/install-cni.sh"] env: - name: CNI_CONF_NAME @@ -79,8 +79,10 @@ spec: # container programs network policy and routes on each # host. - name: calico-node - image: gcr.io/projectcalico-org/node:v3.8.2 + image: gcr.io/projectcalico-org/node:v3.8.3 env: + - name: CALICO_MANAGE_CNI + value: "true" - name: CALICO_DISABLE_FILE_LOGGING value: "true" - name: CALICO_NETWORKING_BACKEND @@ -132,6 +134,8 @@ spec: host: localhost periodSeconds: 10 volumeMounts: + - mountPath: /host/etc/cni/net.d + name: cni-net-dir - mountPath: /lib/modules name: lib-modules readOnly: true diff --git a/cluster/addons/calico-policy-controller/typha-deployment.yaml b/cluster/addons/calico-policy-controller/typha-deployment.yaml index 0dd431160e5..5c2f17b1943 100644 --- a/cluster/addons/calico-policy-controller/typha-deployment.yaml +++ b/cluster/addons/calico-policy-controller/typha-deployment.yaml @@ -24,7 +24,7 @@ spec: hostNetwork: true serviceAccountName: calico containers: - - image: gcr.io/projectcalico-org/typha:v3.8.2 + - image: gcr.io/projectcalico-org/typha:v3.8.3 name: calico-typha ports: - containerPort: 5473