Skip to content

Commit d478b35

Browse files
authored
[Chore] fix k8s e2e (#17553)
1 parent 54e8ede commit d478b35

4 files changed

Lines changed: 37 additions & 10 deletions

File tree

‎.asf.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ github:
4646
- E2E
4747
- Docs
4848
- Frontend Build
49-
# - "E2E-K8S-Result"
49+
- "E2E-K8S-Result"
5050
- "API-Test-Result"
5151
- "Mergeable: milestone-label-check"
5252
- "Title Validator"

‎.github/workflows/e2e-k8s.yml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,11 @@ jobs:
162162
steps:
163163
- name: Status
164164
run: |
165-
exit 0
166-
# if [[ ${{ needs.paths-filter.outputs.not-ignore }} == 'false' && ${{ github.event_name }} == 'pull_request' ]]; then
167-
# echo "Skip E2E-K8S!"
168-
# exit 0
169-
# fi
170-
# if [[ ${{ needs.e2e-k8s.result }} != 'success' ]]; then
171-
# echo "E2E-K8S Failed!"
172-
# exit -1
173-
# fi
165+
if [[ ${{ needs.paths-filter.outputs.not-ignore }} == 'false' && ${{ github.event_name }} == 'pull_request' ]]; then
166+
echo "Skip E2E-K8S!"
167+
exit 0
168+
fi
169+
if [[ ${{ needs.e2e-k8s.result }} != 'success' ]]; then
170+
echo "E2E-K8S Failed!"
171+
exit -1
172+
fi

‎deploy/kubernetes/dolphinscheduler/README.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,18 +250,27 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
250250
| minio.auth.rootUser | string | `"minioadmin"` | minio username |
251251
| minio.defaultBuckets | string | `"dolphinscheduler"` | minio default buckets |
252252
| minio.enabled | bool | `true` | Deploy minio and configure it as the default storage for DolphinScheduler, note this is for demo only, not for production. |
253+
| minio.image.registry | string | `"docker.io"` | |
254+
| minio.image.repository | string | `"bitnamilegacy/minio"` | |
255+
| minio.image.tag | string | `"2022.10.29-debian-11-r0"` | |
253256
| minio.persistence.enabled | bool | `false` | Set minio.persistence.enabled to true to mount a new volume for internal minio |
254257
| mysql.auth.database | string | `"dolphinscheduler"` | mysql database |
255258
| mysql.auth.params | string | `"characterEncoding=utf8"` | mysql params |
256259
| mysql.auth.password | string | `"ds"` | mysql password |
257260
| mysql.auth.username | string | `"ds"` | mysql username |
258261
| mysql.driverClassName | string | `"com.mysql.cj.jdbc.Driver"` | mysql driverClassName |
259262
| mysql.enabled | bool | `false` | If not exists external MySQL, by default, the DolphinScheduler will use a internal MySQL |
263+
| mysql.image.registry | string | `"docker.io"` | |
264+
| mysql.image.repository | string | `"bitnamilegacy/mysql"` | |
265+
| mysql.image.tag | string | `"8.0.31-debian-11-r0"` | |
260266
| mysql.primary.persistence.enabled | bool | `false` | Set mysql.primary.persistence.enabled to true to mount a new volume for internal MySQL |
261267
| mysql.primary.persistence.size | string | `"20Gi"` | `PersistentVolumeClaim` size |
262268
| mysql.primary.persistence.storageClass | string | `"-"` | MySQL data persistent volume storage class. If set to "-", storageClassName: "", which disables dynamic provisioning |
263269
| postgresql.driverClassName | string | `"org.postgresql.Driver"` | The driverClassName for internal PostgreSQL |
264270
| postgresql.enabled | bool | `true` | If not exists external PostgreSQL, by default, the DolphinScheduler will use a internal PostgreSQL |
271+
| postgresql.image.registry | string | `"docker.io"` | |
272+
| postgresql.image.repository | string | `"bitnamilegacy/postgresql"` | |
273+
| postgresql.image.tag | string | `"11.11.0"` | |
265274
| postgresql.params | string | `"characterEncoding=utf8"` | The params for internal PostgreSQL |
266275
| postgresql.persistence.enabled | bool | `false` | Set postgresql.persistence.enabled to true to mount a new volume for internal PostgreSQL |
267276
| postgresql.persistence.size | string | `"20Gi"` | `PersistentVolumeClaim` size |
@@ -361,6 +370,9 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
361370
| worker.updateStrategy | object | `{"type":"RollingUpdate"}` | Update strategy ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies |
362371
| zookeeper.enabled | bool | `true` | If not exists external registry, the zookeeper registry will be used by default. |
363372
| zookeeper.fourlwCommandsWhitelist | string | `"srvr,ruok,wchs,cons"` | A list of comma separated Four Letter Words commands to use |
373+
| zookeeper.image.registry | string | `"docker.io"` | |
374+
| zookeeper.image.repository | string | `"bitnamilegacy/zookeeper"` | |
375+
| zookeeper.image.tag | string | `"3.8.4"` | |
364376
| zookeeper.persistence.enabled | bool | `false` | Set `zookeeper.persistence.enabled` to true to mount a new volume for internal ZooKeeper |
365377
| zookeeper.persistence.size | string | `"20Gi"` | PersistentVolumeClaim size |
366378
| zookeeper.persistence.storageClass | string | `"-"` | ZooKeeper data persistent volume storage class. If set to "-", storageClassName: "", which disables dynamic provisioning |

‎deploy/kubernetes/dolphinscheduler/values.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ postgresql:
7373
size: "20Gi"
7474
# -- PostgreSQL data persistent volume storage class. If set to "-", storageClassName: "", which disables dynamic provisioning
7575
storageClass: "-"
76+
image:
77+
registry: docker.io
78+
repository: bitnamilegacy/postgresql
79+
tag: 11.11.0
7680

7781
mysql:
7882
# -- If not exists external MySQL, by default, the DolphinScheduler will use a internal MySQL
@@ -96,6 +100,10 @@ mysql:
96100
size: "20Gi"
97101
# -- MySQL data persistent volume storage class. If set to "-", storageClassName: "", which disables dynamic provisioning
98102
storageClass: "-"
103+
image:
104+
registry: docker.io
105+
repository: bitnamilegacy/mysql
106+
tag: 8.0.31-debian-11-r0
99107

100108
minio:
101109
# -- 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:
110118
enabled: false
111119
# -- minio default buckets
112120
defaultBuckets: "dolphinscheduler"
121+
image:
122+
registry: docker.io
123+
repository: bitnamilegacy/minio
124+
tag: 2022.10.29-debian-11-r0
113125

114126

115127
externalDatabase:
@@ -148,6 +160,10 @@ zookeeper:
148160
size: "20Gi"
149161
# -- ZooKeeper data persistent volume storage class. If set to "-", storageClassName: "", which disables dynamic provisioning
150162
storageClass: "-"
163+
image:
164+
registry: docker.io
165+
repository: bitnamilegacy/zookeeper
166+
tag: 3.8.4
151167

152168
registryEtcd:
153169
# -- If you want to use Etcd for your registry center, change this value to true. And set zookeeper.enabled to false

0 commit comments

Comments
 (0)