chore: update implementation details of helm chart and kb (#649)

Signed-off-by: wangxye <[email protected]>

distribution/helm/charts/automq-for-rocketmq/Chart.yaml

@@ -31,10 +31,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 5.1.3
+version: 0.0.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "5.1.3"
+appVersion: "0.0.2"

distribution/helm/charts/automq-for-rocketmq/values.yaml

@@ -21,8 +21,8 @@ broker:
   replicaCount: 1
   image:
     pullPolicy: IfNotPresent
-    repository: "automq-for-rocketmq"
-    tag: "0.0.2-alpine"
+    repository: "automqinc/automq-for-rocketmq"
+    tag: "v0.0.2-alpha"
 
   persistence:
     enabled: false

distribution/kubeblocks/Chart.yaml

@@ -15,8 +15,8 @@
 
 
 apiVersion: v2
-name: rocketmq-k8s-helm
-description: A Helm chart for Kubernetes
+name: automq-for-rocketmq
+description: A Helm chart for automq-for-rocketmq
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -31,10 +31,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 5.1.3
+version: 0.0.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "5.1.3"
+appVersion: "0.0.2"

distribution/kubeblocks/templates/broker/_brokerconfig.tpl

@@ -20,11 +20,14 @@ limitations under the License.
 {{- $name := include "rocketmq-broker.fullname" . }}
 {{- $clusterName := include "rocketmq-broker.clusterName" . }}
 {{- $brokerNamePrefix := include "rocketmq-broker.brokerNamePrefix" . }}
-{{- $config := .Values.broker.config }}
-{{- $s3stream := .Values.broker.s3stream }}
+{{- $config := .Values.broker.conf.name }}
+{{- $s3stream := .Values.broker.conf.s3Stream }}
 {{- $bindAddress := .Values.broker.service }}
-{{- $innerKey := .Values.broker.inner }}
-{{- $db := .Values.broker.db }}
+{{- $innerKey := .Values.broker.conf.inner }}
+{{- $db := .Values.broker.conf.db }}
+{{- $controller := .Values.broker.conf.controller }}
+{{- $metrics := .Values.broker.conf.metrics }}
+{{- $store := .Values.broker.conf.store }}
 {{- $replicaCount := .Values.broker.replicaCount | int }}
 {{- range $index := until $replicaCount }}
   {{ $clusterName }}-{{ $name }}-{{ $index }}: |
@@ -45,16 +48,21 @@ limitations under the License.
       url: {{ $db.url }}
       userName: {{ $db.userName }}
       password: {{ $db.password }}
+    store:
+      kvPath: {{ $store.kvPath }}
+    controller:
+      recycleS3IntervalInSecs: {{ $controller.recycleS3IntervalInSecs }}
+      dumpHeapOnError: {{ $controller.dumpHeapOnError }}
     metrics:
-      exporterType: "OTLP_GRPC"
-      grpcExporterTarget: "http://10.129.63.127:4317"
-      grpcExporterHeader: ""
-      grpcExporterTimeOutInMills: 31000
-      periodicExporterIntervalInMills: 30000
-      promExporterPort: 5557
-      promExporterHost: "localhost"
-      labels: ""
-      exportInDelta: false
+      exporterType: {{ $metrics.exporterType }}
+      grpcExporterTarget: {{ $metrics.grpcExporterTarget }}
+      grpcExporterHeader: {{ $metrics.grpcExporterHeader }}
+      grpcExporterTimeOutInMills: {{ $metrics.grpcExporterTimeOutInMills }}
+      periodicExporterIntervalInMills: {{ $metrics.periodicExporterIntervalInMills }}
+      promExporterPort: {{ $metrics.promExporterPort }}
+      promExporterHost: {{ $metrics.promExporterHost }}
+      labels: {{ $metrics.labels }}
+      exportInDelta: {{ $metrics.exportInDelta }}
 {{ $config | indent 4 }}
 {{- end }}
 {{- end }}

distribution/kubeblocks/values.yaml

@@ -18,27 +18,57 @@
 # Declare variables to be passed into your templates.
 
 broker:
-  namespace: default
   replicaCount: 1
   image:
-    pullPolicy: Always
-    repository: "automqinc/rocketmq_e2e"
-    tag: "5.1.3-alpine"
+    pullPolicy: IfNotPresent
+    repository: "automqinc/automq-for-rocketmq"
+    tag: "v0.0.2-alpha"
 
-  partition: 0
   persistence:
     enabled: false
     size: 8Gi
 
   nameOverride: "broker"
   fullnameOverride: ""
-  namesrvAddr: ""
 
   conf:
+    name: ""
     clusterNameOverride: ""
     brokerNamePrefixOverride: ""
-
-  config: ""
+
+    inner:
+      accessKey: "automq"
+      secretKey: "rocketmq"
+
+    s3Stream:
+      s3WALPath: "/tmp/s3rocketmq/wal"
+      s3Endpoint: "http://minio.local:9000"
+      s3Bucket: "bucket-name"
+      s3Region: "us-east-1"
+      s3ForcePathStyle: true
+      s3AccessKey: "access-key"
+      s3SecretKey: "secret-key"
+      networkBaselineBandwidth: 5242880
+      refillPeriodMs: 100
+    db:
+      url: "jdbc:mysql://mysql-server:3306/metadata"
+      userName: "root"
+      password: "password"
+    store:
+      kvPath: "/tmp/s3rocketmq/kvstore"
+    controller:
+      recycleS3IntervalInSecs: 360
+      dumpHeapOnError: true
+    metrics:
+      exporterType: "OTLP_GRPC"
+      grpcExporterTarget: "http://10.129.63.127:4317"
+      grpcExporterHeader: ""
+      grpcExporterTimeOutInMills: 31000
+      periodicExporterIntervalInMills: 30000
+      promExporterPort: 5557
+      promExporterHost: "localhost"
+      labels: ""
+      exportInDelta: false
 
   service:
     port: 8081
@@ -56,23 +86,3 @@ broker:
 
   tolerations: [ ]
 
-  inner:
-    accessKey: "aa"
-    secretKey: "bb"
-
-  s3stream:
-    s3WALPath: "/tmp/s3rocketmq/wal"
-    s3Endpoint: "http://minio.hellocorp.test"
-    s3Bucket: "wxy"
-    s3Region: "us-east-1"
-    s3ForcePathStyle: true
-    s3AccessKey: "Y6pKg2MmFL3wlWiEJEtc"
-    s3SecretKey: "eTWpQEutpExoYXebV8D1HXJ8TwDWyoKoAVJpX32K"
-
-
-  db:
-    url: "jdbc:mysql://mysql-server:3306/metadata"
-    userName: "root"
-    password: "password"
-
-