From 4564a083978b4ad50f45c6267bb0c0ede3bd37cf Mon Sep 17 00:00:00 2001 From: Peter Bos Date: Mon, 4 Feb 2019 21:39:54 +0100 Subject: [PATCH] [stable_nginx-ingress] healthz endpoint as hostport (#10612) Signed-off-by: peter.bos Signed-off-by: peter bos --- stable/nginx-ingress/Chart.yaml | 2 +- stable/nginx-ingress/README.md | 1 + stable/nginx-ingress/templates/controller-daemonset.yaml | 3 +++ stable/nginx-ingress/values.yaml | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml index 8eda402b43..871e012967 100644 --- a/stable/nginx-ingress/Chart.yaml +++ b/stable/nginx-ingress/Chart.yaml @@ -1,5 +1,5 @@ name: nginx-ingress -version: 1.2.3 +version: 1.3.0 appVersion: 0.22.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/README.md b/stable/nginx-ingress/README.md index f7c763b572..11be03a692 100644 --- a/stable/nginx-ingress/README.md +++ b/stable/nginx-ingress/README.md @@ -68,6 +68,7 @@ Parameter | Description | Default `controller.daemonset.useHostPort` | If `controller.kind` is `DaemonSet`, this will enable `hostPort` for TCP/80 and TCP/443 | false `controller.daemonset.hostPorts.http` | If `controller.daemonset.useHostPort` is `true` and this is non-empty, it sets the hostPort | `"80"` `controller.daemonset.hostPorts.https` | If `controller.daemonset.useHostPort` is `true` and this is non-empty, it sets the hostPort | `"443"` +`controller.daemonset.hostPorts.stats` | If `controller.daemonset.useHostPort` is `true` and this is non-empty, it sets the hostPort | `"18080"` `controller.tolerations` | node taints to tolerate (requires Kubernetes >=1.6) | `[]` `controller.affinity` | node/pod affinities (requires Kubernetes >=1.6) | `{}` `controller.minReadySeconds` | how many seconds a pod needs to be ready before killing the next, during update | `0` diff --git a/stable/nginx-ingress/templates/controller-daemonset.yaml b/stable/nginx-ingress/templates/controller-daemonset.yaml index f4c0223f0a..a05062edf8 100644 --- a/stable/nginx-ingress/templates/controller-daemonset.yaml +++ b/stable/nginx-ingress/templates/controller-daemonset.yaml @@ -125,6 +125,9 @@ spec: - name: stats containerPort: 18080 protocol: TCP + {{- if .Values.controller.daemonset.useHostPort }} + hostPort: {{ .Values.controller.daemonset.hostPorts.stats }} + {{- end }} {{- if .Values.controller.metrics.enabled }} - name: metrics containerPort: 10254 diff --git a/stable/nginx-ingress/values.yaml b/stable/nginx-ingress/values.yaml index 0886b06881..90da17387f 100644 --- a/stable/nginx-ingress/values.yaml +++ b/stable/nginx-ingress/values.yaml @@ -31,6 +31,8 @@ controller: hostPorts: http: 80 https: 443 + ## healthz endpoint + stats: 18080 ## Required only if defaultBackend.enabled = false ## Must be /