From 4c5398bf25ae132e44a91ea830e8a6308740296a Mon Sep 17 00:00:00 2001
From: Adrien <adrien@reslinger.net>
Date: Fri, 29 May 2020 16:37:56 +0200
Subject: [PATCH] Update to v3.14.1

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

diff --git a/files/calico-kube-controllers-Deployment.yaml b/files/calico-kube-controllers-Deployment.yaml
index c18cdf6..4ff0244 100644
--- a/files/calico-kube-controllers-Deployment.yaml
+++ b/files/calico-kube-controllers-Deployment.yaml
@@ -36,7 +36,7 @@ spec:
       priorityClassName: system-cluster-critical
       containers:
         - name: calico-kube-controllers
-          image: calico/kube-controllers:v3.14.0
+          image: calico/kube-controllers:v3.14.1
           env:
             # Choose which controllers to run.
             - name: ENABLED_CONTROLLERS
diff --git a/files/calico-node-DaemonSet.yaml b/files/calico-node-DaemonSet.yaml
index 56fc064..c129ca3 100644
--- a/files/calico-node-DaemonSet.yaml
+++ b/files/calico-node-DaemonSet.yaml
@@ -50,7 +50,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.14.0
+          image: calico/cni:v3.14.1
           command: ["/opt/cni/bin/calico-ipam", "-upgrade"]
           env:
             - name: KUBERNETES_NODE_NAME
@@ -72,7 +72,7 @@ spec:
         # This container installs the CNI binaries
         # and CNI network config file on each node.
         - name: install-cni
-          image: calico/cni:v3.14.0
+          image: calico/cni:v3.14.1
           command: ["/install-cni.sh"]
           env:
             # Name of the CNI config file to create.
@@ -108,7 +108,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.14.0
+          image: calico/pod2daemon-flexvol:v3.14.1
           volumeMounts:
           - name: flexvol-driver-host
             mountPath: /host/driver
@@ -119,7 +119,7 @@ spec:
         # container programs network policy and routes on each
         # host.
         - name: calico-node
-          image: calico/node:v3.14.0
+          image: calico/node:v3.14.1
           env:
             # Use Kubernetes API as the backing datastore.
             - name: DATASTORE_TYPE
@@ -147,6 +147,9 @@ spec:
             # Enable VXLAN
             - name: CALICO_IPV4POOL_VXLAN
               value: "Always"
+            # Enable or Disable VXLAN on the default IP pool.
+            - name: CALICO_IPV4POOL_VXLAN
+              value: "Never"
             # Set MTU for tunnel device used if ipip is enabled
             - name: FELIX_IPINIPMTU
               valueFrom: