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 be1c9e80a [INLONG-3553][TubeMQ] Update Helm Chart for latest
configuration (#4121)
be1c9e80a is described below
commit be1c9e80a8b2c039b49302a7fa92d91086de3253
Author: dockerzhang <[email protected]>
AuthorDate: Sun May 8 12:27:40 2022 +0800
[INLONG-3553][TubeMQ] Update Helm Chart for latest configuration (#4121)
Co-authored-by: Yuanhao Ji <[email protected]>
---
docker/kubernetes/Chart.yaml | 2 +-
.../templates/tubemq-broker-configmap.yaml | 18 +--
.../templates/tubemq-broker-ini-configmap.yaml | 8 +-
docker/kubernetes/templates/tubemq-broker-pdb.yaml | 2 +-
.../templates/tubemq-broker-statefulset.yaml | 4 +-
.../templates/tubemq-master-configmap.yaml | 4 +-
.../templates/tubemq-master-ini-configmap.yaml | 12 +-
docker/kubernetes/templates/tubemq-master-pdb.yaml | 2 +-
.../templates/tubemq-master-statefulset.yaml | 4 +-
docker/kubernetes/templates/zookeeper-pdb.yaml | 2 +-
docker/kubernetes/values.yaml | 40 ++---
inlong-tubemq/tubemq-docker/README.md | 5 +-
inlong-tubemq/tubemq-docker/tubemq-k8s/.helmignore | 40 -----
inlong-tubemq/tubemq-docker/tubemq-k8s/Chart.yaml | 31 ----
inlong-tubemq/tubemq-docker/tubemq-k8s/README.md | 50 -------
.../tubemq-docker/tubemq-k8s/templates/_broker.tpl | 34 -----
.../tubemq-k8s/templates/_helpers.yaml | 76 ----------
.../tubemq-docker/tubemq-k8s/templates/_master.tpl | 34 -----
.../tubemq-k8s/templates/_zookeeper.tpl | 34 -----
.../tubemq-k8s/templates/broker-configmap.yaml | 75 ----------
.../tubemq-k8s/templates/broker-ini-configmap.yaml | 49 -------
.../tubemq-k8s/templates/broker-pdb.yaml | 35 -----
.../tubemq-k8s/templates/broker-service.yaml | 39 -----
.../tubemq-k8s/templates/broker-statefulset.yaml | 159 --------------------
.../tubemq-k8s/templates/master-configmap.yaml | 55 -------
.../tubemq-k8s/templates/master-ini-configmap.yaml | 55 -------
.../tubemq-k8s/templates/master-pdb.yaml | 35 -----
.../tubemq-k8s/templates/master-service.yaml | 42 ------
.../tubemq-k8s/templates/master-statefulset.yaml | 161 ---------------------
.../tubemq-k8s/templates/zookeeper-configmap.yaml | 55 -------
.../tubemq-k8s/templates/zookeeper-pdb.yaml | 35 -----
.../tubemq-k8s/templates/zookeeper-service.yaml | 41 ------
.../templates/zookeeper-statefulset.yaml | 143 ------------------
inlong-tubemq/tubemq-docker/tubemq-k8s/values.yaml | 158 --------------------
34 files changed, 50 insertions(+), 1489 deletions(-)
diff --git a/docker/kubernetes/Chart.yaml b/docker/kubernetes/Chart.yaml
index 7afc7c8b0..faf48baac 100644
--- a/docker/kubernetes/Chart.yaml
+++ b/docker/kubernetes/Chart.yaml
@@ -20,7 +20,7 @@ name: inlong
description: A Helm Chart for Apache InLong
type: application
version: 2.0.0
-appVersion: 0.10.0
+appVersion: 1.2.0
home: https://inlong.apache.org
icon: https://inlong.apache.org/img/first-page-bg.png
sources:
diff --git a/docker/kubernetes/templates/tubemq-broker-configmap.yaml
b/docker/kubernetes/templates/tubemq-broker-configmap.yaml
index 8bc01effb..904460f0d 100644
--- a/docker/kubernetes/templates/tubemq-broker-configmap.yaml
+++ b/docker/kubernetes/templates/tubemq-broker-configmap.yaml
@@ -45,28 +45,28 @@ data:
exit 1
fi
# get active master and register broker
+ webPort={{ .Values.tubemqMaster.ports.webPort }}
+ rpcPort={{ .Values.tubemqMaster.ports.rpcPort }}
for ((i=0;i<{{ .Values.tubemqMaster.replicas }};i++)); do
- master="{{ template "inlong.fullname" $ }}-\
- {{ .Values.tubemqMaster.component }}-$i.{{ template "inlong.fullname" $
}}-\
- {{ .Values.tubemqMaster.component }}.{{ .Release.Namespace
}}.svc.cluster.local"
- index=$(curl $master:8080/index.htm)
+ master="{{ template "inlong.fullname" . }}-{{
.Values.tubemqMaster.component }}-$i.{{ template "inlong.tubemqMaster.hostname"
. }}"
+ index=$(curl $master:$webPort/index.htm)
if [[ -n "$index" ]]; then
# add broker
curl -d
"type=op_modify&method=admin_add_broker_configure&brokerId=$MY_POD_ID\
-
&brokerIp=$HOST&brokerPort=8123&deletePolicy=delete,168h&numPartitions=3\
+
&brokerIp=$MY_POD_IP&brokerPort=8123&deletePolicy=delete,168h&numPartitions=3\
&unflushThreshold=1000&acceptPublish=true&acceptSubscribe=true&unflushInterval=10000\
- &createUser=docker&confModAuthToken=abc" http://$master:8080/webapi.htm
+ &createUser=docker&confModAuthToken=abc"
http://$master:$webPort/webapi.htm
# online
curl -d
"type=op_modify&method=admin_online_broker_configure&brokerId=$MY_POD_ID\
- &modifyUser=docker&confModAuthToken=abc" http://$master:8080/webapi.htm
+ &modifyUser=docker&confModAuthToken=abc"
http://$master:$webPort/webapi.htm
fi
# master addresses list
- MASTER_LIST="$master:8715,"$MASTER_LIST
+ MASTER_LIST="$master:$rpcPort,"$MASTER_LIST
done
# generate config file
cp /opt/tubemq-server/conf/broker.ini.raw
/opt/tubemq-server/conf/broker.ini
sed -i "s/REPLACE_BY_POD_ID/$MY_POD_ID/g"
/opt/tubemq-server/conf/broker.ini
- sed -i "s/REPLACE_BY_POD_HOSTNAME/$HOST/g"
/opt/tubemq-server/conf/broker.ini
+ sed -i "s/REPLACE_BY_POD_IP/$MY_POD_IP/g"
/opt/tubemq-server/conf/broker.ini
sed -i "s/REPLACE_BY_MASTER_LIST/${MASTER_LIST%?}/g"
/opt/tubemq-server/conf/broker.ini
# start
/opt/tubemq-server/bin/tubemq.sh broker start
diff --git a/docker/kubernetes/templates/tubemq-broker-ini-configmap.yaml
b/docker/kubernetes/templates/tubemq-broker-ini-configmap.yaml
index c5ddf675d..f194e7c60 100644
--- a/docker/kubernetes/templates/tubemq-broker-ini-configmap.yaml
+++ b/docker/kubernetes/templates/tubemq-broker-ini-configmap.yaml
@@ -26,9 +26,9 @@ data:
broker.ini.raw: |
[broker]
brokerId=REPLACE_BY_POD_ID
- hostName=REPLACE_BY_POD_HOSTNAME
- port=8123
- webPort=8081
+ hostName=REPLACE_BY_POD_IP
+ port={{ .Values.tubemqBroker.ports.rpcPort }}
+ webPort={{ .Values.tubemqBroker.ports.webPort }}
masterAddressList=REPLACE_BY_MASTER_LIST
primaryPath=/data/stage/metadata_REPLACE_BY_POD_ID
maxSegmentSize=1073741824
@@ -39,7 +39,7 @@ data:
[zookeeper]
zkNodeRoot=/tubemq
- zkServerAddr={{ template "inlong.fullname" . }}-{{
.Values.zookeeper.component }}:2181
+ zkServerAddr={{ template "inlong.zookeeper.hostname" . }}:{{
.Values.zookeeper.ports.client }}
zkSessionTimeoutMs=30000
zkConnectionTimeoutMs=30000
zkSyncTimeMs=5000
diff --git a/docker/kubernetes/templates/tubemq-broker-pdb.yaml
b/docker/kubernetes/templates/tubemq-broker-pdb.yaml
index e3c610f25..64b33a980 100644
--- a/docker/kubernetes/templates/tubemq-broker-pdb.yaml
+++ b/docker/kubernetes/templates/tubemq-broker-pdb.yaml
@@ -16,7 +16,7 @@
#
{{- if .Values.tubemqBroker.pdb.usePolicy }}
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
name: {{ template "inlong.fullname" . }}-{{ .Values.tubemqBroker.component }}
diff --git a/docker/kubernetes/templates/tubemq-broker-statefulset.yaml
b/docker/kubernetes/templates/tubemq-broker-statefulset.yaml
index c186753dc..7210abfd5 100644
--- a/docker/kubernetes/templates/tubemq-broker-statefulset.yaml
+++ b/docker/kubernetes/templates/tubemq-broker-statefulset.yaml
@@ -143,8 +143,8 @@ spec:
- name: config
mountPath: /config-scripts
- name: {{ .Values.tubemqBroker.component }}-ini
- mountPath: /opt/tubemq-server/conf/{{
.Values.tubemqBroker.component }}.ini.raw
- subPath: {{ .Values.tubemqBroker.component }}.ini.raw
+ mountPath: /opt/tubemq-server/conf/broker.ini.raw
+ subPath: broker.ini.raw
readOnly: false
volumes:
- name: config
diff --git a/docker/kubernetes/templates/tubemq-master-configmap.yaml
b/docker/kubernetes/templates/tubemq-master-configmap.yaml
index 36b67576c..d47052e80 100644
--- a/docker/kubernetes/templates/tubemq-master-configmap.yaml
+++ b/docker/kubernetes/templates/tubemq-master-configmap.yaml
@@ -29,7 +29,7 @@ data:
ready: |
#!/bin/sh
- curl 127.0.0.1:8080/index.htm
+ curl 127.0.0.1:{{ .Values.tubemqMaster.ports.webPort }}/index.htm
run: |
#!/bin/bash
@@ -47,7 +47,7 @@ data:
# generate config file
cp /opt/tubemq-server/conf/master.ini.raw
/opt/tubemq-server/conf/master.ini
sed -i "s/REPLACE_BY_POD_ID/$MY_POD_ID/g"
/opt/tubemq-server/conf/master.ini
- sed -i "s/REPLACE_BY_POD_HOSTNAME/$HOST.{{ template "inlong.fullname" .
}}-{{ .Values.tubemqMaster.component }}.{{ .Release.Name
}}.svc.cluster.local/g" /opt/tubemq-server/conf/master.ini
+ sed -i "s/REPLACE_BY_POD_HOSTNAME/{{ template
"inlong.tubemqMaster.hostname" . }}/g" /opt/tubemq-server/conf/master.ini
# start master
/opt/tubemq-server/bin/tubemq.sh master start
tail -F /opt/tubemq-server/logs/master.log
diff --git a/docker/kubernetes/templates/tubemq-master-ini-configmap.yaml
b/docker/kubernetes/templates/tubemq-master-ini-configmap.yaml
index 96e238950..614f8253d 100644
--- a/docker/kubernetes/templates/tubemq-master-ini-configmap.yaml
+++ b/docker/kubernetes/templates/tubemq-master-ini-configmap.yaml
@@ -26,8 +26,8 @@ data:
master.ini.raw: |
[master]
hostName=REPLACE_BY_POD_HOSTNAME
- port=8715
- webPort=8080
+ port={{ .Values.tubemqMaster.ports.rpcPort }}
+ webPort={{ .Values.tubemqMaster.ports.webPort }}
consumerBalancePeriodMs=30000
firstBalanceDelayAfterStartMs=60000
consumerHeartbeatTimeoutMs=30000
@@ -38,9 +38,9 @@ data:
metaDataPath=/data/meta_data
useWebProxy=true
- [zookeeper]
+ [meta_zookeeper]
zkNodeRoot=/tubemq
- zkServerAddr={{ template "inlong.fullname" . }}-{{
.Values.zookeeper.component }}:2181
+ zkServerAddr={{ template "inlong.zookeeper.hostname" . }}:{{
.Values.zookeeper.ports.client }}
zkSessionTimeoutMs=30000
zkConnectionTimeoutMs=30000
zkSyncTimeMs=5000
@@ -49,5 +49,5 @@ data:
[replication]
repGroupName={{ template "inlong.fullname" . }}-{{
.Values.tubemqMaster.component }}
repNodeName={{ template "inlong.fullname" . }}-{{
.Values.tubemqMaster.component }}-REPLACE_BY_POD_ID
- repNodePort=9001
- repHelperHost={{ template "inlong.fullname" . }}-{{
.Values.tubemqMaster.component }}-0.{{ template "inlong.fullname" . }}-{{
.Values.tubemqMaster.component }}.{{ .Release.Name }}.svc.cluster.local:9001
+ repNodePort={{ .Values.tubemqMaster.ports.helpPort }}
+ repHelperHost={{ template "inlong.fullname" . }}-{{
.Values.tubemqMaster.component }}-0.{{ template "inlong.tubemqMaster.hostname"
. }}:{{ .Values.tubemqMaster.ports.helpPort }}
diff --git a/docker/kubernetes/templates/tubemq-master-pdb.yaml
b/docker/kubernetes/templates/tubemq-master-pdb.yaml
index f1569b03c..72a948d4b 100644
--- a/docker/kubernetes/templates/tubemq-master-pdb.yaml
+++ b/docker/kubernetes/templates/tubemq-master-pdb.yaml
@@ -16,7 +16,7 @@
#
{{- if .Values.tubemqMaster.pdb.usePolicy }}
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
name: {{ template "inlong.fullname" . }}-{{ .Values.tubemqMaster.component }}
diff --git a/docker/kubernetes/templates/tubemq-master-statefulset.yaml
b/docker/kubernetes/templates/tubemq-master-statefulset.yaml
index f1690dac0..f06b93729 100644
--- a/docker/kubernetes/templates/tubemq-master-statefulset.yaml
+++ b/docker/kubernetes/templates/tubemq-master-statefulset.yaml
@@ -145,8 +145,8 @@ spec:
- name: config
mountPath: /config-scripts
- name: {{ .Values.tubemqMaster.component }}-ini
- mountPath: /opt/tubemq-server/conf/{{
.Values.tubemqMaster.component }}.ini.raw
- subPath: {{ .Values.tubemqMaster.component }}.ini.raw
+ mountPath: /opt/tubemq-server/conf/master.ini.raw
+ subPath: master.ini.raw
readOnly: false
volumes:
- name: config
diff --git a/docker/kubernetes/templates/zookeeper-pdb.yaml
b/docker/kubernetes/templates/zookeeper-pdb.yaml
index 0b6890f81..4cd82a8a7 100644
--- a/docker/kubernetes/templates/zookeeper-pdb.yaml
+++ b/docker/kubernetes/templates/zookeeper-pdb.yaml
@@ -16,7 +16,7 @@
#
{{- if .Values.zookeeper.pdb.usePolicy }}
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
name: {{ template "inlong.fullname" . }}-{{ .Values.zookeeper.component }}
diff --git a/docker/kubernetes/values.yaml b/docker/kubernetes/values.yaml
index a781d0596..7e67773f1 100644
--- a/docker/kubernetes/values.yaml
+++ b/docker/kubernetes/values.yaml
@@ -91,8 +91,8 @@ agent:
# For more details, please check out
https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
resources:
requests:
- cpu: 1
- memory: "1Gi"
+ cpu: 0.5
+ memory: "512Mi"
# The agent service port
port: 8008
env:
@@ -137,8 +137,8 @@ dashboard:
# For more details, please check out
https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
resources:
requests:
- cpu: 1
- memory: "1Gi"
+ cpu: 0.5
+ memory: "512Mi"
# The dashboard service port
port: 80
service:
@@ -189,8 +189,8 @@ dataproxy:
# For more details, please check out
https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
resources:
requests:
- cpu: 1
- memory: "1Gi"
+ cpu: 0.5
+ memory: "512Mi"
# The dataproxy service port
port: 46801
service:
@@ -247,8 +247,8 @@ tubemqManager:
# For more details, please check out
https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
resources:
requests:
- cpu: 1
- memory: "1Gi"
+ cpu: 0.5
+ memory: "512Mi"
# The tubemq manager service port
port: 8089
env:
@@ -292,8 +292,8 @@ manager:
# For more details, please check out
https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
resources:
requests:
- cpu: 1
- memory: "1Gi"
+ cpu: 0.5
+ memory: "512Mi"
# The manager service port
port: 8083
service:
@@ -352,8 +352,8 @@ audit:
# For more details, please check out
https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
resources:
requests:
- cpu: 1
- memory: "1Gi"
+ cpu: 0.5
+ memory: "512Mi"
# The audit service port
port: 10081
env:
@@ -397,8 +397,8 @@ mysql:
# For more details, please check out
https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
resources:
requests:
- cpu: 1
- memory: "1Gi"
+ cpu: 0.5
+ memory: "512Mi"
# The mysql service port
port: 3306
username: "root"
@@ -443,8 +443,8 @@ zookeeper:
# For more details, please check out
https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
resources:
requests:
- cpu: 1
- memory: "1Gi"
+ cpu: 0.5
+ memory: "512Mi"
# The zookeeper service ports
ports:
client: 2181
@@ -505,8 +505,8 @@ tubemqMaster:
# For more details, please check out
https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
resources:
requests:
- cpu: 1
- memory: "1Gi"
+ cpu: 0.5
+ memory: "512Mi"
# The tubemq master service ports
ports:
rpcPort: 8715
@@ -586,8 +586,8 @@ tubemqBroker:
# For more details, please check out
https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
resources:
requests:
- cpu: 1
- memory: "1Gi"
+ cpu: 0.5
+ memory: "512Mi"
# The tubemq broker service ports
ports:
rpcPort: 8123
diff --git a/inlong-tubemq/tubemq-docker/README.md
b/inlong-tubemq/tubemq-docker/README.md
index 5c250b047..1dc3b22ca 100644
--- a/inlong-tubemq/tubemq-docker/README.md
+++ b/inlong-tubemq/tubemq-docker/README.md
@@ -2,7 +2,4 @@
##### Maven build for docker image
```
mvn -f ../pom.xml clean install -DskipTests -Pdocker
-```
-
-##### InLong TubeMQ on Kubernetes
-[the Helm Chart for TubeMQ](tubemq-k8s/README.md)
\ No newline at end of file
+```
\ No newline at end of file
diff --git a/inlong-tubemq/tubemq-docker/tubemq-k8s/.helmignore
b/inlong-tubemq/tubemq-docker/tubemq-k8s/.helmignore
deleted file mode 100644
index e172f72db..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/.helmignore
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
diff --git a/inlong-tubemq/tubemq-docker/tubemq-k8s/Chart.yaml
b/inlong-tubemq/tubemq-docker/tubemq-k8s/Chart.yaml
deleted file mode 100644
index d5e090089..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/Chart.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-apiVersion: v1
-description: a trillion-records-scale distributed messaging queue (MQ) system
-name: tubemq-k8s
-version: 1.0.0
-appVersion: 0.5.0
-home: https://inlong.apache.org/
-sources:
-- https://github.com/apache/incubator-inlong
-icon: https://inlong.apache.org/img/first-page-bg.png
-maintainers:
-- name: dockerzhang
- email: [email protected]
\ No newline at end of file
diff --git a/inlong-tubemq/tubemq-docker/tubemq-k8s/README.md
b/inlong-tubemq/tubemq-docker/tubemq-k8s/README.md
deleted file mode 100644
index 57930eda3..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/README.md
+++ /dev/null
@@ -1,50 +0,0 @@
-### the Helm Chart for TubeMQ
-This helm chart provides an implementation of the TubeMQ StatefulSet, include
Master/Broker/ZooKeeper services.
-
-#### Prerequisites
-- Kubernetes 1.10+
-- Helm 3.0+
-- A dynamic provisioner for the PersistentVolumes(`production environment`)
-
-#### Installing the Chart
-You can install the chart with the release name `tubemq` as below.
-```
-$ kubectl create namespace tubemq
-$ helm upgrade tubemq --install -n tubemq ./
-```
-Installed Components
-You can use `kubectl get po -n tubemq` to view all of the installed
components.
-```
-NAME READY STATUS RESTARTS AGE
-tubemq-k8s-broker-0 1/1 Running 0 2m36s
-tubemq-k8s-broker-1 1/1 Running 0 54s
-tubemq-k8s-broker-2 1/1 Running 0 30s
-tubemq-k8s-master-0 1/1 Running 0 2m36s
-tubemq-k8s-zookeeper-0 1/1 Running 0 2m36s
-tubemq-k8s-zookeeper-1 1/1 Running 0 116s
-tubemq-k8s-zookeeper-2 1/1 Running 0 86s
-```
-#### Configuration
-The following table lists the configurable parameters of the `tubemq-k8s`
chart and their default values.
-| Parameter | Description | Default |
-| :--: | :--:| :--: |
-| images.tubemq_all.repository | Container image repository |
inlong/tubemq-all |
-| images.tubemq_all.tag | Container image tag | latest |
-| images.tubemq_all.pullPolicy | Container pull policy | `IfNotPresent ` |
-| volumes.persistence | Using Persistent | false |
-| volumes.storageClassName | Persistent volume storage class |
`"local-storage"` |
-| affinity.anti_affinity | Container image repository | false |
-
-You can specify each parameter using the `--set key=value[,key=value]`
argument to helm install.For example,
-```
-$ helm upgrade tubemq --install --set master.ports.webNodePort=8081 -n tubemq
./
-```
-
-#### Uninstall
-```
-$ helm uninstall tubemq -n tubemq
-```
-You can delete all `PVC ` if any persistent volume claims used, it will lost
all data.
-```
-$ kubectl delete pvc -n tubemq --all
-```
\ No newline at end of file
diff --git a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/_broker.tpl
b/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/_broker.tpl
deleted file mode 100644
index 17afc0ffc..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/_broker.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{{/*
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-*/}}
-
-{{/*
-Define the tubemq broker
-*/}}
-{{- define "tubemq.broker.service" -}}
-{{ template "tubemq.fullname" . }}-{{ .Values.broker.component }}
-{{- end }}
-
-{{/*
-Define the broker hostname
-*/}}
-{{- define "tubemq.broker.hostname" -}}
-${HOSTNAME}.{{ template "tubemq.broker.service" . }}.{{ .Release.Namespace
}}.svc.cluster.local
-{{- end -}}
\ No newline at end of file
diff --git a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/_helpers.yaml
b/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/_helpers.yaml
deleted file mode 100644
index c525cd23d..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/_helpers.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-{{/*
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-*/}}
-
-{{/* vim: set filetype=mustache: */}}
- {{/*
-Expand the name of the chart.
-*/}}
- {{- define "tubemq.name" -}}
- {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
- {{- end -}}
-
- {{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to
this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
- {{- define "tubemq.fullname" -}}
- {{- if .Values.fullnameOverride -}}
- {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
- {{- else -}}
- {{- .Chart.Name | trunc 63 | trimSuffix "-" -}}
- {{- end -}}
- {{- end -}}
-
- {{/*
-Create chart name and version as used by the chart label.
-*/}}
- {{- define "tubemq.chart" -}}
- {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 |
trimSuffix "-" -}}
- {{- end -}}
-
- {{/*
-Create the common labels.
-*/}}
- {{- define "tubemq.standardLabels" -}}
-app: {{ template "tubemq.name" . }}
-chart: {{ template "tubemq.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
-cluster: {{ template "tubemq.fullname" . }}
- {{- end }}
-
- {{/*
-Create the template labels.
-*/}}
- {{- define "tubemq.template.labels" -}}
-app: {{ template "tubemq.name" . }}
-release: {{ .Release.Name }}
-cluster: {{ template "tubemq.fullname" . }}
- {{- end }}
-
- {{/*
-Create the match labels.
-*/}}
- {{- define "tubemq.matchLabels" -}}
-app: {{ template "tubemq.name" . }}
-release: {{ .Release.Name }}
- {{- end }}
\ No newline at end of file
diff --git a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/_master.tpl
b/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/_master.tpl
deleted file mode 100644
index 0e84b6943..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/_master.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{{/*
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-*/}}
-
-{{/*
-Define the tubemq master
-*/}}
-{{- define "tubemq.master.service" -}}
-{{ template "tubemq.fullname" . }}-{{ .Values.master.component }}
-{{- end }}
-
-{{/*
-Define the master hostname
-*/}}
-{{- define "tubemq.master.hostname" -}}
-${HOSTNAME}.{{ template "tubemq.master.service" . }}.{{ .Release.Namespace
}}.svc.cluster.local
-{{- end -}}
\ No newline at end of file
diff --git a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/_zookeeper.tpl
b/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/_zookeeper.tpl
deleted file mode 100644
index 59d0bdabb..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/_zookeeper.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{{/*
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-*/}}
-
-{{/*
-Define the tubemq zookeeper
-*/}}
-{{- define "tubemq.zookeeper.service" -}}
-{{ template "tubemq.fullname" . }}-{{ .Values.zookeeper.component }}
-{{- end }}
-
-{{/*
-Define the zookeeper hostname
-*/}}
-{{- define "tubemq.zookeeper.hostname" -}}
-${HOSTNAME}.{{ template "tubemq.zookeeper.service" . }}.{{ .Release.Namespace
}}.svc.cluster.local
-{{- end -}}
\ No newline at end of file
diff --git
a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/broker-configmap.yaml
b/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/broker-configmap.yaml
deleted file mode 100644
index 3ae62d3eb..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/broker-configmap.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: "{{ template "tubemq.fullname" . }}-{{ .Values.broker.component }}"
- namespace: {{ .Release.Namespace }}
- labels:
- component: {{ .Values.broker.component }}
-data:
- ok: |
- #!/bin/sh
- /opt/tubemq-server/bin/tubemq broker status
-
- ready: |
- #!/bin/sh
- /opt/tubemq-server/bin/tubemq broker status
-
- run: |
- #!/bin/bash
- set -a
- # get pod index
- HOST=$(hostname)
- if [[ $HOST =~ (.*)-([0-9]+)$ ]]; then
- NAME=${BASH_REMATCH[1]}
- ORD=${BASH_REMATCH[2]}
- MY_POD_ID=$((ORD+1))
- else
- echo "Failed to extract ordinal from hostname $HOST"
- exit 1
- fi
- # get active master and register broker
- for ((i=0;i<{{ .Values.master.replicaCount }};i++)); do
- master="{{ template "tubemq.fullname" $ }}-\
- {{ .Values.master.component }}-$i.{{ template "tubemq.fullname" $ }}-\
- {{ .Values.master.component }}.{{ .Release.Namespace }}.svc.cluster.local"
- index=$(curl $master:8080/index.htm)
- if [[ -n "$index" ]]; then
- # add broker
- curl -d
"type=op_modify&method=admin_add_broker_configure&brokerId=$MY_POD_ID\
-
&brokerIp=$HOST&brokerPort=8123&deletePolicy=delete,168h&numPartitions=3\
-
&unflushThreshold=1000&acceptPublish=true&acceptSubscribe=true&unflushInterval=10000\
- &createUser=docker&confModAuthToken=abc" http://$master:8080/webapi.htm
- # online
- curl -d
"type=op_modify&method=admin_online_broker_configure&brokerId=$MY_POD_ID\
- &modifyUser=docker&confModAuthToken=abc" http://$master:8080/webapi.htm
- fi
- # master addresses list
- MASTER_LIST="$master:8715,"$MASTER_LIST
- done
- # generate config file
- cp /opt/tubemq-server/conf/broker.ini.raw
/opt/tubemq-server/conf/broker.ini
- sed -i "s/REPLACE_BY_POD_ID/$MY_POD_ID/g"
/opt/tubemq-server/conf/broker.ini
- sed -i "s/REPLACE_BY_POD_HOSTNAME/$HOST/g"
/opt/tubemq-server/conf/broker.ini
- sed -i "s/REPLACE_BY_MASTER_LIST/${MASTER_LIST%?}/g"
/opt/tubemq-server/conf/broker.ini
- # start
- /opt/tubemq-server/bin/tubemq broker start
- tail -F /opt/tubemq-server/logs/broker.log
\ No newline at end of file
diff --git
a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/broker-ini-configmap.yaml
b/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/broker-ini-configmap.yaml
deleted file mode 100644
index 3ce21978e..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/broker-ini-configmap.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: "{{ template "tubemq.fullname" . }}-{{ .Values.broker.component }}-ini"
- namespace: {{ .Release.Namespace }}
- labels:
- component: {{ .Values.broker.component }}
-data:
- broker.ini.raw: |
- [broker]
- brokerId=REPLACE_BY_POD_ID
- hostName=REPLACE_BY_POD_HOSTNAME
- port=8123
- webPort=8081
- masterAddressList=REPLACE_BY_MASTER_LIST
- primaryPath=/data/stage/metadata_REPLACE_BY_POD_ID
- maxSegmentSize=1073741824
- maxIndexSegmentSize=22020096
- transferSize= 524288
- loadMessageStoresInParallel=true
- consumerRegTimeoutMs=35000
-
- [zookeeper]
- zkNodeRoot=/tubemq
- zkServerAddr={{ template "tubemq.fullname" . }}-{{
.Values.zookeeper.component }}:2181
- zkSessionTimeoutMs=30000
- zkConnectionTimeoutMs=30000
- zkSyncTimeMs=5000
- zkCommitPeriodMs=5000
- zkCommitFailRetries=10
diff --git a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/broker-pdb.yaml
b/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/broker-pdb.yaml
deleted file mode 100644
index 184c44095..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/broker-pdb.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-{{- if .Values.broker.pdb.usePolicy }}
-apiVersion: policy/v1beta1
-kind: PodDisruptionBudget
-metadata:
- name: "{{ template "tubemq.fullname" . }}-{{ .Values.broker.component }}"
- namespace: {{ .Release.Namespace }}
- labels:
- {{- include "tubemq.standardLabels" . | nindent 4 }}
- component: {{ .Values.broker.component }}
-spec:
- selector:
- matchLabels:
- {{- include "tubemq.matchLabels" . | nindent 6 }}
- component: {{ .Values.broker.component }}
- maxUnavailable: {{ .Values.broker.pdb.maxUnavailable }}
-{{- end }}
diff --git
a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/broker-service.yaml
b/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/broker-service.yaml
deleted file mode 100644
index 89002bc68..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/broker-service.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-apiVersion: v1
-kind: Service
-metadata:
- name: "{{ template "tubemq.fullname" . }}-{{ .Values.broker.component }}"
- namespace: {{ .Release.Namespace }}
- labels:
- {{- include "tubemq.standardLabels" . | nindent 4 }}
- component: {{ .Values.broker.component }}
- annotations:
-{{ toYaml .Values.broker.service.annotations | indent 4 }}
-spec:
- type: {{ .Values.broker.service.type }}
- ports:
- - name: web-port
- port: {{ .Values.broker.ports.webPort }}
- - name: rpc-port
- port: {{ .Values.broker.ports.rpcPort }}
- selector:
- {{- include "tubemq.matchLabels" . | nindent 4 }}
- component: {{ .Values.broker.component }}
\ No newline at end of file
diff --git
a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/broker-statefulset.yaml
b/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/broker-statefulset.yaml
deleted file mode 100644
index 8032b22e9..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/broker-statefulset.yaml
+++ /dev/null
@@ -1,159 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
- name: "{{ template "tubemq.fullname" . }}-{{ .Values.broker.component }}"
- namespace: {{ .Release.Namespace }}
- labels:
- {{- include "tubemq.standardLabels" . | nindent 4 }}
- component: {{ .Values.broker.component }}
-spec:
- serviceName: "{{ template "tubemq.fullname" . }}-{{ .Values.broker.component
}}"
- replicas: {{ .Values.broker.replicaCount }}
- selector:
- matchLabels:
- {{- include "tubemq.matchLabels" . | nindent 6 }}
- component: {{ .Values.broker.component }}
- updateStrategy:
-{{ toYaml .Values.broker.updateStrategy | indent 4 }}
- podManagementPolicy: {{ .Values.broker.podManagementPolicy }}
- template:
- metadata:
- labels:
- {{- include "tubemq.template.labels" . | nindent 8 }}
- component: {{ .Values.broker.component }}
- annotations:
-{{ toYaml .Values.broker.annotations | indent 8 }}
- spec:
- {{- if .Values.broker.nodeSelector }}
- nodeSelector:
-{{ toYaml .Values.broker.nodeSelector | indent 8 }}
- {{- end }}
- {{- if .Values.broker.tolerations }}
- tolerations:
-{{ toYaml .Values.broker.tolerations | indent 8 }}
- {{- end }}
- initContainers:
- - name: wait-master-ready
- image: "{{ .Values.images.tubemq_all.repository }}:{{
.Values.images.tubemq_all.tag }}"
- imagePullPolicy: {{ .Values.images.tubemq_all.pullPolicy }}
- command: ["/bin/bash", "-c"]
- args:
- - >-
- for ((i=0;i<{{ .Values.master.replicaCount }};i++)); do
- until curl {{ template "tubemq.fullname" $ }}-{{
.Values.master.component }}-$i.{{ template "tubemq.fullname" $ }}-{{
.Values.master.component }}.{{ .Release.Namespace
}}.svc.cluster.local:${1:-8080}/index.htm; do
- sleep 3; done; done;
- affinity:
- {{- if .Values.affinity.anti_affinity}}
- podAntiAffinity:
- requiredDuringSchedulingIgnoredDuringExecution:
- - labelSelector:
- matchExpressions:
- - key: "app"
- operator: In
- values:
- - "{{ template "tubemq.name" . }}-{{ .Values.broker.component
}}"
- - key: "release"
- operator: In
- values:
- - {{ .Release.Name }}
- - key: "component"
- operator: In
- values:
- - {{ .Values.broker.component }}
- topologyKey: "kubernetes.io/hostname"
- {{- end }}
- terminationGracePeriodSeconds: {{ .Values.broker.gracePeriod }}
- containers:
- - name: "{{ template "tubemq.fullname" . }}-{{ .Values.broker.component
}}"
- image: "{{ .Values.images.tubemq_all.repository }}:{{
.Values.images.tubemq_all.tag }}"
- imagePullPolicy: {{ .Values.images.tubemq_all.pullPolicy }}
- {{- if .Values.broker.resources }}
- resources:
-{{ toYaml .Values.broker.resources | indent 10 }}
- {{- end }}
- command: ["sh", "-c"]
- args:
- - >
- /config-scripts/run;
- ports:
- - name: web-port
- containerPort: {{ .Values.broker.ports.webPort }}
- - name: rpc-port
- containerPort: {{ .Values.broker.ports.rpcPort }}
- env:
- - name: MY_POD_IP
- valueFrom:
- fieldRef:
- fieldPath: status.podIP
- {{- if .Values.broker.probe.readiness.enabled }}
- readinessProbe:
- exec:
- command:
- - /config-scripts/ready
- initialDelaySeconds: {{
.Values.broker.probe.readiness.initialDelaySeconds }}
- periodSeconds: {{ .Values.broker.probe.readiness.periodSeconds }}
- failureThreshold: {{ .Values.broker.probe.readiness.failureThreshold
}}
- {{- end }}
- {{- if .Values.broker.probe.liveness.enabled }}
- livenessProbe:
- exec:
- command:
- - /config-scripts/ok
- initialDelaySeconds: {{
.Values.broker.probe.liveness.initialDelaySeconds }}
- periodSeconds: {{ .Values.broker.probe.liveness.periodSeconds }}
- failureThreshold: {{ .Values.broker.probe.liveness.failureThreshold
}}
- {{- end }}
- volumeMounts:
- - name: "{{ template "tubemq.fullname" . }}-{{
.Values.broker.component }}-{{ .Values.broker.volumes.data.name }}"
- mountPath: /data
- - name: config
- mountPath: /config-scripts
- - name: {{ .Values.broker.component }}-ini
- mountPath: /opt/tubemq-server/conf/{{ .Values.broker.component
}}.ini.raw
- subPath: {{ .Values.broker.component }}.ini.raw
- readOnly: false
- volumes:
- - name: config
- configMap:
- name: "{{ template "tubemq.fullname" . }}-{{
.Values.broker.component }}"
- defaultMode: 0755
- - name: {{ .Values.broker.component }}-ini
- configMap:
- name: "{{ template "tubemq.fullname" . }}-{{
.Values.broker.component }}-ini"
- defaultMode: 0644
- {{- if not .Values.volumes.persistence }}
- - name: "{{ template "tubemq.fullname" . }}-{{ .Values.broker.component
}}-{{ .Values.broker.volumes.data.name }}"
- emptyDir: {}
- {{- end }}
-{{- if .Values.volumes.persistence }}
- volumeClaimTemplates:
- - metadata:
- name: "{{ template "tubemq.fullname" . }}-{{ .Values.broker.component
}}-{{ .Values.broker.volumes.data.name }}"
- spec:
- accessModes: [ "ReadWriteOnce" ]
- resources:
- requests:
- storage: {{ .Values.broker.volumes.data.size }}
- {{- if .Values.volumes.storageClassName }}
- storageClassName: "{{ .Values.volumes.storageClassName }}"
- {{- end }}
-{{- end }}
\ No newline at end of file
diff --git
a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/master-configmap.yaml
b/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/master-configmap.yaml
deleted file mode 100644
index 21acca782..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/master-configmap.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: "{{ template "tubemq.fullname" . }}-{{ .Values.master.component }}"
- namespace: {{ .Release.Namespace }}
- labels:
- component: {{ .Values.master.component }}
-data:
- ok: |
- #!/bin/sh
- /opt/tubemq-server/bin/tubemq master status
-
- ready: |
- #!/bin/sh
- curl 127.0.0.1:8080/index.htm
-
- run: |
- #!/bin/bash
- set -a
- # get pod index
- HOST=$(hostname)
- if [[ $HOST =~ (.*)-([0-9]+)$ ]]; then
- NAME=${BASH_REMATCH[1]}
- ORD=${BASH_REMATCH[2]}
- MY_POD_ID=$((ORD+1))
- else
- echo "Failed to extract ordinal from hostname $HOST"
- exit 1
- fi
- # generate config file
- cp /opt/tubemq-server/conf/master.ini.raw
/opt/tubemq-server/conf/master.ini
- sed -i "s/REPLACE_BY_POD_ID/$MY_POD_ID/g"
/opt/tubemq-server/conf/master.ini
- sed -i "s/REPLACE_BY_POD_HOSTNAME/$HOST.{{ template "tubemq.fullname" .
}}-{{ .Values.master.component }}.{{ .Release.Name }}.svc.cluster.local/g"
/opt/tubemq-server/conf/master.ini
- # start master
- /opt/tubemq-server/bin/tubemq master start
- tail -F /opt/tubemq-server/logs/master.log
\ No newline at end of file
diff --git
a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/master-ini-configmap.yaml
b/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/master-ini-configmap.yaml
deleted file mode 100644
index 8cf138ab3..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/master-ini-configmap.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: "{{ template "tubemq.fullname" . }}-{{ .Values.master.component }}-ini"
- namespace: {{ .Release.Namespace }}
- labels:
- component: {{ .Values.master.component }}
-data:
- master.ini.raw: |
- [master]
- hostName=REPLACE_BY_POD_HOSTNAME
- port=8715
- webPort=8080
- consumerBalancePeriodMs=30000
- firstBalanceDelayAfterStartMs=60000
- consumerHeartbeatTimeoutMs=30000
- producerHeartbeatTimeoutMs=45000
- brokerHeartbeatTimeoutMs=25000
- confModAuthToken=abc
- webResourcePath=resources
- metaDataPath=/data/meta_data
- useWebProxy=true
-
- [zookeeper]
- zkNodeRoot=/tubemq
- zkServerAddr={{ template "tubemq.fullname" . }}-{{
.Values.zookeeper.component }}:2181
- zkSessionTimeoutMs=30000
- zkConnectionTimeoutMs=30000
- zkSyncTimeMs=5000
- zkCommitPeriodMs=5000
-
- [replication]
- repGroupName={{ template "tubemq.fullname" . }}-{{
.Values.master.component }}
- repNodeName={{ template "tubemq.fullname" . }}-{{ .Values.master.component
}}-REPLACE_BY_POD_ID
- repNodePort=9001
- repHelperHost={{ template "tubemq.fullname" . }}-{{
.Values.master.component }}-0.{{ template "tubemq.fullname" . }}-{{
.Values.master.component }}.{{ .Release.Name }}.svc.cluster.local:9001
diff --git a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/master-pdb.yaml
b/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/master-pdb.yaml
deleted file mode 100644
index eae1b5b07..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/master-pdb.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-{{- if .Values.master.pdb.usePolicy }}
-apiVersion: policy/v1beta1
-kind: PodDisruptionBudget
-metadata:
- name: "{{ template "tubemq.fullname" . }}-{{ .Values.master.component }}"
- namespace: {{ .Release.Namespace }}
- labels:
- {{- include "tubemq.standardLabels" . | nindent 4 }}
- component: {{ .Values.master.component }}
-spec:
- selector:
- matchLabels:
- {{- include "tubemq.matchLabels" . | nindent 6 }}
- component: {{ .Values.master.component }}
- maxUnavailable: {{ .Values.master.pdb.maxUnavailable }}
-{{- end }}
diff --git
a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/master-service.yaml
b/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/master-service.yaml
deleted file mode 100644
index e31d305b7..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/master-service.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-apiVersion: v1
-kind: Service
-metadata:
- name: "{{ template "tubemq.fullname" . }}-{{ .Values.master.component }}"
- namespace: {{ .Release.Namespace }}
- labels:
- {{- include "tubemq.standardLabels" . | nindent 4 }}
- component: {{ .Values.master.component }}
- annotations:
-{{ toYaml .Values.master.service.annotations | indent 4 }}
-spec:
- type: {{ .Values.master.service.type }}
- ports:
- - name: web-port
- port: {{ .Values.master.ports.webPort }}
- nodePort: {{ .Values.master.ports.webNodePort }}
- - name: help-port
- port: {{ .Values.master.ports.helpPort }}
- - name: rpc-port
- port: {{ .Values.master.ports.rpcPort }}
- selector:
- {{- include "tubemq.matchLabels" . | nindent 4 }}
- component: {{ .Values.master.component }}
\ No newline at end of file
diff --git
a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/master-statefulset.yaml
b/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/master-statefulset.yaml
deleted file mode 100644
index db6bb293d..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/master-statefulset.yaml
+++ /dev/null
@@ -1,161 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
- name: "{{ template "tubemq.fullname" . }}-{{ .Values.master.component }}"
- namespace: {{ .Release.Namespace }}
- labels:
- {{- include "tubemq.standardLabels" . | nindent 4 }}
- component: {{ .Values.master.component }}
-spec:
- serviceName: "{{ template "tubemq.fullname" . }}-{{ .Values.master.component
}}"
- replicas: {{ .Values.master.replicaCount }}
- selector:
- matchLabels:
- {{- include "tubemq.matchLabels" . | nindent 6 }}
- component: {{ .Values.master.component }}
- updateStrategy:
-{{ toYaml .Values.master.updateStrategy | indent 4 }}
- podManagementPolicy: {{ .Values.master.podManagementPolicy }}
- template:
- metadata:
- labels:
- {{- include "tubemq.template.labels" . | nindent 8 }}
- component: {{ .Values.master.component }}
- annotations:
-{{ toYaml .Values.master.annotations | indent 8 }}
- spec:
- {{- if .Values.master.nodeSelector }}
- nodeSelector:
-{{ toYaml .Values.master.nodeSelector | indent 8 }}
- {{- end }}
- {{- if .Values.master.tolerations }}
- tolerations:
-{{ toYaml .Values.master.tolerations | indent 8 }}
- {{- end }}
- initContainers:
- - name: wait-zk-ready
- image: "{{ .Values.images.tubemq_all.repository }}:{{
.Values.images.tubemq_all.tag }}"
- imagePullPolicy: {{ .Values.images.tubemq_all.pullPolicy }}
- command: ["/bin/bash", "-c"]
- args:
- - >-
- for ((i=0;i<{{ .Values.zookeeper.replicaCount }};i++)); do
- until echo ruok | nc {{ template "tubemq.fullname" $ }}-{{
.Values.zookeeper.component }}-$i.{{ template "tubemq.fullname" $ }}-{{
.Values.zookeeper.component }}.{{ .Release.Namespace }}.svc.cluster.local
${1:-2181}; do
- sleep 3; done; done;
- affinity:
- {{- if .Values.affinity.anti_affinity}}
- podAntiAffinity:
- requiredDuringSchedulingIgnoredDuringExecution:
- - labelSelector:
- matchExpressions:
- - key: "app"
- operator: In
- values:
- - "{{ template "tubemq.name" . }}-{{ .Values.master.component
}}"
- - key: "release"
- operator: In
- values:
- - {{ .Release.Name }}
- - key: "component"
- operator: In
- values:
- - {{ .Values.master.component }}
- topologyKey: "kubernetes.io/hostname"
- {{- end }}
- terminationGracePeriodSeconds: {{ .Values.master.gracePeriod }}
- containers:
- - name: "{{ template "tubemq.fullname" . }}-{{ .Values.master.component
}}"
- image: "{{ .Values.images.tubemq_all.repository }}:{{
.Values.images.tubemq_all.tag }}"
- imagePullPolicy: {{ .Values.images.tubemq_all.pullPolicy }}
- {{- if .Values.master.resources }}
- resources:
-{{ toYaml .Values.master.resources | indent 10 }}
- {{- end }}
- command: ["sh", "-c"]
- args:
- - >
- /config-scripts/run;
- ports:
- - name: web-port
- containerPort: {{ .Values.master.ports.webPort }}
- - name: help-port
- containerPort: {{ .Values.master.ports.helpPort }}
- - name: rpc-port
- containerPort: {{ .Values.master.ports.rpcPort }}
- env:
- - name: MY_POD_IP
- valueFrom:
- fieldRef:
- fieldPath: status.podIP
- {{- if .Values.master.probe.readiness.enabled }}
- readinessProbe:
- exec:
- command:
- - /config-scripts/ready
- initialDelaySeconds: {{
.Values.master.probe.readiness.initialDelaySeconds }}
- periodSeconds: {{ .Values.master.probe.readiness.periodSeconds }}
- failureThreshold: {{ .Values.master.probe.readiness.failureThreshold
}}
- {{- end }}
- {{- if .Values.master.probe.liveness.enabled }}
- livenessProbe:
- exec:
- command:
- - /config-scripts/ok
- initialDelaySeconds: {{
.Values.master.probe.liveness.initialDelaySeconds }}
- periodSeconds: {{ .Values.master.probe.liveness.periodSeconds }}
- failureThreshold: {{ .Values.master.probe.liveness.failureThreshold
}}
- {{- end }}
- volumeMounts:
- - name: "{{ template "tubemq.fullname" . }}-{{
.Values.master.component }}-{{ .Values.master.volumes.data.name }}"
- mountPath: /data
- - name: config
- mountPath: /config-scripts
- - name: {{ .Values.master.component }}-ini
- mountPath: /opt/tubemq-server/conf/{{ .Values.master.component
}}.ini.raw
- subPath: {{ .Values.master.component }}.ini.raw
- readOnly: false
- volumes:
- - name: config
- configMap:
- name: "{{ template "tubemq.fullname" . }}-{{
.Values.master.component }}"
- defaultMode: 0755
- - name: {{ .Values.master.component }}-ini
- configMap:
- name: "{{ template "tubemq.fullname" . }}-{{
.Values.master.component }}-ini"
- defaultMode: 0644
- {{- if not .Values.volumes.persistence }}
- - name: "{{ template "tubemq.fullname" . }}-{{ .Values.master.component
}}-{{ .Values.master.volumes.data.name }}"
- emptyDir: {}
- {{- end }}
-{{- if .Values.volumes.persistence }}
- volumeClaimTemplates:
- - metadata:
- name: "{{ template "tubemq.fullname" . }}-{{ .Values.master.component
}}-{{ .Values.master.volumes.data.name }}"
- spec:
- accessModes: [ "ReadWriteOnce" ]
- resources:
- requests:
- storage: {{ .Values.master.volumes.data.size }}
- {{- if .Values.volumes.storageClassName }}
- storageClassName: "{{ .Values.volumes.storageClassName }}"
- {{- end }}
-{{- end }}
\ No newline at end of file
diff --git
a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/zookeeper-configmap.yaml
b/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/zookeeper-configmap.yaml
deleted file mode 100644
index a8f1a7596..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/zookeeper-configmap.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: "{{ template "tubemq.fullname" . }}-{{ .Values.zookeeper.component }}"
- namespace: {{ .Release.Namespace }}
- labels:
- component: {{ .Values.zookeeper.component }}
-data:
- ok: |
- #!/bin/sh
- zkServer.sh status
-
- ready: |
- #!/bin/sh
- echo ruok | nc 127.0.0.1 ${1:-2181}
-
- run: |
- #!/bin/bash
- set -a
- HOST=$(hostname)
- if [[ $HOST =~ (.*)-([0-9]+)$ ]]; then
- NAME=${BASH_REMATCH[1]}
- ORD=${BASH_REMATCH[2]}
- MY_POD_ID=$((ORD+1))
- else
- echo "Failed to extract ordinal from hostname $HOST"
- exit 1
- fi
- if [ ! -d "/data/zoo_data/" ]; then
- mkdir /data/zoo_data/ /data/zoo_log/
- fi
- export ZOO_MY_ID=$MY_POD_ID
- export ZOO_DATA_DIR="/data/zoo_data/"
- export ZOO_DATA_LOG_DIR="/data/zoo_log/"
- export SERVER_JVMFLAGS="-Xmx1g -Xms1g"
- /docker-entrypoint.sh zkServer.sh start-foreground
\ No newline at end of file
diff --git
a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/zookeeper-pdb.yaml
b/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/zookeeper-pdb.yaml
deleted file mode 100644
index 0e47bcf46..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/zookeeper-pdb.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-{{- if .Values.zookeeper.pdb.usePolicy }}
-apiVersion: policy/v1beta1
-kind: PodDisruptionBudget
-metadata:
- name: "{{ template "tubemq.fullname" . }}-{{ .Values.zookeeper.component }}"
- namespace: {{ .Release.Namespace }}
- labels:
- {{- include "tubemq.standardLabels" . | nindent 4 }}
- component: {{ .Values.zookeeper.component }}
-spec:
- selector:
- matchLabels:
- {{- include "tubemq.matchLabels" . | nindent 6 }}
- component: {{ .Values.zookeeper.component }}
- maxUnavailable: {{ .Values.zookeeper.pdb.maxUnavailable }}
-{{- end }}
diff --git
a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/zookeeper-service.yaml
b/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/zookeeper-service.yaml
deleted file mode 100644
index 043225635..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/zookeeper-service.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-apiVersion: v1
-kind: Service
-metadata:
- name: "{{ template "tubemq.fullname" . }}-{{ .Values.zookeeper.component }}"
- namespace: {{ .Release.Namespace }}
- labels:
- {{- include "tubemq.standardLabels" . | nindent 4 }}
- component: {{ .Values.zookeeper.component }}
- annotations:
-{{ toYaml .Values.zookeeper.service.annotations | indent 4 }}
-spec:
- ports:
- - name: follower
- port: {{ .Values.zookeeper.ports.follower }}
- - name: leader-election
- port: {{ .Values.zookeeper.ports.leaderElection }}
- - name: client
- port: {{ .Values.zookeeper.ports.client }}
- clusterIP: None
- selector:
- {{- include "tubemq.matchLabels" . | nindent 4 }}
- component: {{ .Values.zookeeper.component }}
\ No newline at end of file
diff --git
a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/zookeeper-statefulset.yaml
b/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/zookeeper-statefulset.yaml
deleted file mode 100644
index b75ca405f..000000000
---
a/inlong-tubemq/tubemq-docker/tubemq-k8s/templates/zookeeper-statefulset.yaml
+++ /dev/null
@@ -1,143 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
- name: "{{ template "tubemq.fullname" . }}-{{ .Values.zookeeper.component }}"
- namespace: {{ .Release.Namespace }}
- labels:
- {{- include "tubemq.standardLabels" . | nindent 4 }}
- component: {{ .Values.zookeeper.component }}
-spec:
- serviceName: "{{ template "tubemq.fullname" . }}-{{
.Values.zookeeper.component }}"
- replicas: {{ .Values.zookeeper.replicaCount }}
- selector:
- matchLabels:
- {{- include "tubemq.matchLabels" . | nindent 6 }}
- component: {{ .Values.zookeeper.component }}
- updateStrategy:
-{{ toYaml .Values.zookeeper.updateStrategy | indent 4 }}
- podManagementPolicy: {{ .Values.zookeeper.podManagementPolicy }}
- template:
- metadata:
- labels:
- {{- include "tubemq.template.labels" . | nindent 8 }}
- component: {{ .Values.zookeeper.component }}
- annotations:
-{{ toYaml .Values.zookeeper.annotations | indent 8 }}
- spec:
- {{- if .Values.zookeeper.nodeSelector }}
- nodeSelector:
-{{ toYaml .Values.zookeeper.nodeSelector | indent 8 }}
- {{- end }}
- {{- if .Values.zookeeper.tolerations }}
- tolerations:
-{{ toYaml .Values.zookeeper.tolerations | indent 8 }}
- {{- end }}
- affinity:
- {{- if .Values.affinity.anti_affinity}}
- podAntiAffinity:
- requiredDuringSchedulingIgnoredDuringExecution:
- - labelSelector:
- matchExpressions:
- - key: "app"
- operator: In
- values:
- - "{{ template "tubemq.name" . }}-{{
.Values.zookeeper.component }}"
- - key: "release"
- operator: In
- values:
- - {{ .Release.Name }}
- - key: "component"
- operator: In
- values:
- - {{ .Values.zookeeper.component }}
- topologyKey: "kubernetes.io/hostname"
- {{- end }}
- terminationGracePeriodSeconds: {{ .Values.zookeeper.gracePeriod }}
- containers:
- - name: "{{ template "tubemq.fullname" . }}-{{
.Values.zookeeper.component }}"
- image: "{{ .Values.images.tubemq_all.repository }}:{{
.Values.images.tubemq_all.tag }}"
- imagePullPolicy: {{ .Values.images.tubemq_all.pullPolicy }}
- {{- if .Values.zookeeper.resources }}
- resources:
-{{ toYaml .Values.zookeeper.resources | indent 10 }}
- {{- end }}
- command: ["sh", "-c"]
- args:
- - >
- /config-scripts/run;
- ports:
- - name: client
- containerPort: {{ .Values.zookeeper.ports.client }}
- - name: follower
- containerPort: {{ .Values.zookeeper.ports.follower }}
- - name: leader-election
- containerPort: {{ .Values.zookeeper.ports.leaderElection }}
- env:
- - name: ZOOKEEPER_SERVERS
- value:
- {{- $global := . }}
- {{ range $i, $e := until (.Values.zookeeper.replicaCount | int)
}}{{ if ne $i 0 }},{{ end }}{{ template "tubemq.fullname" $global }}-{{
$global.Values.zookeeper.component }}-{{ printf "%d" $i }}{{ end }}
- {{- if .Values.zookeeper.probe.readiness.enabled }}
- readinessProbe:
- exec:
- command:
- - /config-scripts/ready
- initialDelaySeconds: {{
.Values.zookeeper.probe.readiness.initialDelaySeconds }}
- periodSeconds: {{ .Values.zookeeper.probe.readiness.periodSeconds }}
- failureThreshold: {{
.Values.zookeeper.probe.readiness.failureThreshold }}
- {{- end }}
- {{- if .Values.zookeeper.probe.liveness.enabled }}
- livenessProbe:
- exec:
- command:
- - /config-scripts/ok
- initialDelaySeconds: {{
.Values.zookeeper.probe.liveness.initialDelaySeconds }}
- periodSeconds: {{ .Values.zookeeper.probe.liveness.periodSeconds }}
- failureThreshold: {{
.Values.zookeeper.probe.liveness.failureThreshold }}
- {{- end }}
- volumeMounts:
- - name: "{{ template "tubemq.fullname" . }}-{{
.Values.zookeeper.component }}-{{ .Values.zookeeper.volumes.data.name }}"
- mountPath: /data
- - name: config
- mountPath: /config-scripts
- volumes:
- - name: config
- configMap:
- name: "{{ template "tubemq.fullname" . }}-{{
.Values.zookeeper.component }}"
- defaultMode: 0755
- {{- if not .Values.volumes.persistence }}
- - name: "{{ template "tubemq.fullname" . }}-{{
.Values.zookeeper.component }}-{{ .Values.zookeeper.volumes.data.name }}"
- emptyDir: {}
- {{- end }}
-{{- if .Values.volumes.persistence }}
- volumeClaimTemplates:
- - metadata:
- name: "{{ template "tubemq.fullname" . }}-{{ .Values.zookeeper.component
}}-{{ .Values.zookeeper.volumes.data.name }}"
- spec:
- accessModes: [ "ReadWriteOnce" ]
- resources:
- requests:
- storage: {{ .Values.zookeeper.volumes.data.size }}
- {{- if .Values.volumes.storageClassName }}
- storageClassName: "{{ .Values.volumes.storageClassName }}"
- {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/inlong-tubemq/tubemq-docker/tubemq-k8s/values.yaml
b/inlong-tubemq/tubemq-docker/tubemq-k8s/values.yaml
deleted file mode 100644
index 74dcc4449..000000000
--- a/inlong-tubemq/tubemq-docker/tubemq-k8s/values.yaml
+++ /dev/null
@@ -1,158 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Default values for TubeMQ.
-# Declare variables to be passed into your templates.
-images:
- tubemq_all:
- repository: inlong/tubemq-all
- tag: latest
- pullPolicy: IfNotPresent
-
-volumes:
- persistence: false
- storageClassName: "local-storage"
-
-affinity:
- anti_affinity: false
-
-zookeeper:
- component: zookeeper
- replicaCount: 3
- updateStrategy:
- type: RollingUpdate
- podManagementPolicy: OrderedReady
- ports:
- client: 2181
- follower: 2888
- leaderElection: 3888
- #nodeSelector:
- # apache-tubemq-nodepool: zookeeper-pool
- probe:
- liveness:
- enabled: true
- failureThreshold: 10
- initialDelaySeconds: 10
- periodSeconds: 30
- readiness:
- enabled: true
- failureThreshold: 10
- initialDelaySeconds: 10
- periodSeconds: 30
- annotations:
- prometheus.io/scrape: "true"
- prometheus.io/port: "8000"
- tolerations: []
- gracePeriod: 30
- resources:
- requests:
- memory: 2Gi
- cpu: 1
- volumes:
- data:
- name: data
- size: 20Gi
- service:
- annotations:
- service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
- pdb:
- usePolicy: true
- maxUnavailable: 1
-
-master:
- component: master
- replicaCount: 1
- updateStrategy:
- type: RollingUpdate
- podManagementPolicy: OrderedReady
- ports:
- rpcPort: 8715
- webPort: 8080
- webNodePort: 8080
- helpPort: 9001
- #nodeSelector:
- # apache-tubemq-nodepool: master-pool
- probe:
- liveness:
- enabled: true
- failureThreshold: 10
- initialDelaySeconds: 10
- periodSeconds: 30
- readiness:
- enabled: true
- failureThreshold: 10
- initialDelaySeconds: 10
- periodSeconds: 30
- tolerations: []
- gracePeriod: 30
- resources:
- requests:
- memory: 2Gi
- cpu: 1
- volumes:
- data:
- name: data
- size: 20Gi
- service:
- type: LoadBalancer
- annotations:
- service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
- pdb:
- usePolicy: true
- maxUnavailable: 1
-
-broker:
- component: broker
- replicaCount: 3
- updateStrategy:
- type: RollingUpdate
- podManagementPolicy: OrderedReady
- ports:
- rpcPort: 8123
- webPort: 8081
- #nodeSelector:
- # apache-tubemq-nodepool: broker-pool
- probe:
- liveness:
- enabled: true
- failureThreshold: 10
- initialDelaySeconds: 10
- periodSeconds: 30
- readiness:
- enabled: true
- failureThreshold: 10
- initialDelaySeconds: 10
- periodSeconds: 30
- tolerations: []
- gracePeriod: 30
- resources:
- requests:
- memory: 2Gi
- cpu: 1
- volumes:
- data:
- name: data
- size: 20Gi
- service:
- type: LoadBalancer
- annotations:
- service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
- pdb:
- usePolicy: true
- maxUnavailable: 1
\ No newline at end of file
