diff --git a/apps/.olares/config/user/helm-charts/system-apps/templates/files-provider.yaml b/apps/.olares/config/user/helm-charts/system-apps/templates/files-provider.yaml index 4d7300aff..25454209f 100644 --- a/apps/.olares/config/user/helm-charts/system-apps/templates/files-provider.yaml +++ b/apps/.olares/config/user/helm-charts/system-apps/templates/files-provider.yaml @@ -51,6 +51,7 @@ rules: - "/provider/get_dataset_folder_status" - "/provider/update_dataset_folder_paths" - "/seahub/api/*" + - "/System/Configuration/encoding" verbs: ["*"] --- diff --git a/apps/.olares/config/user/helm-charts/system-apps/templates/olares-app.yaml b/apps/.olares/config/user/helm-charts/system-apps/templates/olares-app.yaml index 67691513a..e25a204a8 100644 --- a/apps/.olares/config/user/helm-charts/system-apps/templates/olares-app.yaml +++ b/apps/.olares/config/user/helm-charts/system-apps/templates/olares-app.yaml @@ -318,7 +318,7 @@ spec: chown -R 1000:1000 /uploadstemp && \ chown -R 1000:1000 /appdata - name: olares-app-init - image: beclab/system-frontend:v1.6.6 + image: beclab/system-frontend:v1.6.7 imagePullPolicy: IfNotPresent command: - /bin/sh @@ -440,7 +440,7 @@ spec: - name: NATS_SUBJECT_VAULT value: os.vault.{{ .Values.bfl.username}} - name: user-service - image: beclab/user-service:v0.0.69 + image: beclab/user-service:v0.0.70 imagePullPolicy: IfNotPresent ports: - containerPort: 3000 diff --git a/framework/chart-repo/.olares/config/cluster/deploy/chart_repo_deploy.yaml b/framework/chart-repo/.olares/config/cluster/deploy/chart_repo_deploy.yaml index 27a87e715..783c8820d 100644 --- a/framework/chart-repo/.olares/config/cluster/deploy/chart_repo_deploy.yaml +++ b/framework/chart-repo/.olares/config/cluster/deploy/chart_repo_deploy.yaml @@ -121,7 +121,7 @@ spec: name: check-appservice containers: - name: chartrepo - image: beclab/dynamic-chart-repository:v0.2.5 + image: beclab/dynamic-chart-repository:v0.3.0 imagePullPolicy: IfNotPresent ports: - containerPort: 81 diff --git a/framework/files/.olares/config/cluster/deploy/files_deploy.yaml b/framework/files/.olares/config/cluster/deploy/files_deploy.yaml index 2cc88f740..9f693abea 100644 --- a/framework/files/.olares/config/cluster/deploy/files_deploy.yaml +++ b/framework/files/.olares/config/cluster/deploy/files_deploy.yaml @@ -144,7 +144,7 @@ spec: {{ end }} - name: samba-server - image: beclab/samba-server:0.0.6 + image: beclab/samba-server:0.0.7 imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: true @@ -210,7 +210,7 @@ spec: command: - /samba_share - name: files - image: beclab/files-server:v0.2.128 + image: beclab/files-server:v0.2.129 imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: true @@ -460,7 +460,7 @@ spec: - protocol: TCP name: media-server port: 9090 - targetPort: 9090 + targetPort: 80 --- apiVersion: v1 @@ -825,6 +825,24 @@ data: add_header Accept-Ranges bytes; } + location /System { + proxy_pass http://127.0.0.1:8080; + + # Add original-request-related headers + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $host; + + add_header Accept-Ranges bytes; + + client_body_timeout 600s; + client_max_body_size 4000M; + proxy_request_buffering off; + keepalive_timeout 750s; + proxy_read_timeout 600s; + proxy_send_timeout 600s; + } + location /videos { proxy_pass http://127.0.0.1:8080; # rewrite ^/server(.*)$ $1 break; @@ -863,9 +881,8 @@ data: proxy_send_timeout 600s; } - location /seafhttp/upload { + location /seafhttp/upload-aj { proxy_pass http://127.0.0.1:8080; - #proxy_pass http://seafile/; # rewrite ^/server(.*)$ $1 break; # Add original-request-related headers diff --git a/framework/market/.olares/config/cluster/deploy/market_deploy.yaml b/framework/market/.olares/config/cluster/deploy/market_deploy.yaml index d99784abb..154d10c3a 100644 --- a/framework/market/.olares/config/cluster/deploy/market_deploy.yaml +++ b/framework/market/.olares/config/cluster/deploy/market_deploy.yaml @@ -140,7 +140,7 @@ spec: name: check-chart-repo containers: - name: appstore-backend - image: beclab/market-backend:v0.5.6 + image: beclab/market-backend:v0.6.0 imagePullPolicy: IfNotPresent ports: - containerPort: 81 diff --git a/framework/notifications/.olares/config/cluster/deploy/notification_deploy.yaml b/framework/notifications/.olares/config/cluster/deploy/notification_deploy.yaml index b71e3d7b5..e3a993190 100644 --- a/framework/notifications/.olares/config/cluster/deploy/notification_deploy.yaml +++ b/framework/notifications/.olares/config/cluster/deploy/notification_deploy.yaml @@ -146,7 +146,7 @@ spec: value: os_framework_notifications containers: - name: notifications-api - image: beclab/notifications-api:v1.12.36 + image: beclab/notifications-api:v1.12.38 imagePullPolicy: IfNotPresent ports: - containerPort: 3010 diff --git a/framework/system-server/.olares/config/user/helm-charts/systemserver/templates/proxy.yaml b/framework/system-server/.olares/config/user/helm-charts/systemserver/templates/proxy.yaml index e884d8083..c460cc644 100644 --- a/framework/system-server/.olares/config/user/helm-charts/systemserver/templates/proxy.yaml +++ b/framework/system-server/.olares/config/user/helm-charts/systemserver/templates/proxy.yaml @@ -184,3 +184,18 @@ spec: - protocol: TCP port: 28080 targetPort: 28080 + +--- +apiVersion: v1 +kind: Service +metadata: + name: files + namespace: user-system-{{ .Values.bfl.username }} +spec: + type: ClusterIP + selector: + app: systemserver + ports: + - protocol: TCP + port: 28080 + targetPort: 28080