From 45e4c3e52291df19c76dfb8eb96aad76680e7526 Mon Sep 17 00:00:00 2001
From: Nicolas JENDROWIAK <nico.jendrowiak@gmail.com>
Date: Wed, 27 Sep 2023 15:45:00 +0200
Subject: [PATCH] Fixed director readiness probe failing

Readiness probe was failing when using BASE_PATH  env
---
 charts/sorry-cypress/Chart.yaml                        | 2 +-
 charts/sorry-cypress/changelog.md                      | 3 +++
 charts/sorry-cypress/templates/deployment-director.yml | 4 +++-
 charts/sorry-cypress/values.yaml                       | 3 +++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/charts/sorry-cypress/Chart.yaml b/charts/sorry-cypress/Chart.yaml
index 8cdee8f..4ca666d 100644
--- a/charts/sorry-cypress/Chart.yaml
+++ b/charts/sorry-cypress/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: sorry-cypress
 description: A Helm chart for Sorry Cypress
 type: application
-version: 1.19.0
+version: 1.19.1
 appVersion: 2.5.10
 home: https://sorry-cypress.dev/
 sources:
diff --git a/charts/sorry-cypress/changelog.md b/charts/sorry-cypress/changelog.md
index 596b4b0..2162617 100644
--- a/charts/sorry-cypress/changelog.md
+++ b/charts/sorry-cypress/changelog.md
@@ -1,3 +1,6 @@
+# 1.19.1
+- Fixed director readiness probe failing when using BASE_PATH env
+
 # 1.19
 - Update app to version `2.5.10`
 
diff --git a/charts/sorry-cypress/templates/deployment-director.yml b/charts/sorry-cypress/templates/deployment-director.yml
index d1da260..749b64e 100644
--- a/charts/sorry-cypress/templates/deployment-director.yml
+++ b/charts/sorry-cypress/templates/deployment-director.yml
@@ -161,6 +161,8 @@ spec:
           value: {{ .Values.director.environmentVariables.inactivityTimeoutSeconds | quote }}
         - name: GITLAB_JOB_RETRIES
           value: {{ .Values.director.environmentVariables.gitlabJobRetries | quote }}
+        - name: BASE_PATH
+          value: {{ .Values.director.environmentVariables.basePath | quote }}
         {{- with .Values.director.extraEnv }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -175,7 +177,7 @@ spec:
           {{- toYaml .Values.director.securityContext | nindent 10 }}
         readinessProbe:
           httpGet:
-            path: /health-check-db
+            path: {{ .Values.director.environmentVariables.basePath }}/health-check-db
             port: 1234
           periodSeconds: {{ .Values.director.readinessProbe.periodSeconds }}
           timeoutSeconds: {{ .Values.director.readinessProbe.timeoutSeconds }}
diff --git a/charts/sorry-cypress/values.yaml b/charts/sorry-cypress/values.yaml
index b51bf28..6775afb 100644
--- a/charts/sorry-cypress/values.yaml
+++ b/charts/sorry-cypress/values.yaml
@@ -300,6 +300,9 @@ director:
     # Enable gitlab job retries
     gitlabJobRetries: false
 
+    # BASE_PATH serving path, usefull when using reverse proxy ex: /cypress/dashboard
+    basePath: ""
+
   # Set annotations for pods
   podAnnotations: {}