fix: Some minor Istio Ingress fixes

This commit is contained in:
Stefan Reimer 2022-04-22 13:38:12 +02:00
parent 05bf415210
commit e8da40086e
3 changed files with 17 additions and 7 deletions

View File

@ -33,6 +33,6 @@ certificates: []
# dnsNames: [] # dnsNames: []
telemetry: telemetry:
enabled: falser enabled: false
proxyProtocol: true proxyProtocol: true

View File

@ -6,7 +6,12 @@ gateway:
app: istio-ingressgateway app: istio-ingressgateway
istio: ingressgateway istio: ingressgateway
# Only nodes who are fronted with matching private NLB {{- with index .Values "istio-ingress" "gateway" "replicaCount" }}
replicaCount: {{ . }}
{{- end }}
{{- if not (index .Values "istio-ingress" "gateway" "affinity") }}
# Only nodes who are fronted with matching LB
affinity: affinity:
nodeAffinity: nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
@ -23,8 +28,12 @@ gateway:
values: values:
- istio-ingressgateway - istio-ingressgateway
topologyKey: "kubernetes.io/hostname" topologyKey: "kubernetes.io/hostname"
{{- end }}
service: service:
{{- with index .Values "istio-ingress" "gateway" "service" "type" }}
type: {{ . }}
{{- end }}
ports: ports:
- name: status-port - name: status-port
port: 15021 port: 15021
@ -44,6 +53,9 @@ gateway:
gatewayProtocol: HTTPS gatewayProtocol: HTTPS
tls: tls:
mode: SIMPLE mode: SIMPLE
{{- with index .Values "istio-ingress" "gateway" "service" "ports" }}
{{- toYaml . | nindent 4 }}
{{- end }}
# custom hardened bootstrap config # custom hardened bootstrap config
env: env:
@ -57,10 +69,6 @@ gateway:
name: custom-bootstrap-volume name: custom-bootstrap-volume
readOnly: true readOnly: true
{{- with index .Values "istio-ingress" "gateway" }}
{{- toYaml . | nindent 2 }}
{{- end }}
telemetry: telemetry:
enabled: {{ $.Values.metrics.enabled }} enabled: {{ $.Values.metrics.enabled }}
certificates: certificates:

View File

@ -10,7 +10,8 @@ gateway:
replicaCount: {{ . }} replicaCount: {{ . }}
{{- end }} {{- end }}
# Only nodes who are fronted with matching private NLB {{- if not (index .Values "istio-private-ingress" "gateway" "affinity") }}
# Only nodes who are fronted with matching LB
affinity: affinity:
nodeAffinity: nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
@ -27,6 +28,7 @@ gateway:
values: values:
- istio-private-ingressgateway - istio-private-ingressgateway
topologyKey: "kubernetes.io/hostname" topologyKey: "kubernetes.io/hostname"
{{- end }}
service: service:
ports: ports: