From 5fa640ee48ace47c182cca54d492f800bc3bf644 Mon Sep 17 00:00:00 2001
From: cccs-nik <68961854+cccs-nik@users.noreply.github.com>
Date: Tue, 25 Mar 2025 11:39:15 -0400
Subject: [PATCH 1/2] include https port where needed when https is enabled

---
 charts/trino/templates/deployment-coordinator.yaml | 5 +++++
 charts/trino/templates/deployment-worker.yaml      | 5 +++++
 charts/trino/templates/ingress.yaml                | 4 ++++
 charts/trino/templates/service-coordinator.yaml    | 6 ++++++
 4 files changed, 20 insertions(+)

diff --git a/charts/trino/templates/deployment-coordinator.yaml b/charts/trino/templates/deployment-coordinator.yaml
index 54319456..d6906f91 100644
--- a/charts/trino/templates/deployment-coordinator.yaml
+++ b/charts/trino/templates/deployment-coordinator.yaml
@@ -197,6 +197,11 @@ spec:
             - name: http
               containerPort: {{ .Values.service.port }}
               protocol: TCP
+            {{- if .Values.server.config.https.enabled }}
+            - name: https
+              containerPort: {{ .Values.server.config.https.port }}
+              protocol: TCP
+            {{- end }}
             {{- if $coordinatorJmx.enabled }}
             - name: jmx-registry
               containerPort: {{ $coordinatorJmx.registryPort }}
diff --git a/charts/trino/templates/deployment-worker.yaml b/charts/trino/templates/deployment-worker.yaml
index 7a69e8ae..fa97c224 100644
--- a/charts/trino/templates/deployment-worker.yaml
+++ b/charts/trino/templates/deployment-worker.yaml
@@ -171,6 +171,11 @@ spec:
             - name: http
               containerPort: {{ .Values.service.port }}
               protocol: TCP
+            {{- if .Values.server.config.https.enabled }}
+            - name: https
+              containerPort: {{ .Values.server.config.https.port }}
+              protocol: TCP
+            {{- end }}
             {{- if $workerJmx.enabled }}
             - name: jmx-registry
               containerPort: {{ $workerJmx.registryPort }}
diff --git a/charts/trino/templates/ingress.yaml b/charts/trino/templates/ingress.yaml
index 1da324c3..adfec290 100644
--- a/charts/trino/templates/ingress.yaml
+++ b/charts/trino/templates/ingress.yaml
@@ -32,7 +32,11 @@ spec:
               service:
                 name: {{ include "trino.fullname" $ }}
                 port:
+                  {{- if $.Values.server.config.https.enabled }}
+                  number: {{ $.Values.server.config.https.port }}
+                  {{- else }}
                   number: {{ $.Values.service.port }}
+                  {{- end }}
           {{- end }}
     {{- end }}
 {{- end }}
diff --git a/charts/trino/templates/service-coordinator.yaml b/charts/trino/templates/service-coordinator.yaml
index b028047a..cd9ab1a7 100644
--- a/charts/trino/templates/service-coordinator.yaml
+++ b/charts/trino/templates/service-coordinator.yaml
@@ -19,6 +19,12 @@ spec:
       {{- if .Values.service.nodePort }}
       nodePort: {{ .Values.service.nodePort }}
       {{- end }}
+    {{- if .Values.server.config.https.enabled }}
+    - port: {{ .Values.server.config.https.port }}
+      targetPort: https
+      protocol: TCP
+      name: https
+    {{- end }}
     {{- if $coordinatorJmx.exporter.enabled }}
     - port: {{ $coordinatorJmx.exporter.port }}
       targetPort: jmx-exporter

From 51a9cc4a38ce5d9a581b415a0ddcaec0895d156d Mon Sep 17 00:00:00 2001
From: cccs-nik <68961854+cccs-nik@users.noreply.github.com>
Date: Tue, 25 Mar 2025 12:32:54 -0400
Subject: [PATCH 2/2] removing duplicate https port from test values file

---
 tests/trino/test-values.yaml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/tests/trino/test-values.yaml b/tests/trino/test-values.yaml
index ed145cdd..01146f0b 100644
--- a/tests/trino/test-values.yaml
+++ b/tests/trino/test-values.yaml
@@ -100,13 +100,6 @@ coordinator:
       mountPath: /etc/trino/generated
       readOnly: false
 
-  additionalExposedPorts:
-    https:
-      servicePort: 8443
-      name: https
-      port: 8443
-      protocol: TCP
-
   annotations:
     custom/name: value