From 3018cc5930a429af0baf9326688fa2a89f204c3b Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Tue, 16 Jan 2024 16:10:03 -0800 Subject: [PATCH] Remove antiquated kube-lego references [kube-lego](https://github.com/jetstack/kube-lego) was the precursor to cert-manager, and has been dead for years and years now --- helm-chart/binderhub/schema.yaml | 4 ---- helm-chart/binderhub/templates/ingress.yaml | 15 ++------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/helm-chart/binderhub/schema.yaml b/helm-chart/binderhub/schema.yaml index 5b80985fc..5db6f22bd 100644 --- a/helm-chart/binderhub/schema.yaml +++ b/helm-chart/binderhub/schema.yaml @@ -519,10 +519,6 @@ properties: type: boolean description: | TODO - type: - type: string - description: | - TODO annotations: type: object additionalProperties: false diff --git a/helm-chart/binderhub/templates/ingress.yaml b/helm-chart/binderhub/templates/ingress.yaml index f8511e831..1fb5564b4 100644 --- a/helm-chart/binderhub/templates/ingress.yaml +++ b/helm-chart/binderhub/templates/ingress.yaml @@ -3,12 +3,8 @@ 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 }} @@ -31,14 +27,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: