From 8c46e82459e815d0edf03bfb87ff1a6c4bc0c14b Mon Sep 17 00:00:00 2001 From: Mathew Wicks Date: Mon, 4 May 2020 17:50:27 +1000 Subject: [PATCH] [stable/airflow] allow specification of probe scheme (#22242) Signed-off-by: Mathew Wicks Signed-off-by: Miguel Mingorance --- stable/airflow/Chart.yaml | 2 +- stable/airflow/README.md | 4 +++- stable/airflow/templates/deployments-web.yaml | 2 ++ stable/airflow/values.yaml | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/stable/airflow/Chart.yaml b/stable/airflow/Chart.yaml index 581f99f4a5ab..b99d592a551b 100644 --- a/stable/airflow/Chart.yaml +++ b/stable/airflow/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Airflow is a platform to programmatically author, schedule and monitor workflows name: airflow -version: 6.8.1 +version: 6.9.0 appVersion: 1.10.4 icon: https://airflow.apache.org/_images/pin_large.png home: https://airflow.apache.org/ diff --git a/stable/airflow/README.md b/stable/airflow/README.md index 7d79dc4f4878..3b271f5b2eac 100644 --- a/stable/airflow/README.md +++ b/stable/airflow/README.md @@ -469,11 +469,13 @@ The following table lists the configurable parameters of the Airflow chart and t | `web.annotations` | annotations for the web deployment | `{}` | | `web.podAnnotations` | pod-annotations for the web deployment | `{}` | | `web.initialStartupDelay` | amount of time webserver pod should sleep before initializing webserver | `60` | -| `web.minReadySeconds` | minReadySeconds in the web deployment | `120` +| `web.minReadySeconds` | minReadySeconds in the web deployment | `120` | +| `web.livenessProbe.scheme` | scheme to use for connecting to the host (HTTP or HTTPS) | `HTTP` | | `web.livenessProbe.periodSeconds` | interval between probes | `60` | | `web.livenessProbe.timeoutSeconds` | time allowed for a result to return | `1` | | `web.livenessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful | `1` | | `web.livenessProbe.failureThreshold` | Minimum consecutive successes for the probe to be considered failed | `5` | +| `web.readinessProbe.scheme` | scheme to use for connecting to the host (HTTP or HTTPS) | `HTTP` | | `web.readinessProbe.periodSeconds` | interval between probes | `60` | | `web.readinessProbe.timeoutSeconds` | time allowed for a result to return | `1` | | `web.readinessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful | `1` | diff --git a/stable/airflow/templates/deployments-web.yaml b/stable/airflow/templates/deployments-web.yaml index 5965a19a535f..e60c8e73bc4f 100644 --- a/stable/airflow/templates/deployments-web.yaml +++ b/stable/airflow/templates/deployments-web.yaml @@ -206,6 +206,7 @@ spec: {{- end }} livenessProbe: httpGet: + scheme: {{ .Values.web.livenessProbe.scheme }} {{- if .Values.ingress.web.livenessPath }} path: "{{ .Values.ingress.web.livenessPath }}" {{- else }} @@ -221,6 +222,7 @@ spec: readinessProbe: httpGet: + scheme: {{ .Values.web.readinessProbe.scheme }} path: "{{ .Values.ingress.web.path }}/health" port: web initialDelaySeconds: {{ .Values.web.initialDelaySeconds }} diff --git a/stable/airflow/values.yaml b/stable/airflow/values.yaml index 865da3505a9f..b60ef954804e 100644 --- a/stable/airflow/values.yaml +++ b/stable/airflow/values.yaml @@ -284,11 +284,13 @@ web: initialDelaySeconds: "360" minReadySeconds: 120 readinessProbe: + scheme: HTTP periodSeconds: 60 timeoutSeconds: 1 successThreshold: 1 failureThreshold: 5 livenessProbe: + scheme: HTTP periodSeconds: 60 timeoutSeconds: 1 successThreshold: 1