Add tls option for ingress

Signed-off-by: Sören Brunk <[email protected]>
flyteorg · Apr 13, 2021 · ff67bdb · ff67bdb
1 parent f35a374
commit ff67bdb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/helm/templates/common/ingress.yaml b/helm/templates/common/ingress.yaml
@@ -135,6 +135,12 @@ spec:
       {{- with .Values.common.ingress.host }}
       host: {{ . }}
       {{- end }}
+  {{- if .Values.common.ingress.tls.enabled }}
+  tls:
+    - secretName: {{ .Release.Name }}-tls
+      hosts:
+        - {{ .Values.common.ingress.host }}
+  {{ end }}
 {{- if .Values.common.ingress.separateGrpcIngress }}
 # Certain ingress controllers like nginx cannot serve HTTP 1 and GRPC with a single ingress because GRPC can only
 # enabled on the ingress object, not on backend services (GRPC annotation is set on the ingress, not on the services).
@@ -169,5 +175,11 @@ spec:
       {{- with .Values.common.ingress.host }}
       host: {{ . }}
       {{- end }}
+  {{- if .Values.common.ingress.tls.enabled }}
+  tls:
+    - secretName: {{ .Release.Name }}-tls
+      hosts:
+        - {{ .Values.common.ingress.host }}
+  {{ end }}
 {{- end }}
 {{- end }}
diff --git a/helm/values-eks.yaml b/helm/values-eks.yaml
@@ -20,7 +20,6 @@ flyteadmin:
       ephemeral-storage: 200Mi
       memory: 200Mi
 
-  configPath: /etc/flyte/config/*.yaml
   service:
     annotations:
       service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "600"

diff --git a/helm/values-sandbox.yaml b/helm/values-sandbox.yaml
@@ -96,6 +96,8 @@ common:
   ingress:
     # enable HMR route to flyteconsole for frontend development.
     webpackHMR: true
+    tls:
+      enabled: false
   flyteNamespaceTemplate: {}
 
 #

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -384,6 +384,8 @@ common:
     albSSLRedirect: false
     # --- Ingress hostname
     # host:
+    tls:
+      enabled: true
   flyteNamespaceTemplate:
     # --- Enable or disable creating Flyte namespace in template. Enable when using helm as template-engine only. Disable when using `helm install ...`.
     enabled: false