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

Remove ingress.https with unused kube-lego references, rely on ingress.tls and ingress.annotations #1813

Closed
wants to merge 5 commits into from
Closed

Remove ingress.https with unused kube-lego references, rely on ingress.tls and ingress.annotations #1813

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3018cc5
Remove antiquated kube-lego references
yuvipanda Jan 17, 2024
4c94bf3
Apply suggestions from code review
consideRatio Jan 17, 2024
9497441
Remove ingress.https from schema, as its tied to kube-lego
consideRatio Jan 17, 2024
59260ac
Simplify ingress template by making tls config passthrough
consideRatio Jan 17, 2024
a2ac6d7
Add breaking change note
consideRatio Jan 17, 2024
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
14 changes: 0 additions & 14 deletions helm-chart/binderhub/schema.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,20 +509,6 @@ properties:
description: |
Enable the creation of a Kubernetes Ingress referencing incoming
network network traffic to the binder k8s Service.
https:
type: object
additionalProperties: false
description: |
TODO
properties:
enabled:
type: boolean
description: |
TODO
type:
type: string
description: |
TODO
annotations:
type: object
additionalProperties: false
Expand Down
16 changes: 2 additions & 14 deletions helm-chart/binderhub/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,9 @@ apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: binderhub
{{- if or (and .Values.ingress.https.enabled (eq .Values.ingress.https.type "kube-lego")) .Values.ingress.annotations }}
{{- with .Values.ingress.annotations }}
annotations:
{{- if and .Values.ingress.https.enabled (eq .Values.ingress.https.type "kube-lego") }}
kubernetes.io/tls-acme: "true"
{{- end }}
{{- with .Values.ingress.annotations }}
{{- . | toYaml | nindent 4 }}
{{- end }}
{{- end }}
spec:
{{- with .Values.ingress.ingressClassName }}
Expand All @@ -31,14 +26,7 @@ spec:
host: {{ . | quote }}
{{- end }}
{{- end }}
{{- if and .Values.ingress.https.enabled (eq .Values.ingress.https.type "kube-lego") }}
tls:
- secretName: kubelego-tls-binder-{{ .Release.Name }}
hosts:
{{- range .Values.ingress.hosts }}
- {{ . | quote }}
{{- end }}
{{- else if .Values.ingress.tls }}
{{- if .Values.ingress.tls }}
tls:
{{- range .Values.ingress.tls }}
- hosts:
Expand Down
3 changes: 0 additions & 3 deletions helm-chart/binderhub/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,9 +327,6 @@ imageCleaner:

ingress:
enabled: false
https:
enabled: false
type: kube-lego
hosts: []
ingressClassName:
annotations:
Expand Down
3 changes: 0 additions & 3 deletions tools/templates/lint-and-validate-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,6 @@ imageCleaner:

ingress:
enabled: true
https:
enabled: false
type: kube-lego
hosts: [domain.com]
annotations: *annotations
ingressClassName: mock-ingress-class-name
Expand Down