Skip to content

Commit

Permalink
Merge pull request #218 from toneill818/main
Browse files Browse the repository at this point in the history
fix: Correct extraEnv values for Director and Dashboard
  • Loading branch information
fbritoferreira authored Jun 11, 2023
2 parents fc6fbbf + 24e379f commit b10f603
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
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.13.2
version: 1.13.3
appVersion: 2.5.3
home: https://sorry-cypress.dev/
sources:
Expand Down
3 changes: 3 additions & 0 deletions charts/sorry-cypress/changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# 1.14
- Update app to version `2.5.3`

# 1.13.3
- Fixed extra environment variables for director and dashboard deployments

# 1.13.2
- Add option to include addional environment variables for the director, dashboard and api containers

Expand Down
2 changes: 1 addition & 1 deletion charts/sorry-cypress/templates/deployment-dashboard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
{{- end }}
- name: PORT
value: "{{ .Values.dashboard.service.port }}"
{{- with .Values.api.extraEnv }}
{{- with .Values.dashboard.extraEnv }}
{{- toYaml . | nindent 8 }}
{{- end }}
image: "{{ .Values.dashboard.image.repository }}:{{ .Values.dashboard.image.tag | default .Chart.AppVersion }}"
Expand Down
2 changes: 1 addition & 1 deletion charts/sorry-cypress/templates/deployment-director.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ spec:
value: {{ .Values.director.environmentVariables.inactivityTimeoutSeconds | quote }}
- name: GITLAB_JOB_RETRIES
value: {{ .Values.director.environmentVariables.gitlabJobRetries | quote }}
{{- with .Values.api.extraEnv }}
{{- with .Values.director.extraEnv }}
{{- toYaml . | nindent 8 }}
{{- end }}
image: "{{ .Values.director.image.repository }}:{{ .Values.director.image.tag | default .Chart.AppVersion }}"
Expand Down

0 comments on commit b10f603

Please sign in to comment.