From 75fe62a37f99a12dca409bdcb06b42a24b49850c Mon Sep 17 00:00:00 2001 From: John Davies-Colley Date: Tue, 2 Jul 2019 05:27:20 +1200 Subject: [PATCH] Adding liveness probe timeout variable :heavy_plus_sign: (#15146) Signed-off-by: johndaviesco --- incubator/aws-alb-ingress-controller/Chart.yaml | 2 +- incubator/aws-alb-ingress-controller/README.md | 1 + incubator/aws-alb-ingress-controller/templates/deployment.yaml | 1 + incubator/aws-alb-ingress-controller/values.yaml | 3 +++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/incubator/aws-alb-ingress-controller/Chart.yaml b/incubator/aws-alb-ingress-controller/Chart.yaml index e1a290e35e..3eb34abf64 100644 --- a/incubator/aws-alb-ingress-controller/Chart.yaml +++ b/incubator/aws-alb-ingress-controller/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: aws-alb-ingress-controller description: A Helm chart for AWS ALB Ingress Controller -version: 0.1.9 +version: 0.1.10 appVersion: "v1.1.2" engine: gotpl home: https://github.com/kubernetes-sigs/aws-alb-ingress-controller diff --git a/incubator/aws-alb-ingress-controller/README.md b/incubator/aws-alb-ingress-controller/README.md index 7fad55e5f8..3ac39182f5 100644 --- a/incubator/aws-alb-ingress-controller/README.md +++ b/incubator/aws-alb-ingress-controller/README.md @@ -58,6 +58,7 @@ The following tables lists the configurable parameters of the alb-ingress-contro | `image.pullPolicy` | controller container image pull policy | `IfNotPresent` | | `enableReadinessProbe` | enable readinessProbe on controller pod | `false` | | `enableLivenessProbe` | enable livenessProbe on controller pod | `false` | +| `livenessProbeTimeout` | How long to wait before timeout (in seconds) when checking controller liveness | 1 | | `extraEnv` | map of environment variables to be injected into the controller pod | `{}` | | `volumesMounts` | volumeMounts into the controller pod | `[]` | | `volumes` | volumes the controller pod | `[]` | diff --git a/incubator/aws-alb-ingress-controller/templates/deployment.yaml b/incubator/aws-alb-ingress-controller/templates/deployment.yaml index d4d5ef6c88..5602d00c4e 100644 --- a/incubator/aws-alb-ingress-controller/templates/deployment.yaml +++ b/incubator/aws-alb-ingress-controller/templates/deployment.yaml @@ -77,6 +77,7 @@ spec: scheme: HTTP initialDelaySeconds: {{ add .Values.livenessProbeInitialDelay .Values.readinessProbeInitialDelay }} periodSeconds: 60 + timeoutSeconds: {{ .Values.livenessProbeTimeout }} {{- end }} resources: {{ toYaml .Values.resources | indent 12 }} diff --git a/incubator/aws-alb-ingress-controller/values.yaml b/incubator/aws-alb-ingress-controller/values.yaml index d7573b8c69..df2b0855c6 100644 --- a/incubator/aws-alb-ingress-controller/values.yaml +++ b/incubator/aws-alb-ingress-controller/values.yaml @@ -63,6 +63,9 @@ enableLivenessProbe: false # How long to wait (in seconds) before checking the liveness probe livenessProbeInitialDelay: 30 +# How long to wait before timeout (in seconds) when checking controller liveness +livenessProbeTimeout: 1 + rbac: ## If true, create & use RBAC resources ##