This is an automated email from the ASF dual-hosted git repository.
wenjun 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 d478b352e8 [Chore] fix k8s e2e (#17553)
d478b352e8 is described below
commit d478b352e807f061fd36abf7e7d8a3e8a83822c9
Author: Gallardot <[email protected]>
AuthorDate: Tue Sep 30 14:06:20 2025 +0800
[Chore] fix k8s e2e (#17553)
---
.asf.yaml | 2 +-
.github/workflows/e2e-k8s.yml | 17 ++++++++---------
deploy/kubernetes/dolphinscheduler/README.md | 12 ++++++++++++
deploy/kubernetes/dolphinscheduler/values.yaml | 16 ++++++++++++++++
4 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index aa1b0673fe..22ebf16cfb 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -46,7 +46,7 @@ github:
- E2E
- Docs
- Frontend Build
-# - "E2E-K8S-Result"
+ - "E2E-K8S-Result"
- "API-Test-Result"
- "Mergeable: milestone-label-check"
- "Title Validator"
diff --git a/.github/workflows/e2e-k8s.yml b/.github/workflows/e2e-k8s.yml
index bc83210d91..ce07939ddd 100644
--- a/.github/workflows/e2e-k8s.yml
+++ b/.github/workflows/e2e-k8s.yml
@@ -162,12 +162,11 @@ jobs:
steps:
- name: Status
run: |
- exit 0
-# if [[ ${{ needs.paths-filter.outputs.not-ignore }} == 'false' &&
${{ github.event_name }} == 'pull_request' ]]; then
-# echo "Skip E2E-K8S!"
-# exit 0
-# fi
-# if [[ ${{ needs.e2e-k8s.result }} != 'success' ]]; then
-# echo "E2E-K8S Failed!"
-# exit -1
-# fi
+ if [[ ${{ needs.paths-filter.outputs.not-ignore }} == 'false' && ${{
github.event_name }} == 'pull_request' ]]; then
+ echo "Skip E2E-K8S!"
+ exit 0
+ fi
+ if [[ ${{ needs.e2e-k8s.result }} != 'success' ]]; then
+ echo "E2E-K8S Failed!"
+ exit -1
+ fi
diff --git a/deploy/kubernetes/dolphinscheduler/README.md
b/deploy/kubernetes/dolphinscheduler/README.md
index ad3de24692..a89dcbc207 100644
--- a/deploy/kubernetes/dolphinscheduler/README.md
+++ b/deploy/kubernetes/dolphinscheduler/README.md
@@ -250,6 +250,9 @@ Please refer to the [Quick Start in
Kubernetes](../../../docs/docs/en/guide/inst
| minio.auth.rootUser | string | `"minioadmin"` | minio username |
| minio.defaultBuckets | string | `"dolphinscheduler"` | minio default buckets
|
| minio.enabled | bool | `true` | Deploy minio and configure it as the default
storage for DolphinScheduler, note this is for demo only, not for production. |
+| minio.image.registry | string | `"docker.io"` | |
+| minio.image.repository | string | `"bitnamilegacy/minio"` | |
+| minio.image.tag | string | `"2022.10.29-debian-11-r0"` | |
| minio.persistence.enabled | bool | `false` | Set minio.persistence.enabled
to true to mount a new volume for internal minio |
| mysql.auth.database | string | `"dolphinscheduler"` | mysql database |
| mysql.auth.params | string | `"characterEncoding=utf8"` | mysql params |
@@ -257,11 +260,17 @@ Please refer to the [Quick Start in
Kubernetes](../../../docs/docs/en/guide/inst
| mysql.auth.username | string | `"ds"` | mysql username |
| mysql.driverClassName | string | `"com.mysql.cj.jdbc.Driver"` | mysql
driverClassName |
| mysql.enabled | bool | `false` | If not exists external MySQL, by default,
the DolphinScheduler will use a internal MySQL |
+| mysql.image.registry | string | `"docker.io"` | |
+| mysql.image.repository | string | `"bitnamilegacy/mysql"` | |
+| mysql.image.tag | string | `"8.0.31-debian-11-r0"` | |
| 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.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.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 |
@@ -361,6 +370,9 @@ Please refer to the [Quick Start in
Kubernetes](../../../docs/docs/en/guide/inst
| worker.updateStrategy | object | `{"type":"RollingUpdate"}` | Update
strategy ref:
https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
|
| zookeeper.enabled | bool | `true` | If not exists external registry, the
zookeeper registry will be used by default. |
| zookeeper.fourlwCommandsWhitelist | string | `"srvr,ruok,wchs,cons"` | A
list of comma separated Four Letter Words commands to use |
+| zookeeper.image.registry | string | `"docker.io"` | |
+| zookeeper.image.repository | string | `"bitnamilegacy/zookeeper"` | |
+| zookeeper.image.tag | string | `"3.8.4"` | |
| zookeeper.persistence.enabled | bool | `false` | Set
`zookeeper.persistence.enabled` to true to mount a new volume for internal
ZooKeeper |
| zookeeper.persistence.size | string | `"20Gi"` | PersistentVolumeClaim size |
| zookeeper.persistence.storageClass | string | `"-"` | ZooKeeper data
persistent volume storage class. If set to "-", storageClassName: "", which
disables dynamic provisioning |
diff --git a/deploy/kubernetes/dolphinscheduler/values.yaml
b/deploy/kubernetes/dolphinscheduler/values.yaml
index 85c112f89f..4a53dc723b 100644
--- a/deploy/kubernetes/dolphinscheduler/values.yaml
+++ b/deploy/kubernetes/dolphinscheduler/values.yaml
@@ -73,6 +73,10 @@ postgresql:
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
mysql:
# -- If not exists external MySQL, by default, the DolphinScheduler will use
a internal MySQL
@@ -96,6 +100,10 @@ mysql:
size: "20Gi"
# -- MySQL data persistent volume storage class. If set to "-",
storageClassName: "", which disables dynamic provisioning
storageClass: "-"
+ image:
+ registry: docker.io
+ repository: bitnamilegacy/mysql
+ tag: 8.0.31-debian-11-r0
minio:
# -- Deploy minio and configure it as the default storage for
DolphinScheduler, note this is for demo only, not for production.
@@ -110,6 +118,10 @@ minio:
enabled: false
# -- minio default buckets
defaultBuckets: "dolphinscheduler"
+ image:
+ registry: docker.io
+ repository: bitnamilegacy/minio
+ tag: 2022.10.29-debian-11-r0
externalDatabase:
@@ -148,6 +160,10 @@ zookeeper:
size: "20Gi"
# -- ZooKeeper data persistent volume storage class. If set to "-",
storageClassName: "", which disables dynamic provisioning
storageClass: "-"
+ image:
+ registry: docker.io
+ repository: bitnamilegacy/zookeeper
+ tag: 3.8.4
registryEtcd:
# -- If you want to use Etcd for your registry center, change this value to
true. And set zookeeper.enabled to false