From fbe34ddad25b1cf586c245a36207e89248273145 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Wed, 22 Jul 2020 19:20:43 +0100
Subject: [PATCH] Bootstrap fixes for istio

---
 deploy/deploy.sh             | 10 +++++++---
 deploy/templates/values.yaml |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/deploy/deploy.sh b/deploy/deploy.sh
index 7a02eaf4..aee17a8c 100755
--- a/deploy/deploy.sh
+++ b/deploy/deploy.sh
@@ -10,7 +10,7 @@ function wait_for() {
     $@ && break
     [ $TRIES -eq 100 ] && return 1
     let TRIES=$TRIES+1
-		sleep 3
+    sleep 3
   done
 }
 
@@ -58,14 +58,18 @@ EOF
   helm template $DEPLOY_DIR -f values.yaml -f cloudbender.yaml --set istio.enabled=false --set prometheus.enabled=false > generated-values.yaml
   helm upgrade -n argocd kubezero kubezero/kubezero-argo-cd -f generated-values.yaml
 
-	echo "Install Istio / kube-prometheus manually for now, before proceeding! <Any key to continue>"
+  # Install Istio if enabled, but keep ArgoCD istio support disabled for now in case
+  helm template $DEPLOY_DIR -f values.yaml -f cloudbender.yaml --set argo-cd.istio.enabled=false > generated-values.yaml
+  helm upgrade -n argocd kubezero kubezero/kubezero-argo-cd -f generated-values.yaml
+
+  echo "Install kube-prometheus and logging manually for now, before proceeding! <Any key to continue>"
   read
   # Todo: Now we need to wait till all is synced and healthy ... argocd cli or kubectl ?
   # Wait for aws-ebs or kiam to be all ready, or all pods running ?
 
   # Todo: 
-  # - integrate Istio
   # - integrate Prometheus-Grafana
+  # - integrate ES based logging
 
   # Finally we could enable the actual config and deploy all
   helm template $DEPLOY_DIR -f values.yaml -f cloudbender.yaml > generated-values.yaml
diff --git a/deploy/templates/values.yaml b/deploy/templates/values.yaml
index 2aa96b24..1219b721 100644
--- a/deploy/templates/values.yaml
+++ b/deploy/templates/values.yaml
@@ -63,7 +63,7 @@ kubezero:
   {{- end }}
 
   istio:
-    enabled: {{ index .Values "istio-operator" "enabled" }}
+    enabled: {{ .Values.istio.enabled }}
     values:
       ingress:
         dnsNames:
@@ -84,6 +84,6 @@ argo-cd:
   {{- end }}
   {{- if not .Values.bootstrap }}
   istio:
-    enabled: {{ .Values.istio.enabled }}
+    enabled: {{ index .Values "argo-cd" "istio" "enabled" }}
     gateway: private-ingressgateway.istio-system.svc.cluster.local
   {{- end }}