[fix] Add default multiplayer ingress rule (#205)

tryretool · Feb 18, 2025 · 9a3c6ff · 9a3c6ff
1 parent fb753bf
commit 9a3c6ff
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 1 deletion.
diff --git a/charts/retool/Chart.yaml b/charts/retool/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: retool
 description: A Helm chart for Kubernetes
 type: application
-version: 6.3.5
+version: 6.3.6
 maintainers:
   - name: Retool Engineering
     email: [email protected]

diff --git a/charts/retool/templates/ingress.yaml b/charts/retool/templates/ingress.yaml
@@ -30,6 +30,20 @@ spec:
     - host: {{ .Values.ingress.hostName | quote }}
       http:
         paths:
+          # The multiplayer paths must be added before the main path to avoid less specific paths being matched first.
+          {{- if ( and ((.Values.multiplayer).enabled) (((.Values.multiplayer).ingress).enabled) ) }}
+          {{- range .Values.multiplayer.ingress.paths }}
+          - path: {{ .path }}
+            {{- if (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.Version) }}
+            pathType: {{ .pathType | default "ImplementationSpecific" }}
+            {{- end }}
+            backend:
+              service:
+                name: {{ template "retool.multiplayer.name" . }}
+                port:
+                  number: {{ .port }}
+          {{- end }}
+          {{- end }}
           - path:
             {{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.Version) }}
             pathType: {{ $pathType }}
@@ -51,6 +65,20 @@ spec:
         paths:
           {{- with .extraPaths }}
 {{ toYaml . | indent 10 }}
+          {{- end }}
+          # The multiplayer paths must be added before the main path to avoid less specific paths being matched first.
+          {{- if ( and (($.Values.multiplayer).enabled) ((($.Values.multiplayer).ingress).enabled) ) }}
+          {{- range (($.Values.multiplayer).ingress).paths }}
+          - path: {{ .path }}
+            {{- if (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.Version) }}
+            pathType: {{ .pathType | default "ImplementationSpecific" }}
+            {{- end }}
+            backend:
+              service:
+                name: {{ template "retool.multiplayer.name" . }}
+                port:
+                  number: {{ .port }}
+          {{- end }}
           {{- end }}
           {{- range .paths }}
           - path: {{ .path }}

diff --git a/charts/retool/values.yaml b/charts/retool/values.yaml
@@ -461,6 +461,14 @@ multiplayer:
   # Labels for multiplayer pods
   labels: {}
 
+  # Paths to route to multiplayer pods; defaults to /api/multiplayer. Can specify both path and port.
+  ingress:
+    # This conditional is dependent on multiplayer.enabled.
+    enabled: true
+    paths:
+      - path: /api/multiplayer
+        port: 80
+
 codeExecutor:
   # enabled by default from Chart version 6.0.15 and Retool image 3.20.15 onwards
   # explicitly set other fields as needed

diff --git a/values.yaml b/values.yaml
@@ -461,6 +461,14 @@ multiplayer:
   # Labels for multiplayer pods
   labels: {}
 
+  # Paths to route to multiplayer pods; defaults to /api/multiplayer. Can specify both path and port.
+  ingress:
+    # This conditional is dependent on multiplayer.enabled.
+    enabled: true
+    paths:
+      - path: /api/multiplayer
+        port: 80
+
 codeExecutor:
   # enabled by default from Chart version 6.0.15 and Retool image 3.20.15 onwards
   # explicitly set other fields as needed