From 987281afdf0c19cc5225ea166033635269d2b210 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Thu, 9 Jul 2020 12:01:01 +0100
Subject: [PATCH] Map calico controller to controller nodes, add IPPool

---
 charts/kubezero-calico/Chart.yaml            |  3 ++-
 charts/kubezero-calico/templates/calico.yaml |  1 +
 charts/kubezero-calico/templates/ippool.yaml | 11 +++++++++++
 charts/kubezero/Chart.yaml                   |  2 +-
 4 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 charts/kubezero-calico/templates/ippool.yaml

diff --git a/charts/kubezero-calico/Chart.yaml b/charts/kubezero-calico/Chart.yaml
index ff572c85..dd99d7d1 100644
--- a/charts/kubezero-calico/Chart.yaml
+++ b/charts/kubezero-calico/Chart.yaml
@@ -2,7 +2,8 @@ apiVersion: v2
 name: kubezero-calico
 description: KubeZero Umbrella Chart for Calico
 type: application
-version: 0.1.3
+version: 0.1.4
+appVersion: 3.15
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
diff --git a/charts/kubezero-calico/templates/calico.yaml b/charts/kubezero-calico/templates/calico.yaml
index 08408603..14db12d7 100644
--- a/charts/kubezero-calico/templates/calico.yaml
+++ b/charts/kubezero-calico/templates/calico.yaml
@@ -581,6 +581,7 @@ spec:
     spec:
       nodeSelector:
         kubernetes.io/os: linux
+        node-role.kubernetes.io/master: ""
       tolerations:
         # Mark the pod as a critical add-on for rescheduling.
         - key: CriticalAddonsOnly
diff --git a/charts/kubezero-calico/templates/ippool.yaml b/charts/kubezero-calico/templates/ippool.yaml
new file mode 100644
index 00000000..303ac5be
--- /dev/null
+++ b/charts/kubezero-calico/templates/ippool.yaml
@@ -0,0 +1,11 @@
+apiVersion: projectcalico.org/v3
+kind: IPPool
+metadata:
+  name: default-ipv4-ippool
+spec:
+  cidr: 10.244.0.0/16
+  blockSize: 26
+  ipipMode: Never
+  natOutgoing: true
+  nodeSelector: all()
+  vxlanMode: Always
diff --git a/charts/kubezero/Chart.yaml b/charts/kubezero/Chart.yaml
index c9d6df4d..95654eee 100644
--- a/charts/kubezero/Chart.yaml
+++ b/charts/kubezero/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero
 description: KubeZero ArgoCD Application - Root App of Apps chart of KubeZero
 type: application
-version: 0.3.4
+version: 0.3.5
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords: