chore(addons): modify rabbitmq plan and appVersion

jianxiaoguo · jianxiaoguo · commit e3822d8e69a8 · 2023-08-23T15:41:57.000+08:00
diff --git a/addons/mariadb-1.1.0/chart/mariadb/Chart.yaml b/addons/mariadb-1.1.0/chart/mariadb/Chart.yaml
@@ -1,7 +1,7 @@
 annotations:
   category: Database
 apiVersion: v2
-appVersion: 10.5.15
+appVersion: "11"
 dependencies:
   - name: common
     repository: oci://registry.drycc.cc/charts
diff --git a/addons/minio-1.1.0/chart/minio/Chart.yaml b/addons/minio-1.1.0/chart/minio/Chart.yaml
@@ -1,7 +1,7 @@
 annotations:
   category: Infrastructure
 apiVersion: v2
-appVersion: 2022.6.20
+appVersion: "2023"
 dependencies:
   - name: common
     repository: oci://registry.drycc.cc/charts
diff --git a/addons/postgresql-1.1.0/chart/postgresql/Chart.yaml b/addons/postgresql-1.1.0/chart/postgresql/Chart.yaml
@@ -1,7 +1,7 @@
 annotations:
   category: Database
 apiVersion: v2
-appVersion: 14.2.0
+appVersion: "15"
 dependencies:
   - name: common
     repository: oci://registry.drycc.cc/charts
diff --git a/addons/rabbitmq-1.1.0/chart/rabbitmq/Chart.yaml b/addons/rabbitmq-1.1.0/chart/rabbitmq/Chart.yaml
@@ -1,7 +1,7 @@
 annotations:
   category: Infrastructure
 apiVersion: v2
-appVersion: 3.10.8
+appVersion: "3.12"
 dependencies:
   - name: common
     repository: oci://registry.drycc.cc/charts
diff --git a/addons/rabbitmq-1.1.0/chart/rabbitmq/values.yaml b/addons/rabbitmq-1.1.0/chart/rabbitmq/values.yaml
@@ -118,7 +118,7 @@ auth:
   ## @param auth.username RabbitMQ application username
   ## ref: https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq#environment-variables
   ##
-  username: user
+  username: rabbitmq
   ## @param auth.password RabbitMQ application password
   ## ref: https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq#environment-variables
   ##
@@ -1074,7 +1074,7 @@ networkPolicy:
   ## on. When true, RabbitMQ will accept connections from any source
   ## (with the correct destination port).
   ##
-  allowExternal: true
+  allowExternal: false
   
   allowCurrentNamespace: true
   allowNamespaces: []
diff --git a/addons/rabbitmq-1.1.0/plans/standard-1024/bind.yaml b/addons/rabbitmq-1.1.0/plans/standard-1024/bind.yaml
@@ -0,0 +1,35 @@
+credential:
+  - name: HOST
+    valueFrom:
+      serviceRef:
+        name: {{ include "common.names.fullname" . }}
+        jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
+
+  {{- if or (.Values.service.portEnabled) (not .Values.auth.tls.enabled) }}
+  - name: RABBITMQ_AMQP_PORT
+    valueFrom:
+      serviceRef:
+        name: {{ include "common.names.fullname" . }}
+        jsonpath: '{ .spec.ports[?(@.targetPort=="amqp")].port }'
+  {{- end }}
+
+  {{- if .Values.auth.tls.enabled }}
+  - name: RABBITMQ_AMQP_SSL_PORT
+    valueFrom:
+      serviceRef:
+        name: {{ include "common.names.fullname" . }}
+        jsonpath: '{ .spec.ports[?(@.targetPort=="amqp-ssl")].port }'
+  {{- end }}
+
+  {{- if .Values.auth.username }}
+  - name: RABBITMQ_USER
+    value: {{ .Values.auth.username | quote }}
+  {{- end }}
+
+  {{- if (not .Values.auth.existingPasswordSecret ) }}
+  - name: RABBITMQ_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: {{ include "common.names.fullname" . }}
+        jsonpath: '{ .data.rabbitmq-password }'
+  {{- end }}
diff --git a/addons/rabbitmq-1.1.0/plans/standard-1024/create-instance-schema.json b/addons/rabbitmq-1.1.0/plans/standard-1024/create-instance-schema.json
diff --git a/addons/rabbitmq-1.1.0/plans/standard-1024/meta.yaml b/addons/rabbitmq-1.1.0/plans/standard-1024/meta.yaml
@@ -0,0 +1,6 @@
+name: "standard-1024"
+id: 4b9ae236-b30e-4652-b8be-c03e58652c11
+description: "RabbitMQ standard-1024 plan which limit resources memory size 1024Mi."
+displayName: "standard-1024"
+bindable: true
+maximum_polling_duration: 1800
diff --git a/addons/rabbitmq-1.1.0/plans/standard-1024/values.yaml b/addons/rabbitmq-1.1.0/plans/standard-1024/values.yaml
@@ -13,15 +13,15 @@ fullnameOverride: hb-rabbitmq-standard-128
 ##
 resources:
   limits:
-    cpu: 100m
-    memory: 128Mi
+    cpu: 1000m
+    memory: 1024Mi
   requests:
-    cpu: 10m
-    memory: 64Mi
+    cpu: 500m
+    memory: 512Mi
 
 ## @param replicaCount Number of RabbitMQ replicas to deploy
 ##
-replicaCount: 1
+replicaCount: 3
 
 ## @section Persistence parameters
 ##
@@ -45,4 +45,4 @@ persistence:
   ## @param persistence.size PVC Storage Request for RabbitMQ data volume
   ## If you change this value, you might have to adjust `rabbitmq.diskFreeLimit` as well
   ##
-  size: 256Mi
+  size: 512Mi
diff --git a/addons/rabbitmq-1.1.0/plans/standard-128/bind.yaml b/addons/rabbitmq-1.1.0/plans/standard-128/bind.yaml
diff --git a/addons/rabbitmq-1.1.0/plans/standard-128/meta.yaml b/addons/rabbitmq-1.1.0/plans/standard-128/meta.yaml
diff --git a/addons/redis-1.1.0/chart/redis/Chart.yaml b/addons/redis-1.1.0/chart/redis/Chart.yaml
@@ -1,7 +1,7 @@
 annotations:
   category: Database
 apiVersion: v2
-appVersion: 6.2.6
+appVersion: "7"
 dependencies:
   - name: common
     repository: oci://registry.drycc.cc/charts
diff --git a/addons/redis-cluster-1.1.0/chart/redis-cluster/Chart.yaml b/addons/redis-cluster-1.1.0/chart/redis-cluster/Chart.yaml
@@ -1,7 +1,7 @@
 annotations:
   category: Database
 apiVersion: v2
-appVersion: 7.0.5
+appVersion: "7"
 dependencies:
   - name: common
     repository: oci://registry.drycc.cc/charts
diff --git a/addons/zookeeper-1.1.0/chart/zookeeper/Chart.yaml b/addons/zookeeper-1.1.0/chart/zookeeper/Chart.yaml
@@ -1,7 +1,7 @@
 annotations:
   category: Infrastructure
 apiVersion: v2
-appVersion: 3.8.0
+appVersion: "3.9"
 dependencies:
   - name: common
     repository: oci://registry.drycc.cc/charts
diff --git a/addons/zookeeper-1.1.0/chart/zookeeper/values.yaml b/addons/zookeeper-1.1.0/chart/zookeeper/values.yaml
@@ -228,6 +228,7 @@ extraEnvVarsSecret: ""
 ## @param command Override default container command (useful when using custom images)
 ##
 command:
+  - init-stack
   - /scripts/setup.sh
 ## @param args Override default container args (useful when using custom images)
 ##
@@ -237,7 +238,7 @@ args: []
 
 ## @param replicaCount Number of ZooKeeper nodes
 ##
-replicaCount: 1
+replicaCount: 3
 ## @param containerPorts.client ZooKeeper client container port
 ## @param containerPorts.tls ZooKeeper TLS container port
 ## @param containerPorts.follower ZooKeeper follower container port
diff --git a/addons/zookeeper-1.1.0/plans/standard-128/bind.yaml b/addons/zookeeper-1.1.0/plans/standard-128/bind.yaml
@@ -20,15 +20,3 @@ credential:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .spec.ports[?(@.name=="tcp-client-tls")].port }'
   {{- end }}
-
-  - name: TCP_FOLLOWER_PORT
-    valueFrom:
-      serviceRef:
-        name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .spec.ports[?(@.name=="tcp-follower")].port }'
-
-  - name: TCP_ELECTION_PORT
-    valueFrom:
-      serviceRef:
-        name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .spec.ports[?(@.name=="tcp-election")].port }'
diff --git a/addons/zookeeper-1.1.0/plans/standard-128/values.yaml b/addons/zookeeper-1.1.0/plans/standard-128/values.yaml
@@ -4,7 +4,7 @@ fullnameOverride: "hb-zookeeper-standard-128"
 
 ## @param replicaCount Number of ZooKeeper nodes
 ##
-replicaCount: 1
+replicaCount: 3
 
 ## ZooKeeper resource requests and limits
 ## ref: https://kubernetes.io/docs/user-guide/compute-resources/
