From ca52f9015352e79e8a97014e6ef5c5f4738c86e6 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Tue, 14 Jul 2020 17:39:12 +0100
Subject: [PATCH] Add Istio into kubezero, disabled by default

---
 charts/kubezero-istio/README.md      | 1 +
 charts/kubezero/Chart.yaml           | 2 +-
 charts/kubezero/README.md            | 3 ++-
 charts/kubezero/templates/istio.yaml | 6 ++++++
 charts/kubezero/values-all.yaml      | 3 +++
 charts/kubezero/values.yaml          | 3 +++
 6 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 charts/kubezero/templates/istio.yaml

diff --git a/charts/kubezero-istio/README.md b/charts/kubezero-istio/README.md
index ab29461..756d1a0 100644
--- a/charts/kubezero-istio/README.md
+++ b/charts/kubezero-istio/README.md
@@ -17,6 +17,7 @@ Source code can be found [here](https://kubezero.com)
 | https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.1 |
 
 ## KubeZero default configuration
+- mapped istio-operator to run on the controller nodes only
 
 
 ## Resources
diff --git a/charts/kubezero/Chart.yaml b/charts/kubezero/Chart.yaml
index 8d58cae..7cdf432 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.6
+version: 0.3.7
 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 4e33d22..ff3844e 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.6`
+Current chart version is `0.3.7`
 
 Source code can be found [here](https://kubezero.com)
 
@@ -25,6 +25,7 @@ Source code can be found [here](https://kubezero.com)
 | global.defaultSource.pathPrefix | string | `""` |  |
 | global.defaultSource.repoURL | string | `"https://github.com/zero-down-time/kubezero"` |  |
 | global.defaultSource.targetRevision | string | `"HEAD"` |  |
+| istio.enabled | bool | `false` |  |
 | kiam.enabled | bool | `false` |  |
 | local-volume-provisioner.enabled | bool | `false` |  |
 | platform | string | `"aws"` |  |
diff --git a/charts/kubezero/templates/istio.yaml b/charts/kubezero/templates/istio.yaml
new file mode 100644
index 0000000..cd5804a
--- /dev/null
+++ b/charts/kubezero/templates/istio.yaml
@@ -0,0 +1,6 @@
+{{- if .Values.istio.enabled }}
+{{ template "kubezero-app.app" dict "root" . "name" "istio" "type" "helm" }}
+  syncPolicy:
+    automated:
+      prune: true
+{{- end }}
diff --git a/charts/kubezero/values-all.yaml b/charts/kubezero/values-all.yaml
index d939434..18d4f10 100644
--- a/charts/kubezero/values-all.yaml
+++ b/charts/kubezero/values-all.yaml
@@ -27,3 +27,6 @@ kiam:
 
 aws-ebs-csi-driver:
   enabled: true
+
+istio:
+  enabled: true
diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml
index d01ee63..e16475d 100644
--- a/charts/kubezero/values.yaml
+++ b/charts/kubezero/values.yaml
@@ -32,3 +32,6 @@ kiam:
 
 aws-ebs-csi-driver:
   enabled: false
+
+istio:
+  enabled: false