Skip to content

Commit 585fc36

Browse files
authored
Merge branch 'dev' into DSIP-95
2 parents fc9fd1e + 08e7bda commit 585fc36

160 files changed

Lines changed: 2605 additions & 6524 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/unit-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ jobs:
171171
name: SonarCloud Analysis
172172
runs-on: ubuntu-latest
173173
needs: [ paths-filter, unit-test ]
174-
if: ${{ always() && (needs.paths-filter.outputs.not-ignore == 'true' || github.event_name == 'push') }}
174+
if: ${{ needs.unit-test.result == 'success' }}
175175
timeout-minutes: 30
176176
steps:
177177
- uses: actions/checkout@v6
@@ -250,8 +250,8 @@ jobs:
250250
publish-test-results:
251251
name: Publish Test Results
252252
runs-on: ubuntu-latest
253-
needs: unit-test
254-
if: always()
253+
needs: [ paths-filter, unit-test ]
254+
if: ${{ needs.unit-test.result == 'success' }}
255255
steps:
256256
- name: Download all surefire reports
257257
uses: actions/download-artifact@v8

deploy/kubernetes/dolphinscheduler/Chart.yaml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,18 @@ 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
55-
version: 11.4.11
56-
# Same as above.
57-
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
50+
version: 13.8.7
51+
repository: https://charts.bitnami.com/bitnami
5852
condition: zookeeper.enabled
5953
- name: mysql
6054
version: 9.4.1
6155
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
6256
condition: mysql.enabled
6357
- name: minio
64-
version: 11.10.13
58+
version: 11.10.26
6559
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
6660
condition: minio.enabled

deploy/kubernetes/dolphinscheduler/README.md

Lines changed: 10 additions & 8 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 |
@@ -381,7 +383,7 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
381383
| zookeeper.fourlwCommandsWhitelist | string | `"srvr,ruok,wchs,cons"` | A list of comma separated Four Letter Words commands to use |
382384
| zookeeper.image.registry | string | `"docker.io"` | |
383385
| zookeeper.image.repository | string | `"bitnamilegacy/zookeeper"` | |
384-
| zookeeper.image.tag | string | `"3.8.4"` | |
386+
| zookeeper.image.tag | string | `"3.9.3-debian-12-r21"` | |
385387
| zookeeper.persistence.enabled | bool | `false` | Set `zookeeper.persistence.enabled` to true to mount a new volume for internal ZooKeeper |
386388
| zookeeper.persistence.size | string | `"20Gi"` | PersistentVolumeClaim size |
387389
| zookeeper.persistence.storageClass | string | `"-"` | ZooKeeper data persistent volume storage class. If set to "-", storageClassName: "", which disables dynamic provisioning |

0 commit comments

Comments
 (0)