Merge pull request #6 from sorry-cypress/add-missing-env-to-director

Add DASHBOARD_URL env to the director deployment
sorry-cypress · Jan 12, 2021 · 62c9354 · 62c9354
2 parents 477dd95 + af0df38
commit 62c9354
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 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: 0.1.8
+version: 0.1.9
 appVersion: 0.6.1
 home: https://sorry-cypress.dev/
 sources:

diff --git 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: {{ .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/templates/deployment-director.yml b/charts/sorry-cypress/templates/deployment-director.yml
@@ -15,10 +15,8 @@ spec:
     spec:
       containers:
       - env:
-        {{- range .Values.director.ingress.hosts }}
-        - name: director_URL
-          value: {{ .host }}
-        {{- end }}
+        - name: DASHBOARD_URL
+          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
@@ -54,8 +54,9 @@ dashboard:
     #   cpu: 100m
     #   memory: 128Mi
 
+  # https://sorry-cypress.dev/dashboard#configuration
   environmentVariables:
-    # https://sorry-cypress.dev/dashboard#configuration
+    graphQlSchemaUrl: ""
     ciUrl: ""
 
   service:
@@ -94,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"