mirror of
https://github.com/helm/charts.git
synced 2026-08-23 22:37:45 +00:00
Revert "[[stable/nginx-ingress] Add optional controller.defaultSSLCer… (#1610)
* Revert "[[stable/nginx-ingress] Add optional controller.defaultSSLCertificate configuration value (#1522)"
This reverts commit 04b54b4d43.
* [stable/nginx-ingress] Bump chart version
This commit is contained in:
committed by
Michael Goodness
parent
a2c1129f31
commit
c7c5c82d00
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 }}
|
||||
|
||||
@@ -20,11 +20,6 @@ controller:
|
||||
##
|
||||
defaultBackendService: ""
|
||||
|
||||
## Optionally specify the secret name for default SSL certificate
|
||||
## Must be <namespace>/<secret_name>
|
||||
##
|
||||
defaultSSLCertificate: ""
|
||||
|
||||
## Allows customization of the external service
|
||||
## the ingress will be bound to via DNS
|
||||
publishService:
|
||||
|
||||
Reference in New Issue
Block a user