diff --git a/broker/pom.xml b/broker/pom.xml index e4d71742b..4dadf137e 100644 --- a/broker/pom.xml +++ b/broker/pom.xml @@ -22,7 +22,7 @@ 4.0.0 com.automq.rocketmq - rocketmq-on-s3 + automq-for-rocketmq 5.1.3-automq-0-SNAPSHOT diff --git a/cli/pom.xml b/cli/pom.xml index 7271ea21e..4cfbb85a8 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -22,7 +22,7 @@ 4.0.0 com.automq.rocketmq - rocketmq-on-s3 + automq-for-rocketmq 5.1.3-automq-0-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 06b3af36b..c4da9f692 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -22,7 +22,7 @@ 4.0.0 com.automq.rocketmq - rocketmq-on-s3 + automq-for-rocketmq 5.1.3-automq-0-SNAPSHOT diff --git a/controller/pom.xml b/controller/pom.xml index 4b6b3a6f8..b4116a893 100644 --- a/controller/pom.xml +++ b/controller/pom.xml @@ -22,7 +22,7 @@ 4.0.0 com.automq.rocketmq - rocketmq-on-s3 + automq-for-rocketmq 5.1.3-automq-0-SNAPSHOT diff --git a/distribution/docker/Dockerfile b/distribution/docker/Dockerfile index 2d419e580..4eab320be 100644 --- a/distribution/docker/Dockerfile +++ b/distribution/docker/Dockerfile @@ -1,5 +1,5 @@ FROM amazoncorretto:21 WORKDIR /root RUN yum install which bash -y -ADD rocketmq-on-s3.tar.gz . -CMD ["/root/rocketmq-on-s3/bin/start-broker.sh"] \ No newline at end of file +ADD automq-for-rocketmq.tar.gz . +CMD ["/root/automq-for-rocketmq/bin/start-broker.sh"] \ No newline at end of file diff --git a/distribution/docker/Dockerfile-ci b/distribution/docker/Dockerfile-ci index 8585bb6f8..8f6c53838 100644 --- a/distribution/docker/Dockerfile-ci +++ b/distribution/docker/Dockerfile-ci @@ -33,7 +33,7 @@ ENV ROCKETMQ_VERSION ${version} ARG ROCKETMQ_DIR -ENV ROCKETMQ_NAME rocketmq-on-s3 +ENV ROCKETMQ_NAME automq-for-rocketmq ENV ROCKETMQ_HOME /home/rocketmq/${ROCKETMQ_NAME}-${ROCKETMQ_VERSION} WORKDIR ${ROCKETMQ_HOME} diff --git a/distribution/docker/build.sh b/distribution/docker/build.sh index a865056e2..f705600bf 100755 --- a/distribution/docker/build.sh +++ b/distribution/docker/build.sh @@ -20,8 +20,8 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) REPO_DIR=$(dirname "$(dirname "$SCRIPT_DIR")") cd "$REPO_DIR" || exit 1 mvn package -Dmaven.test.skip=true -cp distribution/target/rocketmq-on-s3.tar.gz "$SCRIPT_DIR" +cp distribution/target/automq-for-rocketmq.tar.gz "$SCRIPT_DIR" cd "$SCRIPT_DIR" || exit 1 -docker build -t rocketmq-on-s3:0.0.1 -f Dockerfile . +docker build -t automq-for-rocketmq:0.0.1 -f Dockerfile . diff --git a/distribution/docker/docker-compose.yaml b/distribution/docker/docker-compose.yaml index dca10314b..b6c93ae3b 100644 --- a/distribution/docker/docker-compose.yaml +++ b/distribution/docker/docker-compose.yaml @@ -1,7 +1,7 @@ version: "3" services: broker-1: - image: "rocketmq-on-s3:0.0.1" + image: "automq-for-rocketmq:0.0.1" # https://docs.docker.com/compose/compose-file/05-services/#entrypoint environment: - ROCKETMQ_NODE_NAME=broker-1 @@ -15,7 +15,7 @@ services: mysql-server: condition: service_healthy broker-2: - image: "rocketmq-on-s3:0.0.1" + image: "automq-for-rocketmq:0.0.1" # https://docs.docker.com/compose/compose-file/05-services/#entrypoint environment: - ROCKETMQ_NODE_NAME=broker-2 diff --git a/distribution/helm/clean-ci.sh b/distribution/helm/clean-ci.sh index 73d00f13d..9b072ac73 100644 --- a/distribution/helm/clean-ci.sh +++ b/distribution/helm/clean-ci.sh @@ -17,7 +17,7 @@ helm uninstall s3-localstack helm uninstall mysql -helm uninstall rocketmq-on-s3 +helm uninstall automq-for-rocketmq kubectl delete -f deploy/init-db-configmap.yaml rm deploy/init-db-configmap.yaml diff --git a/distribution/helm/deploy-ci.sh b/distribution/helm/deploy-ci.sh index 872c4ffbe..75055110b 100644 --- a/distribution/helm/deploy-ci.sh +++ b/distribution/helm/deploy-ci.sh @@ -47,7 +47,7 @@ helm install mysql bitnami/mysql -f deploy/mysql.yaml sleep 10 echo "Deploying rocketmq..." -# deploy rocketmq-on-s3 -helm install rocketmq-on-s3 . -f deploy/helm_sample_values.yaml +# deploy automq-for-rocketmq +helm install automq-for-rocketmq . -f deploy/helm_sample_values.yaml diff --git a/distribution/helm/templates/broker/statefulset.yaml b/distribution/helm/templates/broker/statefulset.yaml index 8051ee7de..2be096120 100644 --- a/distribution/helm/templates/broker/statefulset.yaml +++ b/distribution/helm/templates/broker/statefulset.yaml @@ -38,7 +38,7 @@ spec: imagePullPolicy: {{ $.Values.broker.image.pullPolicy }} {{- end }} command: [ "/bin/sh" ] - args: [ "-c", "./run-server.sh com.automq.rocketmq.broker.BrokerStartup -c /home/rocketmq/rocketmq-on-s3-5.1.3/conf/broker/$(CLUSTER_NAME)-$(POD_NAME)" ] + args: [ "-c", "./run-server.sh com.automq.rocketmq.broker.BrokerStartup -c /home/rocketmq/automq-for-rocketmq-5.1.3/conf/broker/$(CLUSTER_NAME)-$(POD_NAME)" ] env: - name: POD_NAME valueFrom: @@ -81,7 +81,7 @@ spec: resources: {{- toYaml .Values.broker.resources | nindent 12 }} volumeMounts: - - mountPath: /home/rocketmq/rocketmq-on-s3-5.1.3/conf/broker + - mountPath: /home/rocketmq/automq-for-rocketmq-5.1.3/conf/broker name: broker-config - mountPath: /root/logs/rocketmqlogs name: broker-storage diff --git a/distribution/kubeblocks/templates/broker/clusterdefinition.yaml b/distribution/kubeblocks/templates/broker/clusterdefinition.yaml index a453858d6..fdbae65b0 100644 --- a/distribution/kubeblocks/templates/broker/clusterdefinition.yaml +++ b/distribution/kubeblocks/templates/broker/clusterdefinition.yaml @@ -20,9 +20,9 @@ metadata: labels: {{- include "rocketmq-broker.selectorLabels" . | nindent 8 }} spec: - type: rocketmq-on-s3 + type: automq-for-rocketmq componentDefs: - - name: rocketmq-on-s3-broker + - name: automq-for-rocketmq-broker description: |- Rocketmq broker that act as both brokers and controllers are referred to as "combined" servers. workloadType: Stateful @@ -44,7 +44,7 @@ spec: containers: - name: broker command: [ "/bin/sh" ] - args: [ "-c", "./run-server.sh com.automq.rocketmq.broker.BrokerStartup -c /home/rocketmq/rocketmq-on-s3-5.1.3/conf/broker/$(POD_NAME)" ] + args: [ "-c", "./run-server.sh com.automq.rocketmq.broker.BrokerStartup -c /home/rocketmq/automq-for-rocketmq-5.1.3/conf/broker/$(POD_NAME)" ] env: - name: POD_NAME valueFrom: @@ -93,7 +93,7 @@ spec: tcpSocket: port: rocketmq-broker volumeMounts: - - mountPath: /home/rocketmq/rocketmq-on-s3-5.1.3/conf/broker + - mountPath: /home/rocketmq/automq-for-rocketmq-5.1.3/conf/broker name: broker-conf - mountPath: /root/logs/rocketmqlogs name: broker-storage diff --git a/distribution/kubeblocks/templates/broker/clusterversion.yaml b/distribution/kubeblocks/templates/broker/clusterversion.yaml index 6adc91212..ea8679fe0 100644 --- a/distribution/kubeblocks/templates/broker/clusterversion.yaml +++ b/distribution/kubeblocks/templates/broker/clusterversion.yaml @@ -22,7 +22,7 @@ metadata: spec: clusterDefinitionRef: {{ .Release.Name }} componentVersions: - - componentDefRef: rocketmq-on-s3-broker + - componentDefRef: automq-for-rocketmq-broker versionsContext: containers: - name: broker diff --git a/distribution/kubeblocks/templates/broker/statefulset.yaml b/distribution/kubeblocks/templates/broker/statefulset.yaml index 8051ee7de..2be096120 100644 --- a/distribution/kubeblocks/templates/broker/statefulset.yaml +++ b/distribution/kubeblocks/templates/broker/statefulset.yaml @@ -38,7 +38,7 @@ spec: imagePullPolicy: {{ $.Values.broker.image.pullPolicy }} {{- end }} command: [ "/bin/sh" ] - args: [ "-c", "./run-server.sh com.automq.rocketmq.broker.BrokerStartup -c /home/rocketmq/rocketmq-on-s3-5.1.3/conf/broker/$(CLUSTER_NAME)-$(POD_NAME)" ] + args: [ "-c", "./run-server.sh com.automq.rocketmq.broker.BrokerStartup -c /home/rocketmq/automq-for-rocketmq-5.1.3/conf/broker/$(CLUSTER_NAME)-$(POD_NAME)" ] env: - name: POD_NAME valueFrom: @@ -81,7 +81,7 @@ spec: resources: {{- toYaml .Values.broker.resources | nindent 12 }} volumeMounts: - - mountPath: /home/rocketmq/rocketmq-on-s3-5.1.3/conf/broker + - mountPath: /home/rocketmq/automq-for-rocketmq-5.1.3/conf/broker name: broker-config - mountPath: /root/logs/rocketmqlogs name: broker-storage diff --git a/distribution/pom.xml b/distribution/pom.xml index 7886dfc29..87611767d 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -22,7 +22,7 @@ 4.0.0 com.automq.rocketmq - rocketmq-on-s3 + automq-for-rocketmq 5.1.3-automq-0-SNAPSHOT @@ -61,6 +61,6 @@ - rocketmq-on-s3 + automq-for-rocketmq \ No newline at end of file diff --git a/metadata/pom.xml b/metadata/pom.xml index c1759c9b9..40aa0b425 100644 --- a/metadata/pom.xml +++ b/metadata/pom.xml @@ -22,7 +22,7 @@ 4.0.0 com.automq.rocketmq - rocketmq-on-s3 + automq-for-rocketmq 5.1.3-automq-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 425c77859..fa15cb958 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 4.0.0 com.automq.rocketmq - rocketmq-on-s3 + automq-for-rocketmq 5.1.3-automq-0-SNAPSHOT pom diff --git a/proto/pom.xml b/proto/pom.xml index 6ddc0fd30..46f037d0e 100644 --- a/proto/pom.xml +++ b/proto/pom.xml @@ -20,7 +20,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - rocketmq-on-s3 + automq-for-rocketmq com.automq.rocketmq 5.1.3-automq-0-SNAPSHOT diff --git a/proxy/pom.xml b/proxy/pom.xml index 0cb63cabb..cfaf8dc5c 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -22,7 +22,7 @@ 4.0.0 com.automq.rocketmq - rocketmq-on-s3 + automq-for-rocketmq 5.1.3-automq-0-SNAPSHOT diff --git a/store/pom.xml b/store/pom.xml index f713e822e..09352519a 100644 --- a/store/pom.xml +++ b/store/pom.xml @@ -22,7 +22,7 @@ 4.0.0 com.automq.rocketmq - rocketmq-on-s3 + automq-for-rocketmq 5.1.3-automq-0-SNAPSHOT