This is an automated email from the ASF dual-hosted git repository.
warren pushed a commit to branch eks
in repository
https://gitbox.apache.org/repos/asf/incubator-devlake-helm-chart.git
The following commit(s) were added to refs/heads/eks by this push:
new d423cdd feat(configui): modify configmap to support aws keys (#106)
d423cdd is described below
commit d423cdd953688003cd70b9225f968227be495cc3
Author: Warren Chen <[email protected]>
AuthorDate: Fri Apr 7 09:55:00 2023 +0800
feat(configui): modify configmap to support aws keys (#106)
---
charts/devlake/templates/configmaps.yaml | 20 ++++++++++++++++----
charts/devlake/templates/deployments.yaml | 2 +-
charts/devlake/values.yaml | 16 +++++++++++++++-
3 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/charts/devlake/templates/configmaps.yaml
b/charts/devlake/templates/configmaps.yaml
index 1138835..16df1c3 100644
--- a/charts/devlake/templates/configmaps.yaml
+++ b/charts/devlake/templates/configmaps.yaml
@@ -32,10 +32,6 @@ data:
{{- end }}
LOGGING_DIR: "{{ .Values.lake.loggingDir }}"
LOGGING_LEVEL: "{{ .Values.lake.loggingLevel }}"
-{{- if .Values.ui.basicAuth.enabled }}
- ADMIN_USER: "{{ .Values.ui.basicAuth.user }}"
- ADMIN_PASS: "{{ .Values.ui.basicAuth.password }}"
-{{- end }}
---
apiVersion: v1
@@ -118,3 +114,19 @@ data:
# timescaledb: false
{{- end }}
{{- end }}
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "devlake.fullname" . }}-ui-config
+data:
+ VITE_AUTH_REGION: "{{ .Values.ui.env.VITE_AUTH_REGION }}"
+ VITE_AUTH_USER_POOL_ID: "{{ .Values.ui.env.VITE_AUTH_USER_POOL_ID }}"
+ VITE_AUTH_USER_POOL_WEB_CLIENT_ID: "{{
.Values.ui.env.VITE_AUTH_USER_POOL_WEB_CLIENT_ID }}"
+ VITE_AUTH_COOKIE_STORAGE_DOMAIN: "{{
.Values.ui.env.VITE_AUTH_COOKIE_STORAGE_DOMAIN }}"
+ { { - if .Values.ui.basicAuth.enabled } }
+ ADMIN_USER: "{{ .Values.ui.basicAuth.user }}"
+ ADMIN_PASS: "{{ .Values.ui.basicAuth.password }}"
+ { { - end } }
+
diff --git a/charts/devlake/templates/deployments.yaml
b/charts/devlake/templates/deployments.yaml
index e1b3616..9b83c69 100644
--- a/charts/devlake/templates/deployments.yaml
+++ b/charts/devlake/templates/deployments.yaml
@@ -120,7 +120,7 @@ spec:
- containerPort: 4000
envFrom:
- configMapRef:
- name: {{ include "devlake.fullname" . }}-config
+ name: {{ include "devlake.fullname" . }}-ui-config
env:
- name: DEVLAKE_ENDPOINT
# TODO: remove hardcoded `cluster.local`
diff --git a/charts/devlake/values.yaml b/charts/devlake/values.yaml
index a669646..507d30a 100644
--- a/charts/devlake/values.yaml
+++ b/charts/devlake/values.yaml
@@ -66,6 +66,14 @@ mysql:
# affinity config for mysql if have
affinity: {}
+ # command flags for mysql
+ command:
+ - "--character-set-server=utf8mb4"
+ - "--collation-server=utf8mb4_bin"
+ - "--skip-log-bin"
+
+
+
#pgsql:
# # if use external pgsql server, please set true
# # by default using false, chart will create a single pgsql instance
@@ -131,7 +139,6 @@ grafana:
affinity: {}
-
lake:
image:
repository: apache/devlake
@@ -181,6 +188,13 @@ ui:
user: admin
password: admin
+ env:
+ VITE_AUTH_REGION: "placeholder"
+ VITE_AUTH_USER_POOL_ID: "placeholder"
+ VITE_AUTH_USER_POOL_WEB_CLIENT_ID: "placeholder"
+ VITE_AUTH_COOKIE_STORAGE_DOMAIN: "placeholder"
+
+
# alpine image for some init containers
alpine:
image:
