From 2dfc24784534c8487f0862ab24a22d91639dcc85 Mon Sep 17 00:00:00 2001 From: zhuyf Date: Tue, 21 Jun 2022 17:31:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=89=88=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/admin/Dockerfile | 11 +++++ doc/server/Dockerfile | 17 +++++++ .../canal-server-headless-svc-stable.yaml | 24 ++++++++++ .../canal-server-statefulset-stable.yaml | 48 +++++++++++++++++++ doc/server/canal.properties | 11 +++++ doc/server/config.sh | 17 +++++++ doc/server/scbhrainstart.sh | 7 +++ pom.xml | 9 ++-- schbrain-canal-client/pom.xml | 6 +-- schbrain-canal-web/pom.xml | 4 +- .../src/main/resources/application.properties | 13 +++-- 11 files changed, 150 insertions(+), 17 deletions(-) create mode 100644 doc/admin/Dockerfile create mode 100644 doc/server/Dockerfile create mode 100644 doc/server/canal-server-headless-svc-stable.yaml create mode 100644 doc/server/canal-server-statefulset-stable.yaml create mode 100644 doc/server/canal.properties create mode 100644 doc/server/config.sh create mode 100644 doc/server/scbhrainstart.sh diff --git a/doc/admin/Dockerfile b/doc/admin/Dockerfile new file mode 100644 index 0000000..d5ea598 --- /dev/null +++ b/doc/admin/Dockerfile @@ -0,0 +1,11 @@ +FROM canal/osbase:v2 +MAINTAINER zhuyf +LABEL app="canal-admin" by="zhuyf@schbrian.com" + +ADD ./canal-admin /home/canal/ + +ENV TZ='Asia/Shanghai' + +EXPOSE 8089 + +ENTRYPOINT /home/canal/bin/restart.sh \ No newline at end of file diff --git a/doc/server/Dockerfile b/doc/server/Dockerfile new file mode 100644 index 0000000..95f85d6 --- /dev/null +++ b/doc/server/Dockerfile @@ -0,0 +1,17 @@ +FROM canal/osbase:v2 + +MAINTAINER zhuyf + +LABEL app="canal-server" by="zhuyf@schbrian.com" + +ADD ./canal-server /home/canal/ + +ENV TZ='Asia/Shanghai' + +WORKDIR /home/canal/bin + +EXPOSE 11110 +EXPOSE 11111 +EXPOSE 11112 + +ENTRYPOINT /home/canal/bin/scbhrainstart.sh \ No newline at end of file diff --git a/doc/server/canal-server-headless-svc-stable.yaml b/doc/server/canal-server-headless-svc-stable.yaml new file mode 100644 index 0000000..4e43cee --- /dev/null +++ b/doc/server/canal-server-headless-svc-stable.yaml @@ -0,0 +1,24 @@ +apiVersion: v1 +kind: Service +metadata: + name: canal-server-discovery-svc-stable + labels: + app: canal-server-discovery-svc-stable + namespace: devops +spec: + selector: + app: canal-server-stable + ports: + - name: canal-server-discovery-svc-stable-11111-11111 + port: 11111 + protocol: TCP + targetPort: 11111 + - name: canal-server-discovery-svc-stable-11112-11112 + port: 11112 + protocol: TCP + targetPort: 11112 + - name: canal-server-discovery-svc-stable-11110-11110 + port: 11110 + protocol: TCP + targetPort: 11110 + clusterIP: None \ No newline at end of file diff --git a/doc/server/canal-server-statefulset-stable.yaml b/doc/server/canal-server-statefulset-stable.yaml new file mode 100644 index 0000000..424ad40 --- /dev/null +++ b/doc/server/canal-server-statefulset-stable.yaml @@ -0,0 +1,48 @@ +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: canal-server-stable + namespace: devops + labels: + app: canal-server-stable +spec: + selector: + matchLabels: + app: canal-server-stable + serviceName: "canal-server-discovery-svc-stable" + replicas: 2 + template: + metadata: + labels: + app: canal-server-stable + spec: + containers: + - image: registry-vpc.cn-hangzhou.aliyuncs.com/schbrain_online/canal-server:1.16.04 + name: canal-server-stable + imagePullPolicy: Always + ports: + - containerPort: 11110 + protocol: TCP + name: admin + - containerPort: 11111 + protocol: TCP + name: http + - containerPort: 11112 + protocol: TCP + name: metric + resources: + requests: + memory: 100Mi + limits: + memory: 4Gi + volumeMounts: + - mountPath: /home/canal/bin/config.sh + subPath: config.sh + name: server-conf + volumes: + - name: server-conf + configMap: + name: canal-server-stable-conf + defaultMode: 0777 + securityContext: + runAsUser: 0 diff --git a/doc/server/canal.properties b/doc/server/canal.properties new file mode 100644 index 0000000..005c0e2 --- /dev/null +++ b/doc/server/canal.properties @@ -0,0 +1,11 @@ +# register ip +canal.register.ip = +# canal admin config +canal.admin.manager = 127.0.0.1:8089 +canal.admin.port = 11110 +canal.admin.user = admin +canal.admin.passwd = 4ACFE3202A5FF5CF467898FC58AAB1D615029441 +# admin auto register +canal.admin.register.auto = true +canal.admin.register.cluster = +canal.admin.register.name = \ No newline at end of file diff --git a/doc/server/config.sh b/doc/server/config.sh new file mode 100644 index 0000000..0f4e369 --- /dev/null +++ b/doc/server/config.sh @@ -0,0 +1,17 @@ +#!/bin/bash +cat > /home/canal/conf/canal.properties <<- EOF +# register ip +# ${HOSTNAME} 为podname，canal-server-discovery-svc-stable为svc名称 +# StatefulSet类型pod名称是固定的，k8s集群内pod域名规则为pod_name.svc_name.namespace.svc.cluster.local +canal.register.ip = ${HOSTNAME}.canal-server-discovery-svc-stable.devops.svc.cluster.local + +# canal admin config +canal.admin.manager = canal-admin-stable.devops:8089 +canal.admin.port = 11110 +canal.admin.user = admin +canal.admin.passwd = 4ACFE3202A5FF5CF467898FC58AAB1D615029441 +# admin auto register +canal.admin.register.auto = true +canal.admin.register.cluster = schbraintest +EOF +#bash /home/canal/bin/restart.sh \ No newline at end of file diff --git a/doc/server/scbhrainstart.sh b/doc/server/scbhrainstart.sh new file mode 100644 index 0000000..dd7ea88 --- /dev/null +++ b/doc/server/scbhrainstart.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +cp /home/canal/bin/config.sh /home/canal/bin/start.sh + +bash /home/canal/bin/start.sh + +bash /home/canal/bin/restart.sh \ No newline at end of file diff --git a/pom.xml b/pom.xml index 963e03d..5c39704 100644 --- a/pom.xml +++ b/pom.xml @@ -9,17 +9,20 @@ schbrain-parent 1.0.0-SNAPSHOT - pom + pom com.schbrain.framework schbrain-canal - 1.0.0-SNAPSHOT + ${revision} schbrain-canal + + 1.0.0-RELEASE + + schbrain-canal-client schbrain-canal-web - \ No newline at end of file diff --git a/schbrain-canal-client/pom.xml b/schbrain-canal-client/pom.xml index 81c3b51..965c387 100644 --- a/schbrain-canal-client/pom.xml +++ b/schbrain-canal-client/pom.xml @@ -6,16 +6,12 @@ schbrain-canal com.schbrain.framework - 1.0.0-SNAPSHOT + ${revision} schbrain-canal-client - schbrain-canal-client - - - com.alibaba.otter diff --git a/schbrain-canal-web/pom.xml b/schbrain-canal-web/pom.xml index 5cb1919..6203df0 100644 --- a/schbrain-canal-web/pom.xml +++ b/schbrain-canal-web/pom.xml @@ -5,7 +5,7 @@ schbrain-canal com.schbrain.framework - 1.0.0-SNAPSHOT + ${revision} 4.0.0 @@ -20,7 +20,7 @@ com.schbrain.framework schbrain-canal-client - 1.0.0-SNAPSHOT + ${revision} org.springframework.boot diff --git a/schbrain-canal-web/src/main/resources/application.properties b/schbrain-canal-web/src/main/resources/application.properties index 3772c31..cecd338 100644 --- a/schbrain-canal-web/src/main/resources/application.properties +++ b/schbrain-canal-web/src/main/resources/application.properties @@ -5,11 +5,12 @@ canal.client.instances.kp_user.retryCount=10 canal.client.instances.kp_user.zkHosts=192.168.22.22:2181,192.168.22.26:2181,192.168.22.21:2181 #canal.client.instances.screenschbrain.addresses=192.168.36.66:11111 -#canal.client.instances.screenschbrain.username= -#canal.client.instances.screenschbrain.password= -#canal.client.instances.screenschbrain.retryCount=10 -#canal.client.instances.screenschbrain.subscribe=kp_weekly.comment_student -#canal.client.instances.screenschbrain.zkHosts=192.168.22.22:2181,192.168.22.26:2181,192.168.22.21:2181 +canal.client.instances.screenschbrain.username= +canal.client.instances.screenschbrain.password= +canal.client.instances.screenschbrain.retryCount=10 +canal.client.instances.screenschbrain.subscribe=kp_weekly.comment_student +canal.client.instances.screenschbrain.zkHosts=192.168.2.48:2181,192.168.2.47:2181,192.168.2.43:2181 + canal.client.instances.qicheng_czzs.addresses=192.168.36.66:11111 canal.client.instances.qicheng_czzs.username= @@ -20,5 +21,3 @@ canal.client.instances.qicheng_czzs.zkHosts=192.168.22.22:2181,192.168.22.26:218 - - -- GitLab