Browse Source

fix and enhance helm db config (#12707)

3.2.0-release
旺阳 2 years ago committed by GitHub
parent
commit
23e9d2698c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl
  2. 2
      deploy/kubernetes/dolphinscheduler/values.yaml

4
deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl

@ -139,9 +139,9 @@ Create a database environment variables.
{{- end }} {{- end }}
- name: SPRING_DATASOURCE_URL - name: SPRING_DATASOURCE_URL
{{- if .Values.postgresql.enabled }} {{- if .Values.postgresql.enabled }}
value: jdbc:postgresql://{{ template "dolphinscheduler.postgresql.fullname" . }}:5432/{{ .Values.postgresql.postgresqlDatabase }}?characterEncoding=utf8 value: jdbc:postgresql://{{ template "dolphinscheduler.postgresql.fullname" . }}:5432/{{ .Values.postgresql.postgresqlDatabase }}?{{ .Values.postgresql.params }}
{{- else if .Values.mysql.enabled }} {{- else if .Values.mysql.enabled }}
value: jdbc:mysql://{{ template "dolphinscheduler.mysql.fullname" . }}:3306/{{ .Values.postgresql.postgresqlDatabase }}?characterEncoding=utf8 value: jdbc:mysql://{{ template "dolphinscheduler.mysql.fullname" . }}:3306/{{ .Values.mysql.auth.database }}?{{ .Values.mysql.auth.params }}
{{- else }} {{- else }}
value: jdbc:{{ .Values.externalDatabase.type }}://{{ .Values.externalDatabase.host }}:{{ .Values.externalDatabase.port }}/{{ .Values.externalDatabase.database }}?{{ .Values.externalDatabase.params }} value: jdbc:{{ .Values.externalDatabase.type }}://{{ .Values.externalDatabase.host }}:{{ .Values.externalDatabase.port }}/{{ .Values.externalDatabase.database }}?{{ .Values.externalDatabase.params }}
{{- end }} {{- end }}

2
deploy/kubernetes/dolphinscheduler/values.yaml

@ -38,6 +38,7 @@ postgresql:
postgresqlUsername: "root" postgresqlUsername: "root"
postgresqlPassword: "root" postgresqlPassword: "root"
postgresqlDatabase: "dolphinscheduler" postgresqlDatabase: "dolphinscheduler"
params: "characterEncoding=utf8"
persistence: persistence:
enabled: false enabled: false
size: "20Gi" size: "20Gi"
@ -49,6 +50,7 @@ mysql:
username: "ds" username: "ds"
password: "ds" password: "ds"
database: "dolphinscheduler" database: "dolphinscheduler"
params: "characterEncoding=utf8"
primary: primary:
persistence: persistence:
enabled: false enabled: false

Loading…
Cancel
Save