feat: paste extraPaths entire content instead of reparsing the whole …

…thing
jupyterhub · Sep 9, 2024 · 0a0362c · 0a0362c
1 parent 75c1ae7
commit 0a0362c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/jupyterhub/templates/ingress.yaml b/jupyterhub/templates/ingress.yaml
@@ -24,19 +24,9 @@ spec:
                 name: {{ include "jupyterhub.proxy-public.fullname" $ }}
                 port:
                   name: http
-          {{- range $path := $.Values.ingress.extraPaths }}
-          - path: {{ $path.path }}
-            pathType: {{ $path.pathType }}
-            backend:
-              service:
-                name: {{ $path.backend.service.name }}
-                port:
-                  {{- if $path.backend.service.port.number }}
-                  number: {{ $path.backend.service.port.number }}
-                  {{- else if $path.backend.service.port.name }}
-                  name: {{ $path.backend.service.port.name }}
-                  {{- end }}
-          {{- end }}
+          {{- with $.Values.ingress.extraPaths }}  
+          {{- . | toYaml | nindent 10 }}  
+          {{- end }}  
       {{- if $host }}
       host: {{ $host | quote }}
       {{- end }}

diff --git a/tools/templates/lint-and-validate-values.yaml b/tools/templates/lint-and-validate-values.yaml
@@ -574,6 +574,21 @@ ingress:
     - mocked2.domain.name
   pathSuffix: dummy-pathSuffix
   pathType: ImplementationSpecific
+  extraPaths:
+    - pathType: Prefix
+      path: "/foo"
+      backend:
+        service:
+          name: foo
+          port:
+            number: 80
+    - pathType: Prefix
+      path: "/bar"
+      backend:
+        service:
+          name: bar
+          port:
+            name: barPort
   tls:
     - secretName: jupyterhub-tls
       hosts: