From 19fd0f7d5b024cca540425d2ef762b70dec2ffc3 Mon Sep 17 00:00:00 2001
From: Andrew Garrett <andrewgarrett@google.com>
Date: Tue, 6 Jun 2023 05:37:27 +1000
Subject: [PATCH] Helm chart fixes: (#4539)

- Allow TLS and Host name to be specified in values.yaml
---
 k8s/charts/seaweedfs/templates/ingress.yaml | 5 ++++-
 k8s/charts/seaweedfs/values.yaml            | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/k8s/charts/seaweedfs/templates/ingress.yaml b/k8s/charts/seaweedfs/templates/ingress.yaml
index f488ef67e..d14adf1f3 100644
--- a/k8s/charts/seaweedfs/templates/ingress.yaml
+++ b/k8s/charts/seaweedfs/templates/ingress.yaml
@@ -14,8 +14,11 @@ metadata:
     {{ omit .Values.filer.ingress.annotations "kubernetes.io/ingress.class" | toYaml | nindent 4 }}
 spec:
   ingressClassName: {{ .Values.filer.ingress.className | quote }}
+  tls:
+    {{ .Values.filer.ingress.tls | default list | toYaml | nindent 6}}
   rules:
-  - http:
+  - host: {{ .Values.filer.ingress.host }}
+    http:
       paths:
       - path: /sw-filer/?(.*)
         pathType: ImplementationSpecific
diff --git a/k8s/charts/seaweedfs/values.yaml b/k8s/charts/seaweedfs/values.yaml
index 2a6a136fc..4a9638d31 100644
--- a/k8s/charts/seaweedfs/values.yaml
+++ b/k8s/charts/seaweedfs/values.yaml
@@ -124,6 +124,7 @@ master:
   ingress:
     enabled: false
     className: "nginx"
+    host: "master.seaweedfs.local"
     annotations:
       nginx.ingress.kubernetes.io/auth-type: "basic"
       nginx.ingress.kubernetes.io/auth-secret: "default/ingress-basic-auth-secret"
@@ -371,7 +372,9 @@ filer:
   ingress:
     enabled: false
     className: "nginx"
+    host: "seaweedfs.cluster.local"
     annotations:
+      nginx.ingress.kubernetes.io/backend-protocol: GRPC
       nginx.ingress.kubernetes.io/auth-type: "basic"
       nginx.ingress.kubernetes.io/auth-secret: "default/ingress-basic-auth-secret"
       nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required - SW-Filer'