From 333d9595cf8e9d98ebefbbea902f97f458f4fca8 Mon Sep 17 00:00:00 2001 From: Jeev B Date: Wed, 9 Aug 2023 07:22:09 -0700 Subject: [PATCH] Fix indent in ingress TLS configuration Signed-off-by: Jeev B --- charts/flyte-binary/templates/ingress/grpc.yaml | 10 +++++----- charts/flyte-binary/templates/ingress/http.yaml | 10 +++++----- docker/sandbox-bundled/manifests/complete.yaml | 4 ++-- docker/sandbox-bundled/manifests/dev.yaml | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/charts/flyte-binary/templates/ingress/grpc.yaml b/charts/flyte-binary/templates/ingress/grpc.yaml index 7b7558ad99..427600336b 100644 --- a/charts/flyte-binary/templates/ingress/grpc.yaml +++ b/charts/flyte-binary/templates/ingress/grpc.yaml @@ -27,6 +27,11 @@ spec: {{- else if .Values.ingress.ingressClassName }} ingressClassName: {{ .Values.ingress.ingressClassName | quote }} {{- end }} + {{- if .Values.ingress.grpcTls }} + tls: {{- tpl ( .Values.ingress.grpcTls | toYaml ) . | nindent 2 }} + {{- else if .Values.ingress.tls }} + tls: {{- tpl ( .Values.ingress.tls | toYaml ) . | nindent 2 }} + {{- end }} rules: - http: paths: @@ -123,9 +128,4 @@ spec: {{- if .Values.ingress.host }} host: {{ tpl .Values.ingress.host . | quote }} {{- end }} - {{- if .Values.ingress.grpcTls }} - tls: {{- tpl ( .Values.ingress.grpcTls | toYaml ) . | nindent 6 }} - {{- else if .Values.ingress.tls }} - tls: {{- tpl ( .Values.ingress.tls | toYaml ) . | nindent 6 }} - {{- end }} {{- end }} diff --git a/charts/flyte-binary/templates/ingress/http.yaml b/charts/flyte-binary/templates/ingress/http.yaml index 9f2f91cf83..5c2a7ad1c7 100644 --- a/charts/flyte-binary/templates/ingress/http.yaml +++ b/charts/flyte-binary/templates/ingress/http.yaml @@ -27,6 +27,11 @@ spec: {{- else if .Values.ingress.ingressClassName }} ingressClassName: {{ .Values.ingress.ingressClassName | quote }} {{- end }} + {{- if .Values.ingress.httpTls }} + tls: {{- tpl ( .Values.ingress.httpTls | toYaml ) . | nindent 2 }} + {{- else if .Values.ingress.tls }} + tls: {{- tpl ( .Values.ingress.tls | toYaml ) . | nindent 2 }} + {{- end }} rules: - http: paths: @@ -172,9 +177,4 @@ spec: {{- if .Values.ingress.host }} host: {{ tpl .Values.ingress.host . | quote }} {{- end }} - {{- if .Values.ingress.httpTls }} - tls: {{- tpl ( .Values.ingress.httpTls | toYaml ) . | nindent 6 }} - {{- else if .Values.ingress.tls }} - tls: {{- tpl ( .Values.ingress.tls | toYaml ) . | nindent 6 }} - {{- end }} {{- end }} diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml index b29f1220b4..4ad09b1454 100644 --- a/docker/sandbox-bundled/manifests/complete.yaml +++ b/docker/sandbox-bundled/manifests/complete.yaml @@ -784,7 +784,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: dmhFWEFXU2l3VW4wNmdHYg== + haSharedSecret: R3NIMExSV1VDTlh4Qlh3eA== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1345,7 +1345,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 9587ba37c31a9445f033acf56e7ea54c214532b8e13c8a6ef014c6d2090d05af + checksum/secret: 966ddd9aa11e209c8e2450a11d1e35e51f6bab83a248025ff2f92694c4fdb90d labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml index 4351d3b18b..91a6b27e52 100644 --- a/docker/sandbox-bundled/manifests/dev.yaml +++ b/docker/sandbox-bundled/manifests/dev.yaml @@ -499,7 +499,7 @@ metadata: --- apiVersion: v1 data: - haSharedSecret: RnVLTjRtMHJvaEwxTWhueg== + haSharedSecret: SEVEQXNwVFNFOFBmQUNWNg== proxyPassword: "" proxyUsername: "" kind: Secret @@ -933,7 +933,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: a52f5b460b64e9d50cd7820278e691ae010451c1088685990544d0ee63d31227 + checksum/secret: fd79606cd0b1063f59877c9cf987ceb3a0d37462286098053c4aac147e8deba4 labels: app: docker-registry release: flyte-sandbox