From e0968e93c5ed0f82d1c7ddf88aabd1d745048362 Mon Sep 17 00:00:00 2001 From: Ketan Umare Date: Mon, 24 Aug 2020 22:55:40 -0700 Subject: [PATCH] Updated --- deployment/eks/flyte_generated.yaml | 4 ++-- deployment/sandbox/flyte_generated.yaml | 5 +++-- kustomize/base/console/deployment.yaml | 4 ++-- kustomize/overlays/sandbox/console/config.yaml | 12 ++++++++++++ .../overlays/sandbox/console/kustomization.yaml | 1 + 5 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 kustomize/overlays/sandbox/console/config.yaml diff --git a/deployment/eks/flyte_generated.yaml b/deployment/eks/flyte_generated.yaml index 2bffee1483..6a42988742 100644 --- a/deployment/eks/flyte_generated.yaml +++ b/deployment/eks/flyte_generated.yaml @@ -708,13 +708,13 @@ spec: labels: app: flyteconsole app.kubernetes.io/name: flyteconsole - app.kubernetes.io/version: 0.8.0 + app.kubernetes.io/version: 0.9.0 spec: containers: - envFrom: - configMapRef: name: flyte-console-config - image: docker.io/lyft/flyteconsole:v0.8.0 + image: docker.io/lyft/flyteconsole:v0.9.0 name: flyteconsole ports: - containerPort: 8080 diff --git a/deployment/sandbox/flyte_generated.yaml b/deployment/sandbox/flyte_generated.yaml index ae1a9cf767..e91ebe9bea 100644 --- a/deployment/sandbox/flyte_generated.yaml +++ b/deployment/sandbox/flyte_generated.yaml @@ -683,6 +683,7 @@ apiVersion: v1 data: BASE_URL: /console CONFIG_DIR: /etc/flyte/config + DISABLE_AUTH: "true" kind: ConfigMap metadata: name: flyte-console-config @@ -1209,13 +1210,13 @@ spec: labels: app: flyteconsole app.kubernetes.io/name: flyteconsole - app.kubernetes.io/version: 0.8.0 + app.kubernetes.io/version: 0.9.0 spec: containers: - envFrom: - configMapRef: name: flyte-console-config - image: docker.io/lyft/flyteconsole:v0.8.0 + image: docker.io/lyft/flyteconsole:v0.9.0 name: flyteconsole ports: - containerPort: 8080 diff --git a/kustomize/base/console/deployment.yaml b/kustomize/base/console/deployment.yaml index ab567d4c6c..2ea8aa0c8f 100644 --- a/kustomize/base/console/deployment.yaml +++ b/kustomize/base/console/deployment.yaml @@ -16,14 +16,14 @@ spec: labels: app: flyteconsole app.kubernetes.io/name: flyteconsole - app.kubernetes.io/version: 0.8.0 + app.kubernetes.io/version: 0.9.0 spec: volumes: - name: shared-data emptyDir: {} containers: - name: flyteconsole - image: docker.io/lyft/flyteconsole:v0.8.0 + image: docker.io/lyft/flyteconsole:v0.9.0 # args: [] ports: - containerPort: 8080 diff --git a/kustomize/overlays/sandbox/console/config.yaml b/kustomize/overlays/sandbox/console/config.yaml new file mode 100644 index 0000000000..ff292b4b62 --- /dev/null +++ b/kustomize/overlays/sandbox/console/config.yaml @@ -0,0 +1,12 @@ +kind: ConfigMap +apiVersion: v1 +metadata: + name: flyte-console-config + namespace: flyte +data: + # This determines the base url used for all console links. It must match the route specified in ingress.yaml + BASE_URL: /console + CONFIG_DIR: /etc/flyte/config + DISABLE_AUTH: "true" + # IF Port-forwardin or if Admin and Console are running on different domainsg, then this should point to the host/port of Flyteadmin + # ADMIN_API_URL: http://localhost:8089 diff --git a/kustomize/overlays/sandbox/console/kustomization.yaml b/kustomize/overlays/sandbox/console/kustomization.yaml index 49f3deb5a9..8ddf03bf6d 100644 --- a/kustomize/overlays/sandbox/console/kustomization.yaml +++ b/kustomize/overlays/sandbox/console/kustomization.yaml @@ -3,3 +3,4 @@ bases: patches: - console.yaml +- config.yaml