You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/04/07 05:17:32 UTC
[incubator-inlong] branch master updated: [INLONG-3560][TubeMQ] Fix invalid port names in tubemq pods (#3562)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 8084a5864 [INLONG-3560][TubeMQ] Fix invalid port names in tubemq pods (#3562)
8084a5864 is described below
commit 8084a58641423e8c3abd239ce7ef9d469341ec5e
Author: Yuanhao Ji <ji...@apache.org>
AuthorDate: Thu Apr 7 13:17:26 2022 +0800
[INLONG-3560][TubeMQ] Fix invalid port names in tubemq pods (#3562)
---
docker/kubernetes/templates/tubemq-broker-service.yaml | 4 ++--
docker/kubernetes/templates/tubemq-broker-statefulset.yaml | 4 ++--
docker/kubernetes/templates/tubemq-manager-service.yaml | 2 +-
docker/kubernetes/templates/tubemq-manager-statefulset.yaml | 2 +-
docker/kubernetes/templates/tubemq-master-service.yaml | 6 +++---
docker/kubernetes/templates/tubemq-master-statefulset.yaml | 6 +++---
docker/kubernetes/templates/zookeeper-service.yaml | 6 +++---
docker/kubernetes/templates/zookeeper-statefulset.yaml | 6 +++---
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/docker/kubernetes/templates/tubemq-broker-service.yaml b/docker/kubernetes/templates/tubemq-broker-service.yaml
index 725bdc685..22cf9bbfb 100644
--- a/docker/kubernetes/templates/tubemq-broker-service.yaml
+++ b/docker/kubernetes/templates/tubemq-broker-service.yaml
@@ -28,11 +28,11 @@ metadata:
spec:
type: {{ .Values.tubemqBroker.service.type }}
ports:
- - name: {{ .Values.tubemqBroker.component }}-web-port
+ - name: broker-web-port
protocol: TCP
port: {{ .Values.tubemqBroker.ports.webPort }}
targetPort: 8081
- - name: {{ .Values.tubemqBroker.component }}-rpc-port
+ - name: broker-rpc-port
protocol: TCP
port: {{ .Values.tubemqBroker.ports.rpcPort }}
targetPort: 8123
diff --git a/docker/kubernetes/templates/tubemq-broker-statefulset.yaml b/docker/kubernetes/templates/tubemq-broker-statefulset.yaml
index 390440b95..8d500d658 100644
--- a/docker/kubernetes/templates/tubemq-broker-statefulset.yaml
+++ b/docker/kubernetes/templates/tubemq-broker-statefulset.yaml
@@ -102,9 +102,9 @@ spec:
- >
/config-scripts/run
ports:
- - name: {{ .Values.tubemqBroker.component }}-web-port
+ - name: broker-web-port
containerPort: 8081
- - name: {{ .Values.tubemqBroker.component }}-rpc-port
+ - name: broker-rpc-port
containerPort: 8123
env:
- name: MY_POD_IP
diff --git a/docker/kubernetes/templates/tubemq-manager-service.yaml b/docker/kubernetes/templates/tubemq-manager-service.yaml
index 812aa258d..d12405422 100644
--- a/docker/kubernetes/templates/tubemq-manager-service.yaml
+++ b/docker/kubernetes/templates/tubemq-manager-service.yaml
@@ -26,7 +26,7 @@ metadata:
spec:
type: ClusterIP
ports:
- - name: {{ .Values.tubemqManager.component }}-port
+ - name: tubemq-mgr-port
protocol: TCP
port: {{ .Values.tubemqManager.port }}
targetPort: 8089
diff --git a/docker/kubernetes/templates/tubemq-manager-statefulset.yaml b/docker/kubernetes/templates/tubemq-manager-statefulset.yaml
index ba6f943f0..fd680b685 100644
--- a/docker/kubernetes/templates/tubemq-manager-statefulset.yaml
+++ b/docker/kubernetes/templates/tubemq-manager-statefulset.yaml
@@ -98,6 +98,6 @@ spec:
value: {{ $value | quote }}
{{- end }}
ports:
- - name: {{ .Values.tubemqManager.component }}-port
+ - name: tubemq-mgr-port
containerPort: 8089
restartPolicy: Always
diff --git a/docker/kubernetes/templates/tubemq-master-service.yaml b/docker/kubernetes/templates/tubemq-master-service.yaml
index cc20ce4ba..4ad78149d 100644
--- a/docker/kubernetes/templates/tubemq-master-service.yaml
+++ b/docker/kubernetes/templates/tubemq-master-service.yaml
@@ -28,15 +28,15 @@ metadata:
spec:
type: {{ .Values.tubemqMaster.service.type }}
ports:
- - name: {{ .Values.tubemqMaster.component }}-web-port
+ - name: mstr-web-port
protocol: TCP
port: {{ .Values.tubemqMaster.ports.webPort }}
targetPort: 8080
- - name: {{ .Values.tubemqMaster.component }}-help-port
+ - name: mstr-help-port
protocol: TCP
port: {{ .Values.tubemqMaster.ports.helpPort }}
targetPort: 9001
- - name: {{ .Values.tubemqMaster.component }}-rpc-port
+ - name: mstr-rpc-port
protocol: TCP
port: {{ .Values.tubemqMaster.ports.rpcPort }}
targetPort: 8715
diff --git a/docker/kubernetes/templates/tubemq-master-statefulset.yaml b/docker/kubernetes/templates/tubemq-master-statefulset.yaml
index f30620cb3..f52e77ca6 100644
--- a/docker/kubernetes/templates/tubemq-master-statefulset.yaml
+++ b/docker/kubernetes/templates/tubemq-master-statefulset.yaml
@@ -102,11 +102,11 @@ spec:
- >
/config-scripts/run
ports:
- - name: {{ .Values.tubemqMaster.component }}-web-port
+ - name: mstr-web-port
containerPort: 8080
- - name: {{ .Values.tubemqMaster.component }}-help-port
+ - name: mstr-help-port
containerPort: 9001
- - name: {{ .Values.tubemqMaster.component }}-rpc-port
+ - name: mstr-rpc-port
containerPort: 8715
env:
- name: MY_POD_IP
diff --git a/docker/kubernetes/templates/zookeeper-service.yaml b/docker/kubernetes/templates/zookeeper-service.yaml
index 00cfac253..1f9d49843 100644
--- a/docker/kubernetes/templates/zookeeper-service.yaml
+++ b/docker/kubernetes/templates/zookeeper-service.yaml
@@ -28,15 +28,15 @@ metadata:
spec:
clusterIP: None
ports:
- - name: {{ .Values.zookeeper.component }}-client-port
+ - name: zk-client-port
protocol: TCP
port: {{ .Values.zookeeper.ports.client }}
targetPort: 2181
- - name: {{ .Values.zookeeper.component }}-follower-port
+ - name: zk-comm-port
protocol: TCP
port: {{ .Values.zookeeper.ports.follower }}
targetPort: 2888
- - name: {{ .Values.zookeeper.component }}-leader-election-port
+ - name: zk-elect-port
protocol: TCP
port: {{ .Values.zookeeper.ports.leaderElection }}
targetPort: 3888
diff --git a/docker/kubernetes/templates/zookeeper-statefulset.yaml b/docker/kubernetes/templates/zookeeper-statefulset.yaml
index 7ea5d202b..88ae86de0 100644
--- a/docker/kubernetes/templates/zookeeper-statefulset.yaml
+++ b/docker/kubernetes/templates/zookeeper-statefulset.yaml
@@ -83,11 +83,11 @@ spec:
- >
/config-scripts/run
ports:
- - name: {{ .Values.zookeeper.component }}-client-port
+ - name: zk-client-port
containerPort: 2181
- - name: {{ .Values.zookeeper.component }}-follower-port
+ - name: zk-comm-port
containerPort: 2888
- - name: {{ .Values.zookeeper.component }}-leader-election-port
+ - name: zk-elect-port
containerPort: 3888
env:
- name: ZOOKEEPER_SERVERS