Merge pull request #245 from DoctorFTB/main

Added BASE_PATH environment to values
sorry-cypress · Nov 28, 2023 · 96d5d63 · 96d5d63
2 parents a1006a1 + 2bd5568
commit 96d5d63
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 3 deletions.
diff --git 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.20.0
+version: 1.20.1
 appVersion: 2.5.11
 home: https://sorry-cypress.dev/
 sources:

diff --git a/charts/sorry-cypress/README.md b/charts/sorry-cypress/README.md
@@ -93,7 +93,8 @@ https://sorry-cypress.dev/api#configuration
 | `api.initContainers`                  | Allows you to define init container(s) for the api pod                                       | `[]`                        |
 | `api.enableApolloPlayground`          | Allows you to enable or disable Apollo Playground landing page                               | `false`                     |
 | `api.pageItemsLimit`                  | Allows you to set the API PAGE_ITEMS_LIMIT variable                                          | `10`                        |
-| `api.extraEnv`                        | Additional environment variables for the API container                                          | `[]`                        |
+| `api.basePath`                        | Allows you to set the API BASE_PATH variable                                                 | `/`                         |
+| `api.extraEnv`                        | Additional environment variables for the API container                                       | `[]`                        |
 
 ### Dashboard service
 
@@ -110,6 +111,7 @@ https://sorry-cypress.dev/dashboard#configuration
 | `dashboard.environmentVariables.ciUrl`                    | Set the `CI_URL` optional environment variable to add a link to your CI tool                               | `""`                              |
 | `dashboard.environmentVariables.graphQlClientCredentials` | Set the `GRAPHQL_CLIENT_CREDENTIALS` environment variable to configure the API service client credentials. | `""`                              |
 | `dashboard.environmentVariables.graphQlSchemaUrl`         | Set the `GRAPHQL_SCHEMA_URL` environment variable to configure the URL of API service.                     | `""`                              |
+| `dashboard.environmentVariables.basePath`                 | Set the `BASE_PATH` environment variable                                                                   | `/`                               |
 | `dashboard.podAnnotations`                                | Set annotations for pods                                                                                   | `{}`                              |
 | `dashboard.priorityClassName`                             | Name of the existing priority class to be used by dashboard pod(s)                                         | `""`                              |
 | `dashboard.podLabels`                                     | Set additional labels for pods                                                                             | `{}`                              |
@@ -125,7 +127,7 @@ https://sorry-cypress.dev/dashboard#configuration
 | `dashboard.ingress.hosts[0].path`                         | Root path to the service installation                                                                      | `/`                               |
 | `dashboard.ingress.tls`                                   | Ingress secrets for TLS certificates                                                                       | `[]`                              |
 | `dashboard.initContainers`                                | Allows you to define init container(s) for the dashboard pod                                               | `[]`                              |
-| `dashboard.extraEnv`                                      | Additional environment variables for the Dashboard container                                          | `[]`                        |
+| `dashboard.extraEnv`                                      | Additional environment variables for the Dashboard container                                               | `[]`                              |
 
 ### Director service
 
@@ -150,6 +152,7 @@ https://sorry-cypress.dev/director/configuration
 | `director.environmentVariables.screenshotsDriver` | Set the screenshots driver. Valid options are `"../screenshots/dummy.driver"`, `"../screenshots/s3.driver"`, `"../screenshots/minio.driver"` or `"../screenshots/azure-blob-storage.driver"` | `"../screenshots/dummy.driver"`  |
 | `director.environmentVariables.inactivityTimeoutSeconds`       | Set the timeout of all test runs under your projects. |  `180s` |
 | `director.environmentVariables.gitlabJobRetries`               | Enable job retries from Gitlab.                       |  `false` |
+| `director.environmentVariables.basePath`                       | Set the `BASE_PATH` environment variable              |  `/`     |
 | `director.podAnnotations`                         | Set annotations for pods                                                                                                                                                     | `{}`                             |
 | `director.priorityClassName`                      | Name of the existing priority class to be used by director pod(s)                                                                                                            | `""`                             |
 | `director.podLabels`                              | Set additional labels for pods                                                                                                                                               | `{}`                             |

diff --git a/charts/sorry-cypress/changelog.md b/charts/sorry-cypress/changelog.md
@@ -1,3 +1,6 @@
+# 1.20.1
+- Added BASE_PATH environment to values
+
 # 1.20
 - Update app to version `2.5.11`
 

diff --git a/charts/sorry-cypress/templates/deployment-api.yml b/charts/sorry-cypress/templates/deployment-api.yml
@@ -76,6 +76,8 @@ spec:
           value: "mongodb://{{ include "mongodb.hostname" . }}:{{ .Values.mongodb.service.port }}"
         {{- end }}
         {{- end }}
+        - name: BASE_PATH
+          value: {{ .Values.api.basePath | quote }}
         {{- with .Values.api.extraEnv }}
         {{- toYaml . | nindent 8 }}
         {{- end }}

diff --git a/charts/sorry-cypress/templates/deployment-dashboard.yml b/charts/sorry-cypress/templates/deployment-dashboard.yml
@@ -55,6 +55,8 @@ spec:
         {{- end }}
         - name: PORT
           value: "{{ .Values.dashboard.service.port }}"
+        - name: BASE_PATH
+          value: {{ .Values.dashboard.environmentVariables.basePath | quote }}
         {{- with .Values.dashboard.extraEnv }}
         {{- toYaml . | nindent 8 }}
         {{- end }}

diff --git a/charts/sorry-cypress/values.yaml b/charts/sorry-cypress/values.yaml
@@ -94,6 +94,9 @@ api:
   # set PAGE_ITEMS_LIMIT
   pageItemsLimit: 10
 
+  # set BASE_PATH
+  basePath: 10
+
   ingress:
     ingressClassName: nginx
     labels: {}
@@ -166,6 +169,7 @@ dashboard:
     graphQlClientCredentials: ""
     graphQlSchemaUrl: ""
     ciUrl: ""
+    basePath: "/"
 
   service:
     port: 8080