same logic for http and https ports

trinodb · Feb 6, 2025 · d83edbe · d83edbe
1 parent bfd8153
commit d83edbe
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/charts/trino/templates/configmap-coordinator.yaml b/charts/trino/templates/configmap-coordinator.yaml
@@ -74,7 +74,7 @@ data:
     {{- end }}
     {{- if .Values.server.config.https.enabled }}
     http-server.https.enabled=true
-    http-server.https.port={{ .Values.server.config.https.port }}
+    http-server.https.port={{ .Values.service.tlsPort }}
     http-server.https.keystore.path={{ .Values.server.config.https.keystore.path }}
     http-server.https.keystore.key={{ .Values.server.config.https.keystore.key }}
     http-server.https.keymanager.password={{ .Values.server.config.https.keymanager.password }}

diff --git a/charts/trino/templates/configmap-worker.yaml b/charts/trino/templates/configmap-worker.yaml
@@ -61,7 +61,7 @@ data:
     internal-communication.https.required=true
     discovery.uri=https://{{ template "trino.fullname" . }}:{{ .Values.service.tlsPort }}
     http-server.https.enabled=true
-    http-server.https.port={{ .Values.server.config.https.port }}
+    http-server.https.port={{ .Values.service.tlsPort }}
     {{- else }}
     discovery.uri=http://{{ template "trino.fullname" . }}:{{ .Values.service.port }}
     {{- end }}

diff --git a/charts/trino/templates/service-coordinator.yaml b/charts/trino/templates/service-coordinator.yaml
@@ -21,7 +21,7 @@ spec:
       {{- end }}
     {{- if .Values.server.config.https.enabled }}
     - port: {{ .Values.service.tlsPort }}
-      targetPort: {{ .Values.server.config.https.port }}
+      targetPort: https
       protocol: TCP
       name: https
     {{- end }}

diff --git a/charts/trino/templates/service-worker.yaml b/charts/trino/templates/service-worker.yaml
@@ -18,7 +18,7 @@ spec:
       name: http
     {{- if and .Values.server.config.https.enabled .Values.server.config.https.internal }}
     - port: {{ .Values.service.tlsPort }}
-      targetPort: {{ .Values.server.config.https.port }}
+      targetPort: https
       protocol: TCP
       name: https
     {{- end }}

diff --git a/charts/trino/values.yaml b/charts/trino/values.yaml
@@ -51,7 +51,6 @@ server:
     https:
       enabled: false
       internal: false
-      port: 443
       keystore:
         path: ""
         key: ""