Update ingress config to align with zj2h config format

2i2c-org · May 22, 2024 · 263a589 · 263a589
1 parent 8e1762c
commit 263a589
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 29 deletions.
diff --git a/binderhub-service/templates/ingress.yaml b/binderhub-service/templates/ingress.yaml
@@ -10,32 +10,26 @@ metadata:
     {{- . | toYaml | nindent 4 }}
   {{- end }}
 spec:
-  {{- with .Values.ingress.className }}
-  ingressClassName: {{ . }}
-  {{- end }}
-  {{- with .Values.ingress.tls }}
-  tls:
-    {{- range . }}
-    - hosts:
-        {{- .hosts | toYaml | nindent 8 }}
-      secretName: {{ .secretName }}
-    {{- end }}
+  {{- with .Values.ingress.ingressClassName }}
+  ingressClassName: "{{ . }}"
   {{- end }}
   rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
+    {{- range $host := .Values.ingress.hosts | default (list "") }}
+    - http:
         paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            {{- with .pathType }}
-            pathType: {{ . }}
-            {{- end }}
+          - path: {{ $.Values.config.BinderHub.base_url | trimSuffix "/" }}/{{ $.Values.ingress.pathSuffix }}
+            pathType: {{ $.Values.ingress.pathType }}
             backend:
               service:
                 name: {{ include "binderhub-service.fullname" $ }}
                 port:
-                  number: {{ $.Values.service.port }}
-          {{- end }}
+                  name: http
+      {{- if $host }}
+      host: {{ $host | quote }}
+      {{- end }}
     {{- end }}
+  {{- with .Values.ingress.tls }}
+  tls:
+    {{- . | toYaml | nindent 4 }}
+  {{- end }}
 {{- end }}
diff --git a/binderhub-service/values.schema.yaml b/binderhub-service/values.schema.yaml
@@ -178,7 +178,8 @@ properties:
     properties:
       enabled:
         type: boolean
-      className:
+      annotations: *labels-and-annotations
+      ingressClassName:
         type: [string, "null"]
       hosts:
         type: array
@@ -188,7 +189,6 @@ properties:
         enum: [Prefix, Exact, ImplementationSpecific]
       tls:
         type: array
-      annotations: *labels-and-annotations
 
   # DaemonSet resource - docker-api
   # ---------------------------------------------------------------------------

diff --git a/binderhub-service/values.yaml b/binderhub-service/values.yaml
@@ -99,13 +99,11 @@ service:
 #
 ingress:
   enabled: false
-  className: ""
   annotations: {}
-  hosts:
-    - host: chart-example.local
-      paths:
-        - path: /
-          pathType: ImplementationSpecific
+  ingressClassName:
+  hosts: []
+  pathSuffix:
+  pathType: Prefix
   tls: []
 
 # DaemonSet resource - docker-api

diff --git a/tools/templates/lint-and-validate-values.yaml b/tools/templates/lint-and-validate-values.yaml
@@ -49,7 +49,18 @@ service:
 # -----------------------------------------------------------------------------
 #
 ingress:
-  enabled: false
+  enabled: true
+  ingressClassName: mock-ingress-class-name
+  hosts:
+    - mocked1.domain.name
+    - mocked2.domain.name
+  pathSuffix: dummy-pathSuffix
+  pathType: ImplementationSpecific
+  tls:
+    - secretName: tls
+      hosts:
+        - mocked1.domain.name
+        - mocked2.domain.name
 
 # DaemonSet resource - docker-api
 # -----------------------------------------------------------------------------