From d184f91f2f4d03ef7536c0e17f04a81cc9a51eea Mon Sep 17 00:00:00 2001
From: Tamal Saha <tamal@appscode.com>
Date: Tue, 5 Sep 2023 03:23:11 -0700
Subject: [PATCH] Add *.s3 tls and dns record

Signed-off-by: Tamal Saha <tamal@appscode.com>
---
 charts/ace/templates/ingress/certificate.yaml  |  3 +++
 charts/ace/templates/ingress/ingress-main.yaml |  4 ----
 charts/minio/templates/ingress.yaml            | 11 +++++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/charts/ace/templates/ingress/certificate.yaml b/charts/ace/templates/ingress/certificate.yaml
index 81d7d1e5c..ee3e0d5dc 100644
--- a/charts/ace/templates/ingress/certificate.yaml
+++ b/charts/ace/templates/ingress/certificate.yaml
@@ -15,6 +15,9 @@ spec:
   dnsNames:
     - "{{ .Values.global.platform.domain }}"
     - "*.{{ .Values.global.platform.domain }}"
+  {{- if (index .Values "minio" "enabled") }}
+    - "*.s3.{{ .Values.global.platform.domain }}"
+  {{- end }}
   usages:
     - key agreement
     - digital signature
diff --git a/charts/ace/templates/ingress/ingress-main.yaml b/charts/ace/templates/ingress/ingress-main.yaml
index fb72bc2de..7fff42324 100644
--- a/charts/ace/templates/ingress/ingress-main.yaml
+++ b/charts/ace/templates/ingress/ingress-main.yaml
@@ -197,8 +197,4 @@ spec:
   {{- if (index .Values "smtprelay" "enabled") }}
     - 'smtprelay.{{ .Values.global.platform.domain }}'
   {{- end }}
-  {{- if (index .Values "minio" "enabled") }}
-    - 's3.{{ .Values.global.platform.domain }}'
-    - 'minio.{{ .Values.global.platform.domain }}'
-  {{- end }}
 {{- end }}
diff --git a/charts/minio/templates/ingress.yaml b/charts/minio/templates/ingress.yaml
index 77b207f8f..1941655b6 100644
--- a/charts/minio/templates/ingress.yaml
+++ b/charts/minio/templates/ingress.yaml
@@ -65,6 +65,7 @@ spec:
   tls:
     - hosts:
         - 's3.{{ .Values.ingress.domain }}'
+        - '*.s3.{{ .Values.ingress.domain }}'
         - 'minio.{{ .Values.ingress.domain }}'
       secretName: {{ default (printf "%s-cert" (include "minio.fullname" .)) .Values.minio.tls.secret.name }}
   {{- end }}
@@ -79,6 +80,16 @@ spec:
                 number: {{ .Values.service.port }}
           path: /
           pathType: Prefix
+    - host: *.s3.{{ .Values.ingress.domain }}
+      http:
+        paths:
+        - backend:
+            service:
+              name: {{ include "minio.fullname" . }}
+              port:
+                number: {{ .Values.service.port }}
+          path: /
+          pathType: Prefix
     - host: minio.{{ .Values.ingress.domain }}
       http:
         paths: