diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml index 011579b76e..2b069bb364 100755 --- a/stable/nginx-ingress/Chart.yaml +++ b/stable/nginx-ingress/Chart.yaml @@ -1,5 +1,5 @@ name: nginx-ingress -version: 0.19.1 +version: 0.19.2 appVersion: 0.14.0 home: https://github.com/kubernetes/ingress-nginx description: An nginx Ingress controller that uses ConfigMap to store the nginx configuration. diff --git a/stable/nginx-ingress/templates/controller-service.yaml b/stable/nginx-ingress/templates/controller-service.yaml index 09b620fea4..a980c27806 100644 --- a/stable/nginx-ingress/templates/controller-service.yaml +++ b/stable/nginx-ingress/templates/controller-service.yaml @@ -53,13 +53,13 @@ spec: - name: "{{ $key }}-tcp" port: {{ $key }} protocol: TCP - targetPort: {{ $key }} + targetPort: "{{ $key }}-tcp" {{- end }} {{- range $key, $value := .Values.udp }} - name: "{{ $key }}-udp" port: {{ $key }} protocol: UDP - targetPort: {{ $key }} + targetPort: "{{ $key }}-udp" {{- end }} selector: app: {{ template "nginx-ingress.name" . }} diff --git a/stable/nginx-ingress/templates/controller-stats-service.yaml b/stable/nginx-ingress/templates/controller-stats-service.yaml index 37486ac8b1..cfa19220e6 100644 --- a/stable/nginx-ingress/templates/controller-stats-service.yaml +++ b/stable/nginx-ingress/templates/controller-stats-service.yaml @@ -29,7 +29,7 @@ spec: ports: - name: stats port: {{ .Values.controller.stats.service.servicePort }} - targetPort: 18080 + targetPort: stats selector: app: {{ template "nginx-ingress.name" . }} component: "{{ .Values.controller.name }}" diff --git a/stable/nginx-ingress/templates/default-backend-deployment.yaml b/stable/nginx-ingress/templates/default-backend-deployment.yaml index 773c6325f6..ed7d70e066 100644 --- a/stable/nginx-ingress/templates/default-backend-deployment.yaml +++ b/stable/nginx-ingress/templates/default-backend-deployment.yaml @@ -50,7 +50,8 @@ spec: initialDelaySeconds: 30 timeoutSeconds: 5 ports: - - containerPort: 8080 + - name: http + containerPort: 8080 protocol: TCP resources: {{ toYaml .Values.defaultBackend.resources | indent 12 }} diff --git a/stable/nginx-ingress/templates/default-backend-service.yaml b/stable/nginx-ingress/templates/default-backend-service.yaml index aea23c31c4..8508ef0597 100644 --- a/stable/nginx-ingress/templates/default-backend-service.yaml +++ b/stable/nginx-ingress/templates/default-backend-service.yaml @@ -27,8 +27,10 @@ spec: {{ toYaml .Values.defaultBackend.service.loadBalancerSourceRanges | indent 4 }} {{- end }} ports: - - port: {{ .Values.defaultBackend.service.servicePort }} - targetPort: 8080 + - name: http + port: {{ .Values.defaultBackend.service.servicePort }} + protocol: TCP + targetPort: http selector: app: {{ template "nginx-ingress.name" . }} component: "{{ .Values.defaultBackend.name }}" diff --git a/stable/nginx-ingress/values.yaml b/stable/nginx-ingress/values.yaml index 128f950f7e..53504d1a58 100755 --- a/stable/nginx-ingress/values.yaml +++ b/stable/nginx-ingress/values.yaml @@ -171,8 +171,8 @@ controller: healthCheckNodePort: 0 targetPorts: - http: 80 - https: 443 + http: http + https: https type: LoadBalancer