chore: update to 0.2.15 (#148)

Co-authored-by: GitHub Actions <[email protected]>

charts/collaboration-server/values.yaml

@@ -12,7 +12,7 @@ image:
   repository: release/univer-collaboration
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 0.2.14 # VERSION
+  tag: 0.2.15 # VERSION
 
 imagePullSecrets: []
 nameOverride: ""

charts/univer-stack/values.yaml

@@ -95,7 +95,7 @@ collaboration-demo:
 worker:
   image:
     repository: release/worker-exchange
-    tag: 0.2.14 # VERSION
+    tag: 0.2.15 # VERSION
   temporalServer:
     host: temporal-frontend:7233
     namespace: univer

charts/universer/config/config.yml

@@ -20,6 +20,10 @@ data:
     replicaDSN: {{ include "universer.database.replicaDSN" .Values.config.database }}
   rabbitmq:
     addr: amqp://{{ .Values.config.rabbitmq.username }}:{{ .Values.config.rabbitmq.password }}@{{ tpl .Values.config.rabbitmq.host . }}:{{ .Values.config.rabbitmq.port }}/
+    {{- with .Values.config.rabbitmq.cluster }}
+    cluster:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
   clickhouse:
     dsn: clickhouse://clickhouse:clickhouse@clickhouse:9000/univer?dial_timeout=10s&read_timeout=20s
   temporal:

charts/universer/templates/configmap.yaml

@@ -6,4 +6,9 @@ metadata:
     {{- include "universer.labels" . | nindent 4 }}
 data:
   config.yaml: |
-    {{ tpl (.Files.Get "config/config.yml") . | nindent 4 | trim }}
+    {{ tpl (.Files.Get "config/config.yml") . | nindent 4 | trim }}
+#    licnese v2
+  license.txt:
+    {{ .Values.license.licenseV2 | quote }}
+  LICENSE:
+    {{ .Values.license.LICENSE | quote }}

charts/universer/templates/deployment.yaml

@@ -60,7 +60,10 @@ spec:
             - name: conf
               mountPath: /data/configs/config.yaml
               subPath: config.yaml
-            - name: secret
+            - name: conf
+              mountPath: /data/configs/license.txt
+              subPath: license.txt
+            - name: conf
               mountPath: /data/configs/LICENSE
               subPath: LICENSE
             - name: secret
@@ -69,6 +72,9 @@ spec:
             - name: secret
               mountPath: /data/configs/casdoor.pem
               subPath: casdoor.pem
+            - name: secret
+              mountPath: /data/configs/licenseKey.txt
+              subPath: licenseKey.txt
           env:
             - name: SERVICE_NAME
               value: "universer"

charts/universer/templates/secret.yaml

@@ -5,6 +5,6 @@ metadata:
   labels:
     {{- include "universer.labels" . | nindent 4 }}
 data:
-  LICENSE: {{ .Values.license.LICENSE | b64enc | quote }}
   public_key.crt: {{ .Values.license.publicKey | b64enc | quote }}
-  casdoor.pem: {{ .Values.casdoorLicense.publicKey | b64enc | quote }}
+  casdoor.pem: {{ .Values.casdoorLicense.publicKey | b64enc | quote }}
+  licenseKey.txt: {{ .Values.license.licenseKeyV2 | b64enc | quote }}

charts/universer/values.yaml

@@ -12,7 +12,7 @@ image:
   repository: release/universer
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 0.2.14 # VERSION
+  tag: 0.2.15 # VERSION
 
 imagePullSecrets: []
 nameOverride: ""
@@ -91,14 +91,28 @@ config:
     port: 5672
     username: guest
     password: guest
+    cluster:
+      enabled: false
+      addr: ""
+      username: ""
+      password: ""
+      vhost: "/"
+      schema: amqp
   redis:
+    # if use redis cluster, use comma to separate multiple redis servers
+    # for example: redis1:6379,redis2:6379
     addr: redis:6379
     read_timeout: 1s
     write_timeout: 1s
+    db: 0
+    username: ""
+    password: ""
     sentinel:
       enabled: false
       masterName: ""
       sentinelAddr: ""
+      username: ""
+      password: ""
   apply:
     host: collaboration-server
     port: 5002
@@ -217,6 +231,8 @@ config:
 license:
   LICENSE: ""
   publicKey: ""
+  licenseV2: ""
+  licenseKeyV2: ""
 
 casdoorLicense:
     publicKey: ""

docker-compose/.env

@@ -1,9 +1,9 @@
 EDITION=release
 
 # version
-UNIVERSER_VERSION=0.2.14
-COLLABORATION_SERVER_VERSION=0.2.14
-UNIVER_WORKER_EXCHANGE_VERSION=0.2.14
+UNIVERSER_VERSION=0.2.15
+COLLABORATION_SERVER_VERSION=0.2.15
+UNIVER_WORKER_EXCHANGE_VERSION=0.2.15
 UNIVERSER_SQL_VERSION=0.0.11
 POSTGRES_VERSION=16.1
 MYSQL_VERSION=8.3.0
@@ -45,6 +45,26 @@ RABBITMQ_HTTPPORT=15672
 RABBITMQ_USERNAME=guest
 RABBITMQ_PASSWORD=guest
 
+# if enable rabbitmq cluster, the RABBITMQ_HOST,RABBITMQ_PORT,RABBITMQ_USERNAME,RABBITMQ_PASSWORD will be ignored
+RABBITMQ_CLUSTER_ENABLED=false
+RABBITMQ_CLUSTER_USERNAME=
+RABBITMQ_CLUSTER_PASSWORD=
+# use comma to separate multiple addresses
+# for example: RABBITMQ_CLUSTER_ADDR=192.168.1.2:5672,192.168.1.5:5672,192.168.1.7:5672
+RABBITMQ_CLUSTER_ADDR=
+# RABBITMQ_CLUSTER_VHOST is the vhost of the rabbitmq cluster. If you don't set it, the default value is /
+# for example: RABBITMQ_CLUSTER_VHOST=univer
+RABBITMQ_CLUSTER_VHOST=
+RABBITMQ_CLUSTER_SCHEMA=amqp
+
+# redis config
+# if you use redis cluster, use comma to separate multiple addresses
+# for example: REDIS_ADDR=192.168.1.5:6001,192.168.1.5:6002,192.168.1.5:6003,192.168.1.5:6004
+REDIS_ADDR=univer-redis:6379
+REDIS_USERNAME=
+REDIS_PASSWORD=
+REDIS_DB=0
+
 # s3 config
 S3_USER=minio
 S3_PASSWORD=minio123456

docker-compose/configs/config.yaml.template

@@ -18,13 +18,23 @@ data:
     replicaDSN: ${DATABASE_REPLICA_DSN}
   rabbitmq:
     addr: amqp://${RABBITMQ_USERNAME}:${RABBITMQ_PASSWORD}@${RABBITMQ_HOST}:${RABBITMQ_PORT}/
+    cluster:
+      enabled: ${RABBITMQ_CLUSTER_ENABLED}
+      username: "${RABBITMQ_CLUSTER_USERNAME}"
+      password: "${RABBITMQ_CLUSTER_PASSWORD}"
+      addr: "${RABBITMQ_CLUSTER_ADDR}"
+      vhost: "${RABBITMQ_CLUSTER_VHOST}"
+      schema: "${RABBITMQ_CLUSTER_SCHEMA}"
   clickhouse:
     dsn: clickhouse://${CLICKHOUSE_USERNAME}:${CLICKHOUSE_PASSWORD}@${CLICKHOUSE_HOST}:${CLICKHOUSE_PORT}/univer?dial_timeout=10s&read_timeout=20s
   temporal:
     addr: ${TEMPORAL_HOST}:${TEMPORAL_PORT}
     namespace: ${TEMPORAL_NAMESPACE}
   redis:
-    addr: univer-redis:6379
+    addr: "${REDIS_ADDR}"
+    db: ${REDIS_DB}
+    username: "${REDIS_USERNAME}"
+    password: "${REDIS_PASSWORD}"
     read_timeout: 1s
     write_timeout: 1s
   s3: