Skip to content

Commit

Permalink
chore: update repository (#178)
Browse files Browse the repository at this point in the history
Co-authored-by: GitHub Actions <[email protected]>
  • Loading branch information
jikkai and hexf00 authored Dec 28, 2024
1 parent 0e9ef92 commit 2aa1c19
Show file tree
Hide file tree
Showing 13 changed files with 44 additions and 32 deletions.
2 changes: 1 addition & 1 deletion charts/collaboration-demo/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ image:
repository: release/univer-collaboration-lite
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: 0.5.1 # VERSION
tag: 0.5.2 # VERSION

imagePullSecrets: []
nameOverride: ""
Expand Down
2 changes: 2 additions & 0 deletions charts/collaboration-server/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ spec:
value: {{ .Values.stats | quote }}
- name: NODE_OPTIONS
value: --max-old-space-size={{ .Values.maxMemoryLimit }}
- name: LRU_CACHE_CAPACITY
value: "10000"

{{- with .Values.nodeSelector }}
nodeSelector:
Expand Down
2 changes: 1 addition & 1 deletion charts/collaboration-server/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ image:
repository: release/univer-collaboration
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: 0.5.1 # VERSION
tag: 0.5.2 # VERSION

imagePullSecrets: []
nameOverride: ""
Expand Down
3 changes: 2 additions & 1 deletion charts/univer-stack/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,10 @@ collaboration-demo:
pathType: Prefix

worker:
fullnameOverride: worker-exchange
image:
repository: release/worker-exchange
tag: 0.5.1 # VERSION
tag: 0.5.2 # VERSION
temporalServer:
host: temporal-frontend:7233
namespace: univer
Expand Down
19 changes: 11 additions & 8 deletions charts/universer/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,17 @@ data:
redis:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.config.s3 }}
s3:
accessKeyID: {{ .Values.config.s3.accessKeyID }}
accessKeySecret: {{ .Values.config.s3.accessKeySecret }}
region: {{ .Values.config.s3.region }}
endpoint: {{ .Values.config.s3.endpoint }}
endpointPublic: {{ .Values.config.s3.endpointPublic }}
usePathStyle: {{ .Values.config.s3.usePathStyle }}
presignExpires: {{ .Values.config.s3.presignExpires }}
defaultBucket: {{ .Values.config.s3.defaultBucket }}
{{- toYaml . | nindent 4 }}
{{- end }}
service:
apply:
addr: "{{ tpl .Values.config.apply.host . }}:{{ .Values.config.apply.port }}"
timeout: 10s
nodeRuntime:
addr: {{ .Values.config.nodeRuntime.addr }}
timeout: 10s
apiLimit:
{{- with .Values.config.apiLimit }}
{{- toYaml . | nindent 2 }}
Expand Down Expand Up @@ -91,6 +89,7 @@ auth:
{{- range .Values.config.auth.admin.userIDs }}
- {{ . | quote }}
{{- end }}
liteServer: {{ .Values.config.auth.admin.liteServer }}
usip:
enabled: {{ .Values.config.usip.enabled }}
{{- with .Values.config.usip.uri }}
Expand Down Expand Up @@ -153,4 +152,8 @@ workspace:
statsConf:
{{- with .Values.config.statsConf }}
{{- toYaml . | nindent 2 }}
{{- end }}
jaegerConf:
{{- with .Values.config.jaegerConf }}
{{- toYaml . | nindent 2 }}
{{- end }}
19 changes: 11 additions & 8 deletions charts/universer/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ image:
repository: release/universer
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: 0.5.1 # VERSION
tag: 0.5.2 # VERSION

imagePullSecrets: []
nameOverride: ""
Expand Down Expand Up @@ -123,6 +123,8 @@ config:
apply:
host: collaboration-server
port: 5002
nodeRuntime:
addr: http://localhost:14400
admin: []
s3:
accessKeyID: ""
Expand All @@ -133,6 +135,7 @@ config:
usePathStyle: false
presignExpires: 3600s
defaultBucket: univer
publicBucket: ""
temporal:
addr: univer-temporal:7233
namespace: default
Expand Down Expand Up @@ -174,15 +177,12 @@ config:
customerStrategies: ""
admin:
userIDs: []
liteServer: false
apiLimit:
method:
tokens: 600
interval: 30s
method: {}
ip: {}
perMethod: {}
user:
tokens: 300
interval: 30s
user: {}
perMethodUser: {}
sentryConfig:
dsn: ""
Expand Down Expand Up @@ -243,6 +243,9 @@ config:
timeInterval: 10
maxRecords: 10000
addr: "https://www.univer.ai/univer-cloud/stats/report"
jaegerConf:
enabled: false
grpcEndpoint: "jaeger:4317"

license:
LICENSE: ""
Expand All @@ -259,7 +262,7 @@ job:
registry: univer-acr-registry.cn-shenzhen.cr.aliyuncs.com
repository: release/universer-sql
pullPolicy: IfNotPresent
tag: "0.0.12"
tag: "0.0.14"

istio:
enabled: false
Expand Down
12 changes: 6 additions & 6 deletions docker-compose/.env
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
EDITION=release

# version
UNIVERSER_VERSION=0.5.1
COLLABORATION_SERVER_VERSION=0.5.1
UNIVER_WORKER_EXCHANGE_VERSION=0.5.1
UNIVER_DEMO_UI_VERSION=0.5.1
UNIVERSER_SQL_VERSION=0.0.12
UNIVERSER_VERSION=0.5.2
COLLABORATION_SERVER_VERSION=0.5.2
UNIVER_WORKER_EXCHANGE_VERSION=0.5.2
UNIVER_DEMO_UI_VERSION=0.5.2
UNIVERSER_SQL_VERSION=0.0.14
POSTGRES_VERSION=16.1
MYSQL_VERSION=8.3.0
RABBITMQ_VERSION=3-management
RABBITMQ_VERSION=3.12.14-management
TEMPORAL_VERSION=1.22.2
REDIS_VERSION=7.2.4-debian-12-r12
MINIO_VERSION=2024.8.3-debian-12-r1
Expand Down
5 changes: 1 addition & 4 deletions docker-compose/configs/config.yaml.template
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,7 @@ auth:
defaultShareRole: "${AUTH_PERMISSION_DEFAULT_SHARE_ROLE}"
enableObjInherit: ${AUTH_PERMISSION_ENABLE_OBJ_INHERIT}
customerStrategies: ${AUTH_PERMISSION_CUSTOMER_STRATEGIES}
apiLimit:
method:
tokens: 600
interval: 30s
apiLimit: {}
sentryConfig:
dsn: ${SENTRY_DSN}
debug: false
Expand Down
3 changes: 3 additions & 0 deletions docker-compose/docker-compose-observability.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ services:
- com.univer.app=prometheus

redis-exporter:
restart: always
image: oliver006/redis_exporter:${REDIS_EXPORTER_VERSION}
expose:
- 9121
Expand All @@ -110,6 +111,7 @@ services:
- redis

postgres-exporter:
restart: always
image: bitnami/postgres-exporter:${POSTGRES_EXPORTER_VERSION}
expose:
- 9187
Expand All @@ -121,6 +123,7 @@ services:
- rds

rabbitmq-exporter:
restart: always
image: kbudde/rabbitmq-exporter:${RABBITMQ_EXPORTER_VERSION}
expose:
- 9419
Expand Down
1 change: 1 addition & 0 deletions docker-compose/docker-compose.db.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ services:
- ENABLE_MUTATION_APPLY_INTERCEPTOR=true
- no_proxy=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET},universer
- NODE_OPTIONS=--max-old-space-size=${COLLABORATION_SERVER_MEMORY_LIMIT}
- LRU_CACHE_CAPACITY=10000
expose:
- 5002
- 9090
Expand Down
1 change: 1 addition & 0 deletions docker-compose/docker-compose.mysql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ services:
- ENABLE_MUTATION_APPLY_INTERCEPTOR=true
- no_proxy=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET},universer
- NODE_OPTIONS=--max-old-space-size=${COLLABORATION_SERVER_MEMORY_LIMIT}
- LRU_CACHE_CAPACITY=10000
expose:
- 5002
- 9090
Expand Down
1 change: 1 addition & 0 deletions docker-compose/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ services:
- ENABLE_MUTATION_APPLY_INTERCEPTOR=true
- no_proxy=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET},universer
- NODE_OPTIONS=--max-old-space-size=${COLLABORATION_SERVER_MEMORY_LIMIT}
- LRU_CACHE_CAPACITY=10000
expose:
- 5002
- 9090
Expand Down
6 changes: 3 additions & 3 deletions docker-compose/run.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

RELEASE_TIME="1733993402" # RELEASE_TIME
RELEASE_TIME="1735367001" # RELEASE_TIME

PLATFORM=$(uname)
SED="sed -i"
Expand Down Expand Up @@ -69,8 +69,8 @@ checkLicense() {
fourth_part=${license_parts[4]}
# echo "Fourth part of the license: $fourth_part"
if [ "$fourth_part" -lt "$RELEASE_TIME" ]; then
mv -f configs/license.txt configs/license.txt.${fourth_part}.bak 2>/dev/null || true
mv -f configs/licenseKey.txt configs/licenseKey.txt.${fourth_part}.bak 2>/dev/null || true
mv -f configs/license.txt configs/license.txt.bak 2>/dev/null || true
mv -f configs/licenseKey.txt configs/licenseKey.txt.bak 2>/dev/null || true
formatted_date=$(date -d @"$fourth_part" +"%Y-%m-%d")
echo "Your commercial license expired on ${formatted_date}. Visit https://univer.ai/pro/license or contact [email protected] for renewal."
fi
Expand Down

0 comments on commit 2aa1c19

Please sign in to comment.