This is an automated email from the ASF dual-hosted git repository.
zihaoxiang pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 022d28be72 [Improvement-17562][Helm] Update postgresql helm chart
version (#18123)
022d28be72 is described below
commit 022d28be72d4fa039c5da56b093f6b9bcaa1fa77
Author: xiangzihao <[email protected]>
AuthorDate: Mon Apr 6 12:48:06 2026 +0800
[Improvement-17562][Helm] Update postgresql helm chart version (#18123)
---
deploy/kubernetes/dolphinscheduler/Chart.yaml | 9 ++----
deploy/kubernetes/dolphinscheduler/README.md | 16 +++++-----
.../dolphinscheduler/templates/_helpers.tpl | 6 ++--
.../templates/keda-autoscaler-worker.yaml | 4 +--
deploy/kubernetes/dolphinscheduler/values.yaml | 36 +++++++++++++---------
5 files changed, 38 insertions(+), 33 deletions(-)
diff --git a/deploy/kubernetes/dolphinscheduler/Chart.yaml
b/deploy/kubernetes/dolphinscheduler/Chart.yaml
index 332b606c0d..88406d1aff 100644
--- a/deploy/kubernetes/dolphinscheduler/Chart.yaml
+++ b/deploy/kubernetes/dolphinscheduler/Chart.yaml
@@ -43,13 +43,8 @@ appVersion: 3.1.0
dependencies:
- name: postgresql
- version: 10.3.18
- # Due to a change in the Bitnami repo, https://charts.bitnami.com/bitnami
was truncated only
- # containing entries for the latest 6 months (from January 2022 on).
- # This URL:
https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
- # contains the full 'index.yaml'.
- # See detail here: https://github.com/bitnami/charts/issues/10833
- repository:
https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+ version: 12.1.5
+ repository: https://charts.bitnami.com/bitnami
condition: postgresql.enabled
- name: zookeeper
version: 11.4.11
diff --git a/deploy/kubernetes/dolphinscheduler/README.md
b/deploy/kubernetes/dolphinscheduler/README.md
index bfa4da6b50..4089b6cd40 100644
--- a/deploy/kubernetes/dolphinscheduler/README.md
+++ b/deploy/kubernetes/dolphinscheduler/README.md
@@ -178,6 +178,8 @@ Please refer to the [Quick Start in
Kubernetes](../../../docs/docs/en/guide/inst
| externalDatabase.username | string | `"root"` | The username of external
database |
| externalRegistry.registryPluginName | string | `"zookeeper"` | If exists
external registry and set `zookeeper.enable` && `registryEtcd.enabled` &&
`registryJdbc.enabled` to false, specify the external registry plugin name |
| externalRegistry.registryServers | string | `"127.0.0.1:2181"` | If exists
external registry and set `zookeeper.enable` && `registryEtcd.enabled` &&
`registryJdbc.enabled` to false, specify the external registry servers |
+| global | object | `{"security":{"allowInsecureImages":true}}` | Global
settings for Bitnami subcharts |
+| global.security.allowInsecureImages | bool | `true` | Allow using
non-standard container images (required for bitnamilegacy images) |
| image.alert | string | `"dolphinscheduler-alert-server"` | alert-server
image |
| image.api | string | `"dolphinscheduler-api"` | api-server image |
| image.master | string | `"dolphinscheduler-master"` | master image |
@@ -272,18 +274,18 @@ Please refer to the [Quick Start in
Kubernetes](../../../docs/docs/en/guide/inst
| mysql.primary.persistence.enabled | bool | `false` | Set
mysql.primary.persistence.enabled to true to mount a new volume for internal
MySQL |
| mysql.primary.persistence.size | string | `"20Gi"` | `PersistentVolumeClaim`
size |
| mysql.primary.persistence.storageClass | string | `"-"` | MySQL data
persistent volume storage class. If set to "-", storageClassName: "", which
disables dynamic provisioning |
+| postgresql.auth.database | string | `"dolphinscheduler"` | The database for
internal PostgreSQL |
+| postgresql.auth.password | string | `"root"` | The password for internal
PostgreSQL |
+| postgresql.auth.username | string | `"root"` | The username for internal
PostgreSQL |
| postgresql.driverClassName | string | `"org.postgresql.Driver"` | The
driverClassName for internal PostgreSQL |
| postgresql.enabled | bool | `true` | If not exists external PostgreSQL, by
default, the DolphinScheduler will use a internal PostgreSQL |
| postgresql.image.registry | string | `"docker.io"` | |
| postgresql.image.repository | string | `"bitnamilegacy/postgresql"` | |
-| postgresql.image.tag | string | `"11.11.0"` | |
+| postgresql.image.tag | string | `"15.1.0-debian-11-r12"` | |
| postgresql.params | string | `"characterEncoding=utf8"` | The params for
internal PostgreSQL |
-| postgresql.persistence.enabled | bool | `false` | Set
postgresql.persistence.enabled to true to mount a new volume for internal
PostgreSQL |
-| postgresql.persistence.size | string | `"20Gi"` | `PersistentVolumeClaim`
size |
-| postgresql.persistence.storageClass | string | `"-"` | PostgreSQL data
persistent volume storage class. If set to "-", storageClassName: "", which
disables dynamic provisioning |
-| postgresql.postgresqlDatabase | string | `"dolphinscheduler"` | The database
for internal PostgreSQL |
-| postgresql.postgresqlPassword | string | `"root"` | The password for
internal PostgreSQL |
-| postgresql.postgresqlUsername | string | `"root"` | The username for
internal PostgreSQL |
+| postgresql.primary.persistence.enabled | bool | `false` | Set
postgresql.primary.persistence.enabled to true to mount a new volume for
internal PostgreSQL |
+| postgresql.primary.persistence.size | string | `"20Gi"` |
`PersistentVolumeClaim` size |
+| postgresql.primary.persistence.storageClass | string | `"-"` | PostgreSQL
data persistent volume storage class. If set to "-", storageClassName: "",
which disables dynamic provisioning |
| registryEtcd.authority | string | `""` | Etcd authority |
| registryEtcd.enabled | bool | `false` | If you want to use Etcd for your
registry center, change this value to true. And set zookeeper.enabled to false |
| registryEtcd.endpoints | string | `""` | Etcd endpoints |
diff --git a/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl
b/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl
index 7363175a59..1463d0257b 100644
--- a/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl
+++ b/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl
@@ -151,7 +151,7 @@ Create a database environment variables.
{{- end }}
- name: SPRING_DATASOURCE_URL
{{- if .Values.postgresql.enabled }}
- value: jdbc:postgresql://{{ template "dolphinscheduler.postgresql.fullname"
. }}:5432/{{ .Values.postgresql.postgresqlDatabase }}?{{
.Values.postgresql.params }}
+ value: jdbc:postgresql://{{ template "dolphinscheduler.postgresql.fullname"
. }}:5432/{{ .Values.postgresql.auth.database }}?{{ .Values.postgresql.params }}
{{- else if .Values.mysql.enabled }}
value: jdbc:mysql://{{ template "dolphinscheduler.mysql.fullname" .
}}:3306/{{ .Values.mysql.auth.database }}?{{ .Values.mysql.auth.params }}
{{- else }}
@@ -159,7 +159,7 @@ Create a database environment variables.
{{- end }}
- name: SPRING_DATASOURCE_USERNAME
{{- if .Values.postgresql.enabled }}
- value: {{ .Values.postgresql.postgresqlUsername }}
+ value: {{ .Values.postgresql.auth.username }}
{{- else if .Values.mysql.enabled }}
value: {{ .Values.mysql.auth.username }}
{{- else }}
@@ -170,7 +170,7 @@ Create a database environment variables.
secretKeyRef:
{{- if .Values.postgresql.enabled }}
name: {{ template "dolphinscheduler.postgresql.fullname" . }}
- key: postgresql-password
+ key: password
{{- else if .Values.mysql.enabled }}
name: {{ template "dolphinscheduler.mysql.fullname" . }}
key: mysql-password
diff --git
a/deploy/kubernetes/dolphinscheduler/templates/keda-autoscaler-worker.yaml
b/deploy/kubernetes/dolphinscheduler/templates/keda-autoscaler-worker.yaml
index ca632181c4..e8e3b8d15c 100644
--- a/deploy/kubernetes/dolphinscheduler/templates/keda-autoscaler-worker.yaml
+++ b/deploy/kubernetes/dolphinscheduler/templates/keda-autoscaler-worker.yaml
@@ -46,8 +46,8 @@ spec:
metadata:
host: {{ template "dolphinscheduler.postgresql.fullname" . }}.{{
.Release.Namespace }}.svc.cluster.local
port: "5432"
- dbName: {{ .Values.postgresql.postgresqlDatabase }}
- userName: {{ .Values.postgresql.postgresqlUsername }}
+ dbName: {{ .Values.postgresql.auth.database }}
+ userName: {{ .Values.postgresql.auth.username }}
passwordFromEnv: SPRING_DATASOURCE_PASSWORD
sslmode: "disable"
targetQueryValue: "1"
diff --git a/deploy/kubernetes/dolphinscheduler/values.yaml
b/deploy/kubernetes/dolphinscheduler/values.yaml
index c9d545896c..230ad02193 100644
--- a/deploy/kubernetes/dolphinscheduler/values.yaml
+++ b/deploy/kubernetes/dolphinscheduler/values.yaml
@@ -19,6 +19,12 @@
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
+# -- Global settings for Bitnami subcharts
+global:
+ security:
+ # -- Allow using non-standard container images (required for bitnamilegacy
images)
+ allowInsecureImages: true
+
# -- World time and date for cities in all time zones
timezone: "Asia/Shanghai"
@@ -56,27 +62,29 @@ datasource:
postgresql:
# -- If not exists external PostgreSQL, by default, the DolphinScheduler
will use a internal PostgreSQL
enabled: true
- # -- The username for internal PostgreSQL
- postgresqlUsername: "root"
- # -- The password for internal PostgreSQL
- postgresqlPassword: "root"
- # -- The database for internal PostgreSQL
- postgresqlDatabase: "dolphinscheduler"
# -- The driverClassName for internal PostgreSQL
driverClassName: "org.postgresql.Driver"
# -- The params for internal PostgreSQL
params: "characterEncoding=utf8"
- persistence:
- # -- Set postgresql.persistence.enabled to true to mount a new volume for
internal PostgreSQL
- enabled: false
- # -- `PersistentVolumeClaim` size
- size: "20Gi"
- # -- PostgreSQL data persistent volume storage class. If set to "-",
storageClassName: "", which disables dynamic provisioning
- storageClass: "-"
+ auth:
+ # -- The username for internal PostgreSQL
+ username: "root"
+ # -- The password for internal PostgreSQL
+ password: "root"
+ # -- The database for internal PostgreSQL
+ database: "dolphinscheduler"
+ primary:
+ persistence:
+ # -- Set postgresql.primary.persistence.enabled to true to mount a new
volume for internal PostgreSQL
+ enabled: false
+ # -- `PersistentVolumeClaim` size
+ size: "20Gi"
+ # -- PostgreSQL data persistent volume storage class. If set to "-",
storageClassName: "", which disables dynamic provisioning
+ storageClass: "-"
image:
registry: docker.io
repository: bitnamilegacy/postgresql
- tag: 11.11.0
+ tag: 15.1.0-debian-11-r12
mysql:
# -- If not exists external MySQL, by default, the DolphinScheduler will use
a internal MySQL
