Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added BASE_PATH environment to values #245

Merged
merged 2 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/sorry-cypress/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 5 additions & 2 deletions charts/sorry-cypress/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 | `{}` |
Expand All @@ -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

Expand All @@ -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 | `{}` |
Expand Down
3 changes: 3 additions & 0 deletions charts/sorry-cypress/changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 1.20.1
- Added BASE_PATH environment to values

# 1.20
- Update app to version `2.5.11`

Expand Down
2 changes: 2 additions & 0 deletions charts/sorry-cypress/templates/deployment-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 2 additions & 0 deletions charts/sorry-cypress/templates/deployment-dashboard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 4 additions & 0 deletions charts/sorry-cypress/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ api:
# set PAGE_ITEMS_LIMIT
pageItemsLimit: 10

# set BASE_PATH
basePath: 10

ingress:
ingressClassName: nginx
labels: {}
Expand Down Expand Up @@ -166,6 +169,7 @@ dashboard:
graphQlClientCredentials: ""
graphQlSchemaUrl: ""
ciUrl: ""
basePath: "/"

service:
port: 8080
Expand Down
Loading