From c0d8063d98453c2e8b49f59e18555fa07efd29cd Mon Sep 17 00:00:00 2001 From: miraai Date: Tue, 13 Jun 2023 11:33:54 +0200 Subject: [PATCH 1/3] Add rasa readiness probe and configurable path --- charts/rasa-x/Chart.yaml | 2 +- charts/rasa-x/templates/rasa-deployments.yaml | 11 ++++++++++- charts/rasa-x/templates/rasa-x-deployment.yaml | 4 ++-- charts/rasa-x/values.yaml | 14 ++++++++++++++ 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/charts/rasa-x/Chart.yaml b/charts/rasa-x/Chart.yaml index 9d558e0e..d5053838 100644 --- a/charts/rasa-x/Chart.yaml +++ b/charts/rasa-x/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v2 -version: "4.5.18" +version: "4.5.19" appVersion: "1.2.2" diff --git a/charts/rasa-x/templates/rasa-deployments.yaml b/charts/rasa-x/templates/rasa-deployments.yaml index 6c872932..8b903c7f 100644 --- a/charts/rasa-x/templates/rasa-deployments.yaml +++ b/charts/rasa-x/templates/rasa-deployments.yaml @@ -59,7 +59,16 @@ spec: {{- if or $.Values.rasa.livenessProbe.enabled (not (hasKey $.Values.rasa.livenessProbe "enabled")) }} livenessProbe: httpGet: - path: "/" + path: {{ $.Values.rasa.livenessProbe.path }} + port: "http" + scheme: {{ default "HTTP" $.Values.rasa.livenessProbe.scheme }} + initialDelaySeconds: {{ $.Values.rasa.livenessProbe.initialProbeDelay }} + failureThreshold: 10 + {{- end }} + {{- if or $.Values.rasa.readinessProbe.enabled (not (hasKey $.Values.rasa.readinessProbe "enabled")) }} + readinessProbe: + httpGet: + path: {{ $.Values.rasa.readinessProbe.path }} port: "http" scheme: {{ default "HTTP" $.Values.rasa.livenessProbe.scheme }} initialDelaySeconds: {{ $.Values.rasa.livenessProbe.initialProbeDelay }} diff --git a/charts/rasa-x/templates/rasa-x-deployment.yaml b/charts/rasa-x/templates/rasa-x-deployment.yaml index 82c1fb01..6e54b1ef 100644 --- a/charts/rasa-x/templates/rasa-x-deployment.yaml +++ b/charts/rasa-x/templates/rasa-x-deployment.yaml @@ -69,7 +69,7 @@ spec: {{- if or .Values.rasax.livenessProbe.enabled (not (hasKey .Values.rasax.livenessProbe "enabled")) }} livenessProbe: httpGet: - path: "/" + path: {{ .Values.rasax.livenessProbe.path }} port: "http" scheme: {{ default "HTTP" .Values.rasax.livenessProbe.scheme }} initialDelaySeconds: {{ .Values.rasax.livenessProbe.initialProbeDelay }} @@ -78,7 +78,7 @@ spec: {{- if or .Values.rasax.readinessProbe.enabled (not (hasKey .Values.rasax.readinessProbe "enabled")) }} readinessProbe: httpGet: - path: "/" + path: {{ .Values.rasax.readinessProbe.path }} port: "http" scheme: {{ default "HTTP" .Values.rasax.readinessProbe.scheme }} initialDelaySeconds: {{ .Values.rasax.readinessProbe.initialProbeDelay }} diff --git a/charts/rasa-x/values.yaml b/charts/rasa-x/values.yaml index 3153de82..358d007e 100644 --- a/charts/rasa-x/values.yaml +++ b/charts/rasa-x/values.yaml @@ -54,6 +54,8 @@ rasax: # livenessProbe checks whether Rasa Enterprise needs to be restarted livenessProbe: enabled: true + # liveness probe path + path: "/" # initialProbeDelay for the `livenessProbe` initialProbeDelay: 10 # scheme to be used by the `livenessProbe` @@ -61,6 +63,8 @@ rasax: # readinessProbe checks whether rasa Enterprise can receive traffic readinessProbe: enabled: true + # readiness probe path + path: "/" # initialProbeDelay for the `readinessProbe` initialProbeDelay: 10 # scheme to be used by the `readinessProbe` @@ -183,10 +187,20 @@ rasa: jaegerSidecar: "false" livenessProbe: enabled: true + # liveness probe path + path: "/" # initialProbeDelay for the `livenessProbe` initialProbeDelay: 10 # scheme to be used by the `livenessProbe` scheme: "HTTP" + readinessProbe: + enabled: true + # readiness probe path + path: "/" + # initialProbeDelay for the `readinessProbe` + initialProbeDelay: 10 + # scheme to be used by the `readinessProbe` + scheme: "HTTP" # useLoginDatabase will use the Rasa Enterprise database to log in and create the database # for the tracker store. If `false` the tracker store database must have been created # previously. From fe53a85ea503e9e7cc8f9011fcc53ff032e216e7 Mon Sep 17 00:00:00 2001 From: miraai Date: Thu, 15 Jun 2023 16:45:32 +0200 Subject: [PATCH 2/3] Add default /status for liveness probe --- charts/rasa-x/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rasa-x/values.yaml b/charts/rasa-x/values.yaml index 358d007e..9e308edb 100644 --- a/charts/rasa-x/values.yaml +++ b/charts/rasa-x/values.yaml @@ -188,7 +188,7 @@ rasa: livenessProbe: enabled: true # liveness probe path - path: "/" + path: "/status" # initialProbeDelay for the `livenessProbe` initialProbeDelay: 10 # scheme to be used by the `livenessProbe` From a3ab7c8523ea2d4a3d8fc08a05b34540d208d35b Mon Sep 17 00:00:00 2001 From: miraai Date: Tue, 20 Jun 2023 11:12:10 +0200 Subject: [PATCH 3/3] Revert changes to liveness probe path for rasa --- charts/rasa-x/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rasa-x/values.yaml b/charts/rasa-x/values.yaml index 9e308edb..358d007e 100644 --- a/charts/rasa-x/values.yaml +++ b/charts/rasa-x/values.yaml @@ -188,7 +188,7 @@ rasa: livenessProbe: enabled: true # liveness probe path - path: "/status" + path: "/" # initialProbeDelay for the `livenessProbe` initialProbeDelay: 10 # scheme to be used by the `livenessProbe`