From 5a9e761e6a6dc9f2c815f3af05c9bc3525213986 Mon Sep 17 00:00:00 2001 From: Fernando Maia Date: Mon, 11 Jan 2021 13:30:33 -0300 Subject: [PATCH 1/7] Add DASHBOARD_URL env to the director deployment --- charts/sorry-cypress/templates/deployment-director.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/sorry-cypress/templates/deployment-director.yml b/charts/sorry-cypress/templates/deployment-director.yml index 69a9d6c..b414a15 100644 --- a/charts/sorry-cypress/templates/deployment-director.yml +++ b/charts/sorry-cypress/templates/deployment-director.yml @@ -19,6 +19,10 @@ spec: - name: director_URL value: {{ .host }} {{- end }} + {{- range .Values.dashboard.ingress.hosts }} + - name: DASHBOARD_URL + value: {{ .host }} + {{- end }} - name: ALLOWED_KEYS value: {{ .Values.director.environmentVariables.allowedKeys }} - name: EXECUTION_DRIVER From 5be5c6c783bd513b42e60de23c906a06c48fcdf9 Mon Sep 17 00:00:00 2001 From: Fernando Maia Date: Mon, 11 Jan 2021 15:07:40 -0300 Subject: [PATCH 2/7] Fix URL environment variables --- charts/sorry-cypress/templates/deployment-dashboard.yml | 2 +- charts/sorry-cypress/templates/deployment-director.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/sorry-cypress/templates/deployment-dashboard.yml b/charts/sorry-cypress/templates/deployment-dashboard.yml index c6961e1..dc138bb 100644 --- a/charts/sorry-cypress/templates/deployment-dashboard.yml +++ b/charts/sorry-cypress/templates/deployment-dashboard.yml @@ -19,7 +19,7 @@ spec: - env: {{- range .Values.api.ingress.hosts }} - name: GRAPHQL_SCHEMA_URL - value: {{ .host }} + value: http://{{ .host }} {{- end }} {{- if .Values.dashboard.environmentVariables.ciUrl }} - name: CI_URL diff --git a/charts/sorry-cypress/templates/deployment-director.yml b/charts/sorry-cypress/templates/deployment-director.yml index b414a15..3396562 100644 --- a/charts/sorry-cypress/templates/deployment-director.yml +++ b/charts/sorry-cypress/templates/deployment-director.yml @@ -17,11 +17,11 @@ spec: - env: {{- range .Values.director.ingress.hosts }} - name: director_URL - value: {{ .host }} + value: http://{{ .host }} {{- end }} {{- range .Values.dashboard.ingress.hosts }} - name: DASHBOARD_URL - value: {{ .host }} + value: http://{{ .host }} {{- end }} - name: ALLOWED_KEYS value: {{ .Values.director.environmentVariables.allowedKeys }} From 18ecebc47d33bc2619a6a92edf0e4c49f0c32613 Mon Sep 17 00:00:00 2001 From: Fernando Maia Date: Mon, 11 Jan 2021 19:41:22 -0300 Subject: [PATCH 3/7] Bump chart version to 0.1.8 --- charts/sorry-cypress/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/sorry-cypress/Chart.yaml b/charts/sorry-cypress/Chart.yaml index b36fcaa..e2f2d35 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: 0.1.6 +version: 0.1.8 appVersion: 0.6.1 home: https://sorry-cypress.dev/ sources: From a85cdfe72570f37a8130ac6c0abf3f6788b1942b Mon Sep 17 00:00:00 2001 From: Fernando Maia Date: Tue, 12 Jan 2021 09:35:48 -0300 Subject: [PATCH 4/7] add graphQlSchemaUrl --- .../templates/deployment-dashboard.yml | 4 +--- charts/sorry-cypress/values.yaml | 17 ++++++++--------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/charts/sorry-cypress/templates/deployment-dashboard.yml b/charts/sorry-cypress/templates/deployment-dashboard.yml index b3c505b..7625da3 100644 --- a/charts/sorry-cypress/templates/deployment-dashboard.yml +++ b/charts/sorry-cypress/templates/deployment-dashboard.yml @@ -17,10 +17,8 @@ spec: spec: containers: - env: - {{- range .Values.api.ingress.hosts }} - name: GRAPHQL_SCHEMA_URL - value: http://{{ .host }} - {{- end }} + value: {{ .Values.dashboard.environmentVariables.graphQlSchemaUrl | quote }} {{- if .Values.dashboard.environmentVariables.ciUrl }} - name: CI_URL value: {{ .Values.dashboard.environmentVariables.ciUrl | quote }} diff --git a/charts/sorry-cypress/values.yaml b/charts/sorry-cypress/values.yaml index c3d820b..aeebd44 100644 --- a/charts/sorry-cypress/values.yaml +++ b/charts/sorry-cypress/values.yaml @@ -35,7 +35,6 @@ api: # hosts: # - chart-example.local - dashboard: image: repository: agoldis/sorry-cypress-dashboard @@ -55,8 +54,9 @@ dashboard: # cpu: 100m # memory: 128Mi + # https://sorry-cypress.dev/dashboard#configuration environmentVariables: - # https://sorry-cypress.dev/dashboard#configuration + graphQlSchemaUrl: "" ciUrl: "" service: @@ -75,7 +75,6 @@ dashboard: # hosts: # - chart-example.local - director: image: repository: agoldis/sorry-cypress-director @@ -97,18 +96,18 @@ director: environmentVariables: # In memory, or Mongo. - # Valid options are: - # "../execution/in-memory" - # "../execution/mongo/driver" + # Valid options are: + # "../execution/in-memory" + # "../execution/mongo/driver" executionDriver: "../execution/in-memory" # Ignored if mongo.environmentVariables.executionDriver is set to "../execution/in-memory" mongodbDatabase: sorry-cypress # Dummy or S3 - # Valid options are: - # "../screenshots/dummy.driver" - # "../screenshots/s3.driver" + # Valid options are: + # "../screenshots/dummy.driver" + # "../screenshots/s3.driver" screenshotsDriver: "../screenshots/dummy.driver" # https://sorry-cypress.dev/director/configuration From 4035c27ec9f1e6ee7bc0adaab2a41a3156178122 Mon Sep 17 00:00:00 2001 From: Fernando Maia Date: Tue, 12 Jan 2021 10:02:45 -0300 Subject: [PATCH 5/7] Bump chart version to 0.1.9 --- charts/sorry-cypress/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/sorry-cypress/Chart.yaml b/charts/sorry-cypress/Chart.yaml index e80f36c..ecd7bde 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: 0.1.8 +version: 0.1.9 appVersion: 0.6.1 home: https://sorry-cypress.dev/ sources: From d736fbf92993fc5bdae13d2cd5c99b09ba946984 Mon Sep 17 00:00:00 2001 From: Fernando Maia Date: Tue, 12 Jan 2021 11:39:16 -0300 Subject: [PATCH 6/7] Remove director_URL env from director deployment --- charts/sorry-cypress/templates/deployment-director.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/charts/sorry-cypress/templates/deployment-director.yml b/charts/sorry-cypress/templates/deployment-director.yml index 9f39496..7aa21b4 100644 --- a/charts/sorry-cypress/templates/deployment-director.yml +++ b/charts/sorry-cypress/templates/deployment-director.yml @@ -15,10 +15,6 @@ spec: spec: containers: - env: - {{- range .Values.director.ingress.hosts }} - - name: director_URL - value: http://{{ .host }} - {{- end }} {{- range .Values.dashboard.ingress.hosts }} - name: DASHBOARD_URL value: http://{{ .host }} From af0df388207b138cbc03f1d971b3d48ec3cd2935 Mon Sep 17 00:00:00 2001 From: Fernando Maia Date: Tue, 12 Jan 2021 11:44:41 -0300 Subject: [PATCH 7/7] Add director.environmentVariables.dashboardUrl to values --- charts/sorry-cypress/templates/deployment-director.yml | 4 +--- charts/sorry-cypress/values.yaml | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/sorry-cypress/templates/deployment-director.yml b/charts/sorry-cypress/templates/deployment-director.yml index 7aa21b4..e1dade4 100644 --- a/charts/sorry-cypress/templates/deployment-director.yml +++ b/charts/sorry-cypress/templates/deployment-director.yml @@ -15,10 +15,8 @@ spec: spec: containers: - env: - {{- range .Values.dashboard.ingress.hosts }} - name: DASHBOARD_URL - value: http://{{ .host }} - {{- end }} + value: {{ .Values.director.environmentVariables.dashboardUrl | quote }} - name: ALLOWED_KEYS value: {{ .Values.director.environmentVariables.allowedKeys }} - name: EXECUTION_DRIVER diff --git a/charts/sorry-cypress/values.yaml b/charts/sorry-cypress/values.yaml index 57143d9..6b58ed4 100644 --- a/charts/sorry-cypress/values.yaml +++ b/charts/sorry-cypress/values.yaml @@ -95,6 +95,9 @@ director: # memory: 128Mi environmentVariables: + # The "Run URL" in the Cypress client + dashboardUrl: "" + # In memory, or Mongo. # Valid options are: # "../execution/in-memory"