Skip to content

Commit 022d28b

Browse files
SbloodySSbloodyS
authored
[Improvement-17562][Helm] Update postgresql helm chart version (#18123)
1 parent ec0947e commit 022d28b

5 files changed

Lines changed: 38 additions & 33 deletions

File tree

‎deploy/kubernetes/dolphinscheduler/Chart.yaml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,8 @@ appVersion: 3.1.0
4343

4444
dependencies:
4545
- name: postgresql
46-
version: 10.3.18
47-
# Due to a change in the Bitnami repo, https://charts.bitnami.com/bitnami was truncated only
48-
# containing entries for the latest 6 months (from January 2022 on).
49-
# This URL: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
50-
# contains the full 'index.yaml'.
51-
# See detail here: https://github.com/bitnami/charts/issues/10833
52-
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
46+
version: 12.1.5
47+
repository: https://charts.bitnami.com/bitnami
5348
condition: postgresql.enabled
5449
- name: zookeeper
5550
version: 11.4.11

‎deploy/kubernetes/dolphinscheduler/README.md‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
178178
| externalDatabase.username | string | `"root"` | The username of external database |
179179
| externalRegistry.registryPluginName | string | `"zookeeper"` | If exists external registry and set `zookeeper.enable` && `registryEtcd.enabled` && `registryJdbc.enabled` to false, specify the external registry plugin name |
180180
| 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 |
181+
| global | object | `{"security":{"allowInsecureImages":true}}` | Global settings for Bitnami subcharts |
182+
| global.security.allowInsecureImages | bool | `true` | Allow using non-standard container images (required for bitnamilegacy images) |
181183
| image.alert | string | `"dolphinscheduler-alert-server"` | alert-server image |
182184
| image.api | string | `"dolphinscheduler-api"` | api-server image |
183185
| image.master | string | `"dolphinscheduler-master"` | master image |
@@ -272,18 +274,18 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
272274
| mysql.primary.persistence.enabled | bool | `false` | Set mysql.primary.persistence.enabled to true to mount a new volume for internal MySQL |
273275
| mysql.primary.persistence.size | string | `"20Gi"` | `PersistentVolumeClaim` size |
274276
| mysql.primary.persistence.storageClass | string | `"-"` | MySQL data persistent volume storage class. If set to "-", storageClassName: "", which disables dynamic provisioning |
277+
| postgresql.auth.database | string | `"dolphinscheduler"` | The database for internal PostgreSQL |
278+
| postgresql.auth.password | string | `"root"` | The password for internal PostgreSQL |
279+
| postgresql.auth.username | string | `"root"` | The username for internal PostgreSQL |
275280
| postgresql.driverClassName | string | `"org.postgresql.Driver"` | The driverClassName for internal PostgreSQL |
276281
| postgresql.enabled | bool | `true` | If not exists external PostgreSQL, by default, the DolphinScheduler will use a internal PostgreSQL |
277282
| postgresql.image.registry | string | `"docker.io"` | |
278283
| postgresql.image.repository | string | `"bitnamilegacy/postgresql"` | |
279-
| postgresql.image.tag | string | `"11.11.0"` | |
284+
| postgresql.image.tag | string | `"15.1.0-debian-11-r12"` | |
280285
| postgresql.params | string | `"characterEncoding=utf8"` | The params for internal PostgreSQL |
281-
| postgresql.persistence.enabled | bool | `false` | Set postgresql.persistence.enabled to true to mount a new volume for internal PostgreSQL |
282-
| postgresql.persistence.size | string | `"20Gi"` | `PersistentVolumeClaim` size |
283-
| postgresql.persistence.storageClass | string | `"-"` | PostgreSQL data persistent volume storage class. If set to "-", storageClassName: "", which disables dynamic provisioning |
284-
| postgresql.postgresqlDatabase | string | `"dolphinscheduler"` | The database for internal PostgreSQL |
285-
| postgresql.postgresqlPassword | string | `"root"` | The password for internal PostgreSQL |
286-
| postgresql.postgresqlUsername | string | `"root"` | The username for internal PostgreSQL |
286+
| postgresql.primary.persistence.enabled | bool | `false` | Set postgresql.primary.persistence.enabled to true to mount a new volume for internal PostgreSQL |
287+
| postgresql.primary.persistence.size | string | `"20Gi"` | `PersistentVolumeClaim` size |
288+
| postgresql.primary.persistence.storageClass | string | `"-"` | PostgreSQL data persistent volume storage class. If set to "-", storageClassName: "", which disables dynamic provisioning |
287289
| registryEtcd.authority | string | `""` | Etcd authority |
288290
| 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 |
289291
| registryEtcd.endpoints | string | `""` | Etcd endpoints |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,15 +151,15 @@ Create a database environment variables.
151151
{{- end }}
152152
- name: SPRING_DATASOURCE_URL
153153
{{- if .Values.postgresql.enabled }}
154-
value: jdbc:postgresql://{{ template "dolphinscheduler.postgresql.fullname" . }}:5432/{{ .Values.postgresql.postgresqlDatabase }}?{{ .Values.postgresql.params }}
154+
value: jdbc:postgresql://{{ template "dolphinscheduler.postgresql.fullname" . }}:5432/{{ .Values.postgresql.auth.database }}?{{ .Values.postgresql.params }}
155155
{{- else if .Values.mysql.enabled }}
156156
value: jdbc:mysql://{{ template "dolphinscheduler.mysql.fullname" . }}:3306/{{ .Values.mysql.auth.database }}?{{ .Values.mysql.auth.params }}
157157
{{- else }}
158158
value: jdbc:{{ .Values.externalDatabase.type }}://{{ .Values.externalDatabase.host }}:{{ .Values.externalDatabase.port }}/{{ .Values.externalDatabase.database }}?{{ .Values.externalDatabase.params }}
159159
{{- end }}
160160
- name: SPRING_DATASOURCE_USERNAME
161161
{{- if .Values.postgresql.enabled }}
162-
value: {{ .Values.postgresql.postgresqlUsername }}
162+
value: {{ .Values.postgresql.auth.username }}
163163
{{- else if .Values.mysql.enabled }}
164164
value: {{ .Values.mysql.auth.username }}
165165
{{- else }}
@@ -170,7 +170,7 @@ Create a database environment variables.
170170
secretKeyRef:
171171
{{- if .Values.postgresql.enabled }}
172172
name: {{ template "dolphinscheduler.postgresql.fullname" . }}
173-
key: postgresql-password
173+
key: password
174174
{{- else if .Values.mysql.enabled }}
175175
name: {{ template "dolphinscheduler.mysql.fullname" . }}
176176
key: mysql-password

‎deploy/kubernetes/dolphinscheduler/templates/keda-autoscaler-worker.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ spec:
4646
metadata:
4747
host: {{ template "dolphinscheduler.postgresql.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
4848
port: "5432"
49-
dbName: {{ .Values.postgresql.postgresqlDatabase }}
50-
userName: {{ .Values.postgresql.postgresqlUsername }}
49+
dbName: {{ .Values.postgresql.auth.database }}
50+
userName: {{ .Values.postgresql.auth.username }}
5151
passwordFromEnv: SPRING_DATASOURCE_PASSWORD
5252
sslmode: "disable"
5353
targetQueryValue: "1"

‎deploy/kubernetes/dolphinscheduler/values.yaml‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
# This is a YAML-formatted file.
2020
# Declare variables to be passed into your templates.
2121

22+
# -- Global settings for Bitnami subcharts
23+
global:
24+
security:
25+
# -- Allow using non-standard container images (required for bitnamilegacy images)
26+
allowInsecureImages: true
27+
2228
# -- World time and date for cities in all time zones
2329
timezone: "Asia/Shanghai"
2430

@@ -56,27 +62,29 @@ datasource:
5662
postgresql:
5763
# -- If not exists external PostgreSQL, by default, the DolphinScheduler will use a internal PostgreSQL
5864
enabled: true
59-
# -- The username for internal PostgreSQL
60-
postgresqlUsername: "root"
61-
# -- The password for internal PostgreSQL
62-
postgresqlPassword: "root"
63-
# -- The database for internal PostgreSQL
64-
postgresqlDatabase: "dolphinscheduler"
6565
# -- The driverClassName for internal PostgreSQL
6666
driverClassName: "org.postgresql.Driver"
6767
# -- The params for internal PostgreSQL
6868
params: "characterEncoding=utf8"
69-
persistence:
70-
# -- Set postgresql.persistence.enabled to true to mount a new volume for internal PostgreSQL
71-
enabled: false
72-
# -- `PersistentVolumeClaim` size
73-
size: "20Gi"
74-
# -- PostgreSQL data persistent volume storage class. If set to "-", storageClassName: "", which disables dynamic provisioning
75-
storageClass: "-"
69+
auth:
70+
# -- The username for internal PostgreSQL
71+
username: "root"
72+
# -- The password for internal PostgreSQL
73+
password: "root"
74+
# -- The database for internal PostgreSQL
75+
database: "dolphinscheduler"
76+
primary:
77+
persistence:
78+
# -- Set postgresql.primary.persistence.enabled to true to mount a new volume for internal PostgreSQL
79+
enabled: false
80+
# -- `PersistentVolumeClaim` size
81+
size: "20Gi"
82+
# -- PostgreSQL data persistent volume storage class. If set to "-", storageClassName: "", which disables dynamic provisioning
83+
storageClass: "-"
7684
image:
7785
registry: docker.io
7886
repository: bitnamilegacy/postgresql
79-
tag: 11.11.0
87+
tag: 15.1.0-debian-11-r12
8088

8189
mysql:
8290
# -- If not exists external MySQL, by default, the DolphinScheduler will use a internal MySQL

0 commit comments

Comments
 (0)