Merge pull request jupyterhub#67 from jupyterhub/revert-54-manual-tls

Revert "Allow setting up TLS manually"
yuvipanda · Sep 6, 2017 · 0fd5ac7 · 0fd5ac7
2 parents b2fb7a6 + 3418cf8
commit 0fd5ac7
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/jupyterhub/templates/ingress.yaml b/jupyterhub/templates/ingress.yaml
@@ -21,16 +21,10 @@ spec:
               serviceName: proxy-public
               servicePort: 80
       host: {{ .Values.ingress.host }}
-{{- if .Values.ingress.https.enabled }}
-{{- if eq .Values.ingress.https.type "kube-lego" }}
+{{- if and .Values.ingress.https.enabled (eq .Values.ingress.https.type "kube-lego") }}
   tls:
     - secretName: kubelego-tls-proxy-{{ .Release.Name }}
       hosts:
         - {{ .Values.ingress.host }}
-{{- else if eq .Values.ingress.https.type "manual" }}
-  tls:
-    - secretName: manual-tls-proxy-{{ .Release.Name }}
-      hosts:
-        - {{ .Values.ingress.host }}
 {{- end }}
 {{- end -}}