From 9aff2d271a0d41f160d383f28142f0489262082f Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Wed, 22 Jul 2020 20:11:34 +0100
Subject: [PATCH] More istio bootstrap tweaks

---
 charts/kubezero-istio/templates/ingress-gateway.yaml | 4 ----
 deploy/templates/values.yaml                         | 2 +-
 deploy/values.yaml                                   | 3 ---
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/charts/kubezero-istio/templates/ingress-gateway.yaml b/charts/kubezero-istio/templates/ingress-gateway.yaml
index 7f31c2b4..907d107c 100644
--- a/charts/kubezero-istio/templates/ingress-gateway.yaml
+++ b/charts/kubezero-istio/templates/ingress-gateway.yaml
@@ -3,8 +3,6 @@ kind: Gateway
 metadata:
   name: ingressgateway
   namespace: istio-system
-  annotations:
-    argocd.argoproj.io/sync-wave: "10"
 spec:
   selector:
     istio: ingressgateway
@@ -35,8 +33,6 @@ kind: Gateway
 metadata:
   name: private-ingressgateway
   namespace: istio-system
-  annotations:
-    argocd.argoproj.io/sync-wave: "10"
 spec:
   selector:
     istio: private-ingressgateway
diff --git a/deploy/templates/values.yaml b/deploy/templates/values.yaml
index 1219b721..ab70479a 100644
--- a/deploy/templates/values.yaml
+++ b/deploy/templates/values.yaml
@@ -82,7 +82,7 @@ argo-cd:
   configs:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- if not .Values.bootstrap }}
+  {{- if and ( not .Values.bootstrap ) .Values.istio.enabled }}
   istio:
     enabled: {{ index .Values "argo-cd" "istio" "enabled" }}
     gateway: private-ingressgateway.istio-system.svc.cluster.local
diff --git a/deploy/values.yaml b/deploy/values.yaml
index ca4e5e19..705c1419 100644
--- a/deploy/values.yaml
+++ b/deploy/values.yaml
@@ -23,9 +23,6 @@ kiam:
 istio:
   enabled: false
 
-istio-operator:
-  enabled: false
-
 prometheus:
   enabled: false