Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

helm-chart: fix inability to omit ingress.hosts, make it optional #1411

Merged
merged 1 commit into from
Oct 10, 2021
Merged

helm-chart: fix inability to omit ingress.hosts, make it optional #1411

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions helm-chart/binderhub/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@ spec:
ingressClassName: "{{ . }}"
{{- end }}
rules:
{{- range .Values.ingress.hosts }}
- host: {{ . }}
http:
{{- range $host := .Values.ingress.hosts | default (list "") }}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By providing a default list with a single element containing a blank string, this loop will always yeild one rule - and when it does the host field will not be set.

- http:
paths:
- path: /{{ $.Values.ingress.pathSuffix }}
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
Expand All @@ -38,6 +37,9 @@ spec:
serviceName: binder
servicePort: 80
{{- end }}
{{- if $host }}
host: {{ $host | quote }}
{{- end }}
{{- end }}
{{- if and .Values.ingress.https.enabled (eq .Values.ingress.https.type "kube-lego") }}
tls:
Expand Down