From c7c5c82d0084c996311ee63ccff200b502f03428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reinhard=20N=C3=A4gele?= Date: Thu, 3 Aug 2017 17:35:40 +0200 Subject: [PATCH] =?UTF-8?q?Revert=20"[[stable/nginx-ingress]=20Add=20optio?= =?UTF-8?q?nal=20controller.defaultSSLCer=E2=80=A6=20(#1610)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Revert "[[stable/nginx-ingress] Add optional controller.defaultSSLCertificate configuration value (#1522)" This reverts commit 04b54b4d43f95b62db6a510fe1ab6e16a12a8b07. * [stable/nginx-ingress] Bump chart version --- stable/nginx-ingress/Chart.yaml | 2 +- stable/nginx-ingress/templates/NOTES.txt | 1 - stable/nginx-ingress/templates/controller-deployment.yaml | 3 --- stable/nginx-ingress/values.yaml | 5 ----- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml index b0e8aa12c7..02f8681ae4 100755 --- a/stable/nginx-ingress/Chart.yaml +++ b/stable/nginx-ingress/Chart.yaml @@ -1,5 +1,5 @@ name: nginx-ingress -version: 0.7.0 +version: 0.7.1 appVersion: 0.9.0-beta.7 description: An nginx Ingress controller that uses ConfigMap to store the nginx configuration. icon: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c5/Nginx_logo.svg/500px-Nginx_logo.svg.png diff --git a/stable/nginx-ingress/templates/NOTES.txt b/stable/nginx-ingress/templates/NOTES.txt index 2ef1a8b599..81efaa586b 100644 --- a/stable/nginx-ingress/templates/NOTES.txt +++ b/stable/nginx-ingress/templates/NOTES.txt @@ -46,7 +46,6 @@ An example Ingress that makes use of the controller: servicePort: 80 path: / # This section is only required if TLS is to be enabled for the Ingress - # secretName can be omitted if you have specified controller.defaultSSLCertificate tls: - hosts: - www.example.com diff --git a/stable/nginx-ingress/templates/controller-deployment.yaml b/stable/nginx-ingress/templates/controller-deployment.yaml index 4eb7bdbb23..233a639cdd 100644 --- a/stable/nginx-ingress/templates/controller-deployment.yaml +++ b/stable/nginx-ingress/templates/controller-deployment.yaml @@ -33,9 +33,6 @@ spec: args: - /nginx-ingress-controller - --default-backend-service={{ if .Values.defaultBackend.enabled }}{{ .Release.Namespace }}/{{ template "defaultBackend.fullname" . }}{{ else }}{{ .Values.controller.defaultBackendService }}{{ end }} - {{- if .Values.controller.defaultSSLCertificate }} - - --default-ssl-certificate={{ .Values.controller.defaultSSLCertificate }} - {{- end }} {{- if and (contains "0.9" .Values.controller.image.tag) .Values.controller.publishService.enabled }} - --publish-service={{ template "controller.publishServicePath" . }} {{- end }} diff --git a/stable/nginx-ingress/values.yaml b/stable/nginx-ingress/values.yaml index dffec6a875..e1945743bc 100644 --- a/stable/nginx-ingress/values.yaml +++ b/stable/nginx-ingress/values.yaml @@ -20,11 +20,6 @@ controller: ## defaultBackendService: "" - ## Optionally specify the secret name for default SSL certificate - ## Must be / - ## - defaultSSLCertificate: "" - ## Allows customization of the external service ## the ingress will be bound to via DNS publishService: