Merge pull request taskcluster#1142 from djmitche/bug1570723

Bug 1570723 - allow configuration of UI_LOGIN_STRATEGY_NAMES
somchi · Aug 2, 2019 · a0a579e · a0a579e
2 parents f030d45 + 4b68aed
commit a0a579e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/changelog/bug1570723.md b/changelog/bug1570723.md
@@ -0,0 +1,5 @@
+level: major
+reference: bug 1570723
+---
+The deployment configuration value `ui.ui_login_strategy_names` is now required.
+It should be a space-separated list of the names of the strategies in `web_server.ui_login_strategies`.
diff --git a/dev-docs/dev-config-example.yml b/dev-docs/dev-config-example.yml
@@ -240,4 +240,5 @@ ui:
   application_name: ...
   graphql_subscription_endpoint: ...
   graphql_endpoint: ...
+  ui_login_strategy_names: ...
 references: {}
diff --git a/infrastructure/builder/src/generate/generators/k8s.js b/infrastructure/builder/src/generate/generators/k8s.js
@@ -179,6 +179,7 @@ const extras = {
       {type: '!env', var: 'APPLICATION_NAME'},
       {type: '!env', var: 'GRAPHQL_SUBSCRIPTION_ENDPOINT'},
       {type: '!env', var: 'GRAPHQL_ENDPOINT'},
+      {type: '!env', var: 'UI_LOGIN_STRATEGY_NAMES'},
     ],
     procs: {
       web: {

diff --git a/infrastructure/k8s/templates/taskcluster-ui-secret.yaml b/infrastructure/k8s/templates/taskcluster-ui-secret.yaml
diff --git a/infrastructure/k8s/values.schema.json b/infrastructure/k8s/values.schema.json
@@ -1437,13 +1437,17 @@
           ],
           "title": "Process settings for this service",
           "type": "object"
+        },
+        "ui_login_strategy_names": {
+          "type": "string"
         }
       },
       "required": [
         "procs",
         "application_name",
         "graphql_subscription_endpoint",
-        "graphql_endpoint"
+        "graphql_endpoint",
+        "ui_login_strategy_names"
       ],
       "title": "Configuration options for ui",
       "type": "object"