From 0dc89ac2840c2db3ccd18db0681cc5e8fc7c3f22 Mon Sep 17 00:00:00 2001 From: Bill McMath Date: Thu, 29 Mar 2018 21:45:03 +0100 Subject: [PATCH] Changed the liveness and readiness probe to have configurable port numbers (#4478) * Changed the liveness and readiness probe to have configurable port numbers * Corrected the variable path * Updated the chart version to 0.11.4 * Added home * Bumping minor version to 0.12.0 --- stable/nginx-ingress/Chart.yaml | 3 ++- 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 | 2 ++ 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml index 57f39f452f..78999fb969 100755 --- a/stable/nginx-ingress/Chart.yaml +++ b/stable/nginx-ingress/Chart.yaml @@ -1,5 +1,5 @@ name: nginx-ingress -version: 0.11.3 +version: 0.12.0 appVersion: 0.11.0 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 @@ -8,6 +8,7 @@ keywords: - nginx sources: - https://github.com/kubernetes/ingress-nginx +home: https://nginx.org/en/ maintainers: - name: jackzampolin email: jack.zampolin@gmail.com diff --git a/stable/nginx-ingress/README.md b/stable/nginx-ingress/README.md index 743af6b85d..4d02a8a188 100644 --- a/stable/nginx-ingress/README.md +++ b/stable/nginx-ingress/README.md @@ -87,11 +87,13 @@ Parameter | Description | Default `controller.livenessProbe.timeoutSeconds` | When the probe times out | 5 `controller.livenessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed. | 1 `controller.livenessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. | 3 +`controller.livenessProbe.port` | The port number that the liveness probe will listen on. | 10254 `controller.readinessProbe.initialDelaySeconds` | Delay before readiness probe is initiated | 10 `controller.readinessProbe.periodSeconds` | How often to perform the probe | 10 `controller.readinessProbe.timeoutSeconds` | When the probe times out | 1 `controller.readinessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed. | 1 `controller.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. | 3 +`controller.readinessProbe.port` | The port number that the readiness probe will listen on. | 10254 `controller.stats.enabled` | if `true`, enable "vts-status" page | `false` `controller.stats.service.annotations` | annotations for controller stats service | `{}` `controller.stats.service.clusterIP` | internal controller stats cluster service IP | `""` diff --git a/stable/nginx-ingress/templates/controller-daemonset.yaml b/stable/nginx-ingress/templates/controller-daemonset.yaml index e0c2c2c858..370ddbbfe3 100644 --- a/stable/nginx-ingress/templates/controller-daemonset.yaml +++ b/stable/nginx-ingress/templates/controller-daemonset.yaml @@ -87,7 +87,7 @@ spec: livenessProbe: httpGet: path: /healthz - port: 10254 + port: {{ .Values.controller.livenessProbe.port }} scheme: HTTP initialDelaySeconds: {{ .Values.controller.livenessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.controller.livenessProbe.periodSeconds }} @@ -130,7 +130,7 @@ spec: readinessProbe: httpGet: path: /healthz - port: 10254 + port: {{ .Values.controller.readinessProbe.port }} scheme: HTTP initialDelaySeconds: {{ .Values.controller.readinessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.controller.readinessProbe.periodSeconds }} diff --git a/stable/nginx-ingress/templates/controller-deployment.yaml b/stable/nginx-ingress/templates/controller-deployment.yaml index 90194dd18a..8bc5537f21 100644 --- a/stable/nginx-ingress/templates/controller-deployment.yaml +++ b/stable/nginx-ingress/templates/controller-deployment.yaml @@ -88,7 +88,7 @@ spec: livenessProbe: httpGet: path: /healthz - port: 10254 + port: {{ .Values.controller.livenessProbe.port }} scheme: HTTP initialDelaySeconds: {{ .Values.controller.livenessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.controller.livenessProbe.periodSeconds }} @@ -125,7 +125,7 @@ spec: readinessProbe: httpGet: path: /healthz - port: 10254 + port: {{ .Values.controller.readinessProbe.port }} scheme: HTTP initialDelaySeconds: {{ .Values.controller.readinessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.controller.readinessProbe.periodSeconds }} diff --git a/stable/nginx-ingress/values.yaml b/stable/nginx-ingress/values.yaml index 436659a222..a75109c174 100644 --- a/stable/nginx-ingress/values.yaml +++ b/stable/nginx-ingress/values.yaml @@ -109,12 +109,14 @@ controller: periodSeconds: 10 successThreshold: 1 timeoutSeconds: 1 + port: 10254 readinessProbe: failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 10 successThreshold: 1 timeoutSeconds: 1 + port: 10254 ## Annotations to be added to controller pods ##