More istio bootstrap tweaks

This commit is contained in:
Stefan Reimer 2020-07-22 20:11:34 +01:00
parent fbe34ddad2
commit 9aff2d271a
3 changed files with 1 additions and 8 deletions

View File

@ -3,8 +3,6 @@ kind: Gateway
metadata: metadata:
name: ingressgateway name: ingressgateway
namespace: istio-system namespace: istio-system
annotations:
argocd.argoproj.io/sync-wave: "10"
spec: spec:
selector: selector:
istio: ingressgateway istio: ingressgateway
@ -35,8 +33,6 @@ kind: Gateway
metadata: metadata:
name: private-ingressgateway name: private-ingressgateway
namespace: istio-system namespace: istio-system
annotations:
argocd.argoproj.io/sync-wave: "10"
spec: spec:
selector: selector:
istio: private-ingressgateway istio: private-ingressgateway

View File

@ -82,7 +82,7 @@ argo-cd:
configs: configs:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- if not .Values.bootstrap }} {{- if and ( not .Values.bootstrap ) .Values.istio.enabled }}
istio: istio:
enabled: {{ index .Values "argo-cd" "istio" "enabled" }} enabled: {{ index .Values "argo-cd" "istio" "enabled" }}
gateway: private-ingressgateway.istio-system.svc.cluster.local gateway: private-ingressgateway.istio-system.svc.cluster.local

View File

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