From 358b611a680dc1616568dd6be7e8bd2a0333fbe0 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Fri, 3 Jul 2020 14:47:27 +0100
Subject: [PATCH] First tuning of calico-aws

---
 artifacts/kubezero-calico/calico-aws.yaml | 31 +++--------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/artifacts/kubezero-calico/calico-aws.yaml b/artifacts/kubezero-calico/calico-aws.yaml
index a2fe951..72c2fc4 100644
--- a/artifacts/kubezero-calico/calico-aws.yaml
+++ b/artifacts/kubezero-calico/calico-aws.yaml
@@ -10,13 +10,13 @@ data:
   # Typha is disabled.
   typha_service_name: "none"
   # Configure the backend to use.
-  calico_backend: "bird"
+  calico_backend: "vxlan"
   # Configure the MTU to use for workload interfaces and tunnels.
   # - If Wireguard is enabled, set to your network MTU - 60
   # - Otherwise, if VXLAN or BPF mode is enabled, set to your network MTU - 50
   # - Otherwise, if IPIP is enabled, set to your network MTU - 20
   # - Otherwise, if not using any encapsulation, set to your network MTU.
-  veth_mtu: "1410"
+  veth_mtu: "8941"
 
   # The CNI network configuration to install on each node. The special
   # values in this config will be automatically populated.
@@ -3451,29 +3451,6 @@ spec:
       terminationGracePeriodSeconds: 0
       priorityClassName: system-node-critical
       initContainers:
-        # This container performs upgrade from host-local IPAM to calico-ipam.
-        # 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.15.0
-          command: ["/opt/cni/bin/calico-ipam", "-upgrade"]
-          env:
-            - name: KUBERNETES_NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-            - name: CALICO_NETWORKING_BACKEND
-              valueFrom:
-                configMapKeyRef:
-                  name: calico-config
-                  key: calico_backend
-          volumeMounts:
-            - mountPath: /var/lib/cni/networks
-              name: host-local-net-dir
-            - mountPath: /host/opt/cni/bin
-              name: cni-bin-dir
-          securityContext:
-            privileged: true
         # This container installs the CNI binaries
         # and CNI network config file on each node.
         - name: install-cni
@@ -3545,7 +3522,7 @@ spec:
                   key: calico_backend
             # Cluster type to identify the deployment type
             - name: CLUSTER_TYPE
-              value: "k8s,bgp"
+              value: "k8s,kubeadm"
             # Auto-detect the BGP IP address.
             - name: IP
               value: "autodetect"
@@ -3554,7 +3531,7 @@ spec:
               value: "Never"
             # Enable or Disable VXLAN on the default IP pool.
             - name: CALICO_IPV4POOL_VXLAN
-              value: "CrossSubnet"
+              value: "Always"
             # Set MTU for tunnel device used if ipip is enabled
             - name: FELIX_IPINIPMTU
               valueFrom: