From 5661a5d7c3e336dc1e493f70172f590367e13153 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Tue, 14 Jul 2020 17:30:43 +0100
Subject: [PATCH] Fix local-path-provisioner, map istio-operator to control
 plane

---
 charts/kubezero-istio/README.md.gotmpl          |  1 +
 .../istio-operator/templates/deployment.yaml    |  6 ++++++
 charts/kubezero-istio/istio-operator.patch      | 17 +++++++++++++++++
 charts/kubezero/Chart.yaml                      |  2 +-
 charts/kubezero/README.md                       |  2 +-
 .../templates/local-volume-provisioner.yaml     |  2 +-
 6 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 charts/kubezero-istio/istio-operator.patch

diff --git a/charts/kubezero-istio/README.md.gotmpl b/charts/kubezero-istio/README.md.gotmpl
index 7789d1bc..cd85c690 100644
--- a/charts/kubezero-istio/README.md.gotmpl
+++ b/charts/kubezero-istio/README.md.gotmpl
@@ -11,6 +11,7 @@ Installs Istio Operator and KubeZero Istio profile
 {{ template "chart.requirementsSection" . }}
 
 ## KubeZero default configuration
+- mapped istio-operator to run on the controller nodes only
 
 
 ## Resources
diff --git a/charts/kubezero-istio/charts/istio-operator/templates/deployment.yaml b/charts/kubezero-istio/charts/istio-operator/templates/deployment.yaml
index 5ef78484..8350dd55 100644
--- a/charts/kubezero-istio/charts/istio-operator/templates/deployment.yaml
+++ b/charts/kubezero-istio/charts/istio-operator/templates/deployment.yaml
@@ -14,6 +14,12 @@ spec:
         name: istio-operator
     spec:
       serviceAccountName: istio-operator
+      nodeSelector:
+        kubernetes.io/os: linux
+        node-role.kubernetes.io/master: ""
+      tolerations:
+        - key: node-role.kubernetes.io/master
+          effect: NoSchedule
       containers:
         - name: istio-operator
           image: {{.Values.hub}}/operator:{{.Values.tag}}
diff --git a/charts/kubezero-istio/istio-operator.patch b/charts/kubezero-istio/istio-operator.patch
new file mode 100644
index 00000000..7043f507
--- /dev/null
+++ b/charts/kubezero-istio/istio-operator.patch
@@ -0,0 +1,17 @@
+diff --git a/charts/kubezero-istio/charts/istio-operator/templates/deployment.yaml b/charts/kubezero-istio/charts/istio-operator/templates/deployment.yaml
+index 5ef7848..8350dd5 100644
+--- a/charts/kubezero-istio/charts/istio-operator/templates/deployment.yaml
++++ b/charts/kubezero-istio/charts/istio-operator/templates/deployment.yaml
+@@ -14,6 +14,12 @@ spec:
+         name: istio-operator
+     spec:
+       serviceAccountName: istio-operator
++      nodeSelector:
++        kubernetes.io/os: linux
++        node-role.kubernetes.io/master: ""
++      tolerations:
++        - key: node-role.kubernetes.io/master
++          effect: NoSchedule
+       containers:
+         - name: istio-operator
+           image: {{.Values.hub}}/operator:{{.Values.tag}}
diff --git a/charts/kubezero/Chart.yaml b/charts/kubezero/Chart.yaml
index 95654eee..8d58cae6 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.5
+version: 0.3.6
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
diff --git a/charts/kubezero/README.md b/charts/kubezero/README.md
index e1e416b1..4e33d224 100644
--- a/charts/kubezero/README.md
+++ b/charts/kubezero/README.md
@@ -2,7 +2,7 @@ kubezero
 ========
 KubeZero ArgoCD Application - Root App of Apps chart of KubeZero
 
-Current chart version is `0.3.5`
+Current chart version is `0.3.6`
 
 Source code can be found [here](https://kubezero.com)
 
diff --git a/charts/kubezero/templates/local-volume-provisioner.yaml b/charts/kubezero/templates/local-volume-provisioner.yaml
index 804e9f15..0db5f774 100644
--- a/charts/kubezero/templates/local-volume-provisioner.yaml
+++ b/charts/kubezero/templates/local-volume-provisioner.yaml
@@ -1,5 +1,5 @@
 {{- if index .Values "local-volume-provisioner" "enabled" }}
-{{ template "kubezero-app.app" dict "root" . "name" "local-volume-provisioner" "type" "kustomize" }}
+{{ template "kubezero-app.app" dict "root" . "name" "local-volume-provisioner" "type" "helm" }}
   syncPolicy:
     automated:
       prune: true