You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ke...@apache.org on 2022/07/05 05:05:06 UTC
[dolphinscheduler-operator] 28/30: Set reasonable default values
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler-operator.git
commit 922fbb310070712d0adb31733cffca080a8b41a9
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Tue Jun 21 20:47:14 2022 +0800
Set reasonable default values
---
README.md | 40 ++++++++++++---------------
config/ds/postgreSQL/postgres-deployment.yaml | 2 +-
config/ds/postgreSQL/postgres-pv.yaml | 4 +--
config/manager/kustomization.yaml | 4 +--
config/samples/ds_v1alpha1_dsalert.yaml | 2 +-
config/samples/ds_v1alpha1_dsapi.yaml | 6 ++--
config/samples/ds_v1alpha1_dsmaster.yaml | 6 ++--
config/samples/ds_v1alpha1_dsworker.yaml | 4 +--
8 files changed, 30 insertions(+), 38 deletions(-)
diff --git a/README.md b/README.md
index 97ee518..5f1cd53 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
# dolphinscheduler-operator
-## feature
+## feature
-1. deployment the master ,worker moudle
-2. scale the pods numbers with one commond
+1. deployment the master ,worker moudle
+2. scale the pods numbers with one commond
3. update the master,worker version quickly (not include the sql)
## Project Status
@@ -43,37 +43,31 @@
if had no zookeeper ,the doployment file is in config/ds/zookeeper ,run *"kubectl apply -f zookeeper/"* and record the ip ,eg :172.17.0.4
-
-4. **create pv and pvc (not required)**
-
- if you had pv and pvc ,you can config it in config/sameples
-
+
+4. **create pv and pvc (not required)**
+
+ if you had pv and pvc ,you can config it in config/sameples
+
or you can create it with config/ds/ds-pv.yaml and config/configmap/ds-pvc.yaml .notice to replace your local document address in hostPath.path in ds-pv.yaml
-
- and you can mount the lib in dolphinscheduler /opt/soft in config/samples/ds_v1alpha1_dsworker.yaml with paramter named lib_pvc_name
-
+
+ and you can mount the lib in dolphinscheduler /opt/soft in config/samples/ds_v1alpha1_dsworker.yaml with paramter named lib_pvc_name
+
mount the logs in /opt/dolphinscheduler/logs with the paramters named log_pvc_name with pvcname
-
+
## how to test
-
+
* replace the database config and zookeeper config paramters in config/samples/*.yaml
* replace the nodeport in *config/samples/ds_v1alpha1_api.yaml*
-
- * in current project run *"make build&&make manifests && make install && make run"*
+
+ * in current project run *"make build && make manifests && make install && make run"*
* cd to config/samples
* first run *"kubectl apply -f ds_v1alpha1_dsalert.yaml "*
* then run *"kubectl apply -f ds_v1alpha1_api.yaml -f ds_v1alpha1_dsmaster.yaml -f ds_v1alpha1_dsworker.yaml "*
-
- ## the result
-
- 
-
+ ## the result
-
-
-
+ 
diff --git a/config/ds/postgreSQL/postgres-deployment.yaml b/config/ds/postgreSQL/postgres-deployment.yaml
index 63d8c43..4ef5c53 100644
--- a/config/ds/postgreSQL/postgres-deployment.yaml
+++ b/config/ds/postgreSQL/postgres-deployment.yaml
@@ -30,4 +30,4 @@ spec:
volumes:
- name: postgredb
persistentVolumeClaim:
- claimName: postgres-pv-claim
\ No newline at end of file
+ claimName: postgres-pv-claim
diff --git a/config/ds/postgreSQL/postgres-pv.yaml b/config/ds/postgreSQL/postgres-pv.yaml
index d655427..d9a1eb4 100644
--- a/config/ds/postgreSQL/postgres-pv.yaml
+++ b/config/ds/postgreSQL/postgres-pv.yaml
@@ -12,5 +12,5 @@ spec:
storage: 2Gi
accessModes:
- ReadWriteMany
- hostPath: #change to your document
- path: "/Volumes/ds/pg/data"
+ hostPath:
+ path: "/var/lib/data"
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index c2c4746..ec7e5d6 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -12,5 +12,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
- newName: nobolity/ds-operator
- newTag: v1alpha1
+ newName: kezhenxu94/controller
+ newTag: test2
diff --git a/config/samples/ds_v1alpha1_dsalert.yaml b/config/samples/ds_v1alpha1_dsalert.yaml
index 56c5647..6bede45 100644
--- a/config/samples/ds_v1alpha1_dsalert.yaml
+++ b/config/samples/ds_v1alpha1_dsalert.yaml
@@ -11,6 +11,6 @@ spec:
repository: apache/dolphinscheduler-alert-server
datasource:
drive_name: "org.postgresql.Driver"
- url: "jdbc:postgresql://172.17.0.4:5432/dolphinscheduler"
+ url: "jdbc:postgresql://postgres-service:5432/dolphinscheduler"
username: "postgresadmin"
password: "admin12345"
diff --git a/config/samples/ds_v1alpha1_dsapi.yaml b/config/samples/ds_v1alpha1_dsapi.yaml
index fef6f69..977b574 100644
--- a/config/samples/ds_v1alpha1_dsapi.yaml
+++ b/config/samples/ds_v1alpha1_dsapi.yaml
@@ -8,11 +8,11 @@ metadata:
spec:
replicas: 1
version: 3.0.0-alpha
- zookeeper_connect: "172.17.0.5:2181"
+ zookeeper_connect: "zookeeper-service:2181"
repository: apache/dolphinscheduler-api
node_port: 30002
datasource:
drive_name: "org.postgresql.Driver"
- url: "jdbc:postgresql://172.17.0.4:5432/dolphinscheduler"
+ url: "jdbc:postgresql://postgres-service:5432/dolphinscheduler"
username: "postgresadmin"
- password: "admin12345"
\ No newline at end of file
+ password: "admin12345"
diff --git a/config/samples/ds_v1alpha1_dsmaster.yaml b/config/samples/ds_v1alpha1_dsmaster.yaml
index de71b27..551aef9 100644
--- a/config/samples/ds_v1alpha1_dsmaster.yaml
+++ b/config/samples/ds_v1alpha1_dsmaster.yaml
@@ -7,17 +7,15 @@ metadata:
app: ds-master
spec:
replicas: 1
- zookeeper_connect: "172.17.0.5:2181"
+ zookeeper_connect: "zookeeper-service:2181"
version: 3.0.0-alpha
repository: apache/dolphinscheduler-master
datasource:
drive_name: "org.postgresql.Driver"
- url: "jdbc:postgresql://172.17.0.4:5432/dolphinscheduler"
+ url: "jdbc:postgresql://postgres-service:5432/dolphinscheduler"
username: "postgresadmin"
password: "admin12345"
# hpa:
# min_replicas: 1
# max_replicas: 5
# mem_average_utilization: 85
-
-
diff --git a/config/samples/ds_v1alpha1_dsworker.yaml b/config/samples/ds_v1alpha1_dsworker.yaml
index 92065f0..f418752 100644
--- a/config/samples/ds_v1alpha1_dsworker.yaml
+++ b/config/samples/ds_v1alpha1_dsworker.yaml
@@ -7,12 +7,12 @@ metadata:
app: ds-worker
spec:
replicas: 1
- zookeeper_connect: "172.17.0.5:2181"
+ zookeeper_connect: "zookeeper-service:2181"
version: 3.0.0-alpha
repository: apache/dolphinscheduler-worker
datasource:
drive_name: "org.postgresql.Driver"
- url: "jdbc:postgresql://172.17.0.4:5432/dolphinscheduler"
+ url: "jdbc:postgresql://postgres-service:5432/dolphinscheduler"
username: "postgresadmin"
password: "admin12345"
pod: