From 81018b16d33b283d8233ec3db8a4de199acc2b5d Mon Sep 17 00:00:00 2001 From: Luis Date: Tue, 30 Jun 2020 16:14:18 -0500 Subject: [PATCH] added support for registration flow env variable adding expected test changes --- common/centraldashboard/base/deployment_patch.yaml | 2 ++ common/centraldashboard/base/kustomization.yaml | 7 +++++++ common/centraldashboard/base/params.env | 3 ++- .../expected/apps_v1_deployment_centraldashboard.yaml | 2 ++ .../test_data/expected/~g_v1_configmap_parameters.yaml | 1 + 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/common/centraldashboard/base/deployment_patch.yaml b/common/centraldashboard/base/deployment_patch.yaml index 591c63418f..2d412be0c8 100644 --- a/common/centraldashboard/base/deployment_patch.yaml +++ b/common/centraldashboard/base/deployment_patch.yaml @@ -14,3 +14,5 @@ spec: value: $(userid-prefix) - name: PROFILES_KFAM_SERVICE_HOST value: profiles-kfam.kubeflow + - name: REGISTRATION_FLOW + value: $(registration-flow) \ No newline at end of file diff --git a/common/centraldashboard/base/kustomization.yaml b/common/centraldashboard/base/kustomization.yaml index 2a33c6728d..73b93acff0 100644 --- a/common/centraldashboard/base/kustomization.yaml +++ b/common/centraldashboard/base/kustomization.yaml @@ -53,5 +53,12 @@ vars: apiVersion: v1 kind: ConfigMap name: parameters +- fieldref: + fieldPath: data.registration-flow + name: registration-flow + objref: + apiVersion: v1 + kind: ConfigMap + name: parameters configurations: - params.yaml diff --git a/common/centraldashboard/base/params.env b/common/centraldashboard/base/params.env index 069b7010c5..29a53a8641 100644 --- a/common/centraldashboard/base/params.env +++ b/common/centraldashboard/base/params.env @@ -1,3 +1,4 @@ clusterDomain=cluster.local userid-header= -userid-prefix= \ No newline at end of file +userid-prefix= +registration-flow=true \ No newline at end of file diff --git a/tests/tests/legacy_kustomizations/centraldashboard/test_data/expected/apps_v1_deployment_centraldashboard.yaml b/tests/tests/legacy_kustomizations/centraldashboard/test_data/expected/apps_v1_deployment_centraldashboard.yaml index 8ec081792e..ea2d1c849b 100644 --- a/tests/tests/legacy_kustomizations/centraldashboard/test_data/expected/apps_v1_deployment_centraldashboard.yaml +++ b/tests/tests/legacy_kustomizations/centraldashboard/test_data/expected/apps_v1_deployment_centraldashboard.yaml @@ -46,6 +46,8 @@ spec: value: 'accounts.google.com:' - name: PROFILES_KFAM_SERVICE_HOST value: profiles-kfam.kubeflow + - name: REGISTRATION_FLOW + value: "true" image: gcr.io/kubeflow-images-public/centraldashboard:vmaster-gf39279c0 imagePullPolicy: IfNotPresent livenessProbe: diff --git a/tests/tests/legacy_kustomizations/centraldashboard/test_data/expected/~g_v1_configmap_parameters.yaml b/tests/tests/legacy_kustomizations/centraldashboard/test_data/expected/~g_v1_configmap_parameters.yaml index 5db896c707..63e02066f5 100644 --- a/tests/tests/legacy_kustomizations/centraldashboard/test_data/expected/~g_v1_configmap_parameters.yaml +++ b/tests/tests/legacy_kustomizations/centraldashboard/test_data/expected/~g_v1_configmap_parameters.yaml @@ -1,6 +1,7 @@ apiVersion: v1 data: clusterDomain: cluster.local + registration-flow: "true" userid-header: X-Goog-Authenticated-User-Email userid-prefix: 'accounts.google.com:' kind: ConfigMap