More istio bootstrap tweaks

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

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

deploy/values.yaml

@@ -23,9 +23,6 @@ kiam:
 istio:
   enabled: false
 
-istio-operator:
-  enabled: false
-
 prometheus:
   enabled: false