add configurable port names for istio compatibility

tryretool · Feb 28, 2024 · 3be31ab · 3be31ab
1 parent 7684ef7
commit 3be31ab
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/charts/retool/templates/deployment_code_executor.yaml b/charts/retool/templates/deployment_code_executor.yaml
@@ -83,10 +83,11 @@ spec:
           {{- end }}
         ports:
         - containerPort: 3004
+          {{ if .Values.codeExecutor.portName }}
+          name: {{ .Values.codeExecutor.portName }}
+          {{ else }}
           name: {{ template "retool.name" . }}
-          protocol: TCP
-        - containerPort: 9090
-          name: metrics
+          {{ end }}
           protocol: TCP
 {{- if .Values.livenessProbe.enabled }}
         livenessProbe:
@@ -137,9 +138,9 @@ spec:
   - protocol: TCP
     port: 80
     targetPort: 3004
+    {{ if .Values.codeExecutor.portName }}
+    name: {{ .Values.codeExecutor.portName }}
+    {{ else }}
     name: {{ template "retool.name" . }}
-  - protocol: TCP
-    port: 9090
-    targetPort: metrics
-    name: metrics
+    {{ end }}
 {{- end }}
diff --git a/charts/retool/templates/deployment_workflows.yaml b/charts/retool/templates/deployment_workflows.yaml
@@ -217,7 +217,11 @@ spec:
         {{- end }}
         ports:
         - containerPort: {{ .Values.service.internalPort }}
+          {{ if .Values.workflows.backend.portName }}
+          name: {{ .Values.workflows.backend.portName }}
+          {{ else }}
           name: {{ template "retool.name" . }}
+          {{ end }}
           protocol: TCP
 {{- if .Values.livenessProbe.enabled }}
         livenessProbe:
@@ -314,4 +318,9 @@ spec:
   - protocol: TCP
     port: 80
     targetPort: {{ .Values.service.internalPort }}
+    {{ if .Values.workflows.backend.portName }}
+    name: {{ .Values.workflows.backend.portName }}
+    {{ else }}
+    name: {{ template "retool.name" . }}
+    {{ end }}
 {{- end }}
diff --git a/charts/retool/templates/deployment_workflows_worker.yaml b/charts/retool/templates/deployment_workflows_worker.yaml
@@ -236,10 +236,14 @@ spec:
         {{- end }}
         ports:
         - containerPort: 3005
+          {{ if .Values.workflows.worker.portName }}
+          name: {{ .Values.workflows.worker.portName }}
+          {{ else }}
           name: {{ template "retool.name" . }}
+          {{ end }}
           protocol: TCP
         - containerPort: 9090
-          name: metrics
+          name: {{ default .Values.workflows.worker.metricsPortName "metrics" }}
           protocol: TCP
 
 {{- if .Values.livenessProbe.enabled }}
@@ -336,9 +340,13 @@ spec:
   - protocol: TCP
     port: 3005
     targetPort: 3005
+    {{ if .Values.workflows.worker.portName }}
+    name: {{ .Values.workflows.worker.portName }}
+    {{ else }}
     name: {{ template "retool.name" . }}
+    {{ end }}
   - protocol: TCP
     port: 9090
-    targetPort: metrics
-    name: metrics
+    targetPort: {{ .Values.workflows.worker.metricsPortName | default "metrics" }}
+    name: {{ .Values.workflows.worker.metricsPortName | default "metrics" }}
 {{- end }}