From a4e7d7b40d2f9f6be820be1c1658d63ffa23f905 Mon Sep 17 00:00:00 2001 From: Alex Harder <13860012+ChiefAlexander@users.noreply.github.com> Date: Wed, 15 May 2019 14:30:27 -0500 Subject: [PATCH] Make nginx controller container ports configurable (#13096) * Make nginx controller container ports configurable Signed-off-by: ChiefAlexander * Bump chart version Signed-off-by: ChiefAlexander * Bump version Signed-off-by: ChiefAlexander * bump version Signed-off-by: ChiefAlexander --- stable/nginx-ingress/Chart.yaml | 2 +- stable/nginx-ingress/README.md | 2 ++ stable/nginx-ingress/templates/controller-daemonset.yaml | 4 ++-- stable/nginx-ingress/templates/controller-deployment.yaml | 4 ++-- stable/nginx-ingress/values.yaml | 5 +++++ 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml index 3340ca812ce8..e8032e76a8e5 100644 --- a/stable/nginx-ingress/Chart.yaml +++ b/stable/nginx-ingress/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: nginx-ingress -version: 1.6.2 +version: 1.6.3 appVersion: 0.24.1 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/README.md b/stable/nginx-ingress/README.md index 491b80356f49..16c51d185bb3 100644 --- a/stable/nginx-ingress/README.md +++ b/stable/nginx-ingress/README.md @@ -50,6 +50,8 @@ Parameter | Description | Default `controller.image.tag` | controller container image tag | `0.24.1` `controller.image.pullPolicy` | controller container image pull policy | `IfNotPresent` `controller.image.runAsUser` | User ID of the controller process. Value depends on the Linux distribution used inside of the container image. By default uses debian one. | `33` +`controller.containerPort.http` | The port that the controller container listens on for http connections. | `80` +`controller.containerPort.https` | The port that the controller container listens on for https connections. | `443` `controller.config` | nginx ConfigMap entries | none `controller.hostNetwork` | If the nginx deployment / daemonset should run on the host's network namespace. Do not set this when `controller.service.externalIPs` is set and `kube-proxy` is used as there will be a port-conflict for port `80` | false `controller.defaultBackendService` | default 404 backend service; required only if `defaultBackend.enabled = false` | `""` diff --git a/stable/nginx-ingress/templates/controller-daemonset.yaml b/stable/nginx-ingress/templates/controller-daemonset.yaml index a05062edf8bd..2de3f8aeb598 100644 --- a/stable/nginx-ingress/templates/controller-daemonset.yaml +++ b/stable/nginx-ingress/templates/controller-daemonset.yaml @@ -110,13 +110,13 @@ spec: failureThreshold: {{ .Values.controller.livenessProbe.failureThreshold }} ports: - name: http - containerPort: 80 + containerPort: {{ .Values.controller.containerPort.http }} protocol: TCP {{- if .Values.controller.daemonset.useHostPort }} hostPort: {{ .Values.controller.daemonset.hostPorts.http }} {{- end }} - name: https - containerPort: 443 + containerPort: {{ .Values.controller.containerPort.https }} protocol: TCP {{- if .Values.controller.daemonset.useHostPort }} hostPort: {{ .Values.controller.daemonset.hostPorts.https }} diff --git a/stable/nginx-ingress/templates/controller-deployment.yaml b/stable/nginx-ingress/templates/controller-deployment.yaml index 7d78507d33a2..164c5b6b80a0 100644 --- a/stable/nginx-ingress/templates/controller-deployment.yaml +++ b/stable/nginx-ingress/templates/controller-deployment.yaml @@ -113,10 +113,10 @@ spec: failureThreshold: {{ .Values.controller.livenessProbe.failureThreshold }} ports: - name: http - containerPort: 80 + containerPort: {{ .Values.controller.containerPort.http }} protocol: TCP - name: https - containerPort: 443 + containerPort: {{ .Values.controller.containerPort.https }} protocol: TCP {{- if .Values.controller.stats.enabled }} - name: stats diff --git a/stable/nginx-ingress/values.yaml b/stable/nginx-ingress/values.yaml index be03fa309faf..8969ef2b5555 100644 --- a/stable/nginx-ingress/values.yaml +++ b/stable/nginx-ingress/values.yaml @@ -10,6 +10,11 @@ controller: # www-data -> uid 33 runAsUser: 33 + # Configures the ports the nginx-controller listens on + containerPort: + http: 80 + https: 443 + config: {} # Will add custom header to Nginx https://github.com/kubernetes/ingress-nginx/tree/master/docs/examples/customization/custom-headers headers: {}