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 6503a9b feat: eks related changes (#105)
6503a9b is described below
commit 6503a9b726db3dda7d2f97fd2af9cca210dcf2c3
Author: Daniel Hu <[email protected]>
AuthorDate: Fri Apr 7 17:21:18 2023 +0800
feat: eks related changes (#105)
* feat: add some args to mysql container
Signed-off-by: Daniel Hu <[email protected]>
* feat: eks related changes
Signed-off-by: Daniel Hu <[email protected]>
---------
Signed-off-by: Daniel Hu <[email protected]>
---
charts/devlake/templates/configmaps.yaml | 40 ++++++++++++++++++++++++++----
charts/devlake/templates/deployments.yaml | 6 +++++
charts/devlake/templates/services.yaml | 5 ++++
charts/devlake/templates/statefulsets.yaml | 5 ++++
4 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/charts/devlake/templates/configmaps.yaml
b/charts/devlake/templates/configmaps.yaml
index 16df1c3..65c40d5 100644
--- a/charts/devlake/templates/configmaps.yaml
+++ b/charts/devlake/templates/configmaps.yaml
@@ -79,13 +79,11 @@ data:
}
---
-{{- if not .Values.grafana.useExternal }}
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "devlake.fullname" . }}-grafana-datasource
data:
-{{- if eq .Values.option.database "mysql" }}
grafana-datasource.yml: |
apiVersion: 1
datasources:
@@ -115,6 +113,39 @@ data:
{{- end }}
{{- end }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "devlake.fullname" . }}-grafana
+data:
+ grafana.ini: |
+ {{- range $elem, $elemVal := index .Values "grafana.ini" }}
+ {{- if not (kindIs "map" $elemVal) }}
+ {{- if kindIs "invalid" $elemVal }}
+ {{ $elem }} =
+ {{- else if kindIs "string" $elemVal }}
+ {{ $elem }} = {{ tpl $elemVal $ }}
+ {{- else }}
+ {{ $elem }} = {{ $elemVal }}
+ {{- end }}
+ {{- end }}
+ {{- end }}
+ {{- range $key, $value := index .Values "grafana.ini" }}
+ {{- if kindIs "map" $value }}
+ [{{ $key }}]
+ {{- range $elem, $elemVal := $value }}
+ {{- if kindIs "invalid" $elemVal }}
+ {{ $elem }} =
+ {{- else if kindIs "string" $elemVal }}
+ {{ $elem }} = {{ tpl $elemVal $ }}
+ {{- else }}
+ {{ $elem }} = {{ $elemVal }}
+ {{- end }}
+ {{- end }}
+ {{- end }}
+ {{- end }}
+
---
apiVersion: v1
kind: ConfigMap
@@ -125,8 +156,7 @@ data:
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 } }
+ {{ - if .Values.ui.basicAuth.enabled }}
ADMIN_USER: "{{ .Values.ui.basicAuth.user }}"
ADMIN_PASS: "{{ .Values.ui.basicAuth.password }}"
- { { - end } }
-
+ {{ - end }}
diff --git a/charts/devlake/templates/deployments.yaml
b/charts/devlake/templates/deployments.yaml
index 9b83c69..3abcef8 100644
--- a/charts/devlake/templates/deployments.yaml
+++ b/charts/devlake/templates/deployments.yaml
@@ -58,6 +58,9 @@ spec:
- name: {{ include "devlake.fullname" .
}}-grafana-datasource-config
mountPath: /etc/grafana/provisioning/datasources/datasource.yml
subPath: grafana-datasource.yml
+ - name: config
+ mountPath: "/etc/grafana/grafana.ini"
+ subPath: grafana.ini
envFrom:
- configMapRef:
name: {{ include "devlake.fullname" . }}-config
@@ -92,6 +95,9 @@ spec:
- name: {{ include "devlake.fullname" . }}-grafana-datasource-config
configMap:
name: {{ include "devlake.fullname" . }}-grafana-datasource
+ - name: config
+ configMap:
+ name: {{ include "devlake.fullname" . }}-grafana
{{ end }}
---
# devlake-ui
diff --git a/charts/devlake/templates/services.yaml
b/charts/devlake/templates/services.yaml
index 586e84e..4d52520 100644
--- a/charts/devlake/templates/services.yaml
+++ b/charts/devlake/templates/services.yaml
@@ -85,9 +85,14 @@ apiVersion: v1
kind: Service
metadata:
name: {{ include "devlake.fullname" . }}-lake
+ annotations:
+ service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: instance
+ service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
+ service.beta.kubernetes.io/aws-load-balancer-type: external
labels:
{{- include "devlake.labels" . | nindent 4 }}
spec:
+ type: LoadBalancer
selector:
{{- include "devlake.selectorLabels" . | nindent 4 }}
devlakeComponent: lake
diff --git a/charts/devlake/templates/statefulsets.yaml
b/charts/devlake/templates/statefulsets.yaml
index 3ab7c0c..c8476cc 100644
--- a/charts/devlake/templates/statefulsets.yaml
+++ b/charts/devlake/templates/statefulsets.yaml
@@ -40,6 +40,11 @@ spec:
- name: mysql
image: "{{ .Values.mysql.image.repository }}:{{
.Values.mysql.image.tag }}"
imagePullPolicy: {{ .Values.mysql.image.pullPolicy }}
+ args:
+ - "mysqld"
+ - "--character-set-server=utf8mb4"
+ - "--collation-server=utf8mb4_bin"
+ - "--skip-log-bin"
ports:
- name: mysql
containerPort: 3306
