From 295b06ec93fdd80f91f6d744b8c33f59d7252f40 Mon Sep 17 00:00:00 2001 From: lovehunter9 Date: Wed, 22 Jan 2025 19:38:51 +0800 Subject: [PATCH 1/3] fix: files nginx increase worker and timeout, and pasting temp file invisiable --- .../config/cluster/deploy/files_deploy.yaml | 120 ++++++++++++++++-- .../config/cluster/deploy/seafile_deploy.yaml | 2 +- 2 files changed, 112 insertions(+), 10 deletions(-) diff --git a/apps/files/config/cluster/deploy/files_deploy.yaml b/apps/files/config/cluster/deploy/files_deploy.yaml index b01a4dd8..e94325d4 100644 --- a/apps/files/config/cluster/deploy/files_deploy.yaml +++ b/apps/files/config/cluster/deploy/files_deploy.yaml @@ -78,7 +78,7 @@ spec: - containerPort: 8080 env: - name: FILES_SERVER_TAG - value: 'beclab/files-server:v0.2.51' + value: 'beclab/files-server:v0.2.54' - name: NAMESPACE valueFrom: fieldRef: @@ -114,7 +114,7 @@ spec: {{ end }} - name: files - image: beclab/files-server:v0.2.51 + image: beclab/files-server:v0.2.54 imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: true @@ -263,7 +263,7 @@ spec: runAsUser: 1000 privileged: true - name: nginx - image: 'beclab/nginx-lua:n0.0.4' + image: 'nginx:stable-alpine3.17-slim' securityContext: runAsNonRoot: false runAsUser: 0 @@ -271,6 +271,10 @@ spec: - containerPort: 80 protocol: TCP volumeMounts: + - name: files-nginx-config + readOnly: true + mountPath: /etc/nginx/nginx.conf + subPath: nginx.conf - name: files-nginx-config mountPath: /etc/nginx/conf.d/default.conf subPath: default.conf @@ -295,6 +299,8 @@ spec: configMap: name: files-nginx-config items: + - key: nginx.conf + path: nginx.conf - key: default.conf path: default.conf defaultMode: 420 @@ -388,7 +394,7 @@ spec: name: check-nats containers: - name: files - image: beclab/files-server:v0.2.51 + image: beclab/files-server:v0.2.54 imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: false @@ -522,6 +528,37 @@ metadata: annotations: kubesphere.io/creator: bytetrade.io data: + nginx.conf: |- + user nginx; + worker_processes 4; + + error_log /var/log/nginx/error.log notice; + pid /var/run/nginx.pid; + + events { + worker_connections 1024; + } + + http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 2700; + + #gzip on; + client_max_body_size 4000M; + + include /etc/nginx/conf.d/*.conf; + } default.conf: |- server { listen 80 default_server; @@ -588,12 +625,77 @@ data: proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Host $host; - client_body_timeout 60s; - client_max_body_size 2000M; + client_body_timeout 1800s; + client_max_body_size 4000M; proxy_request_buffering off; - keepalive_timeout 75s; - proxy_read_timeout 60s; - proxy_send_timeout 60s; + keepalive_timeout 2700s; + proxy_read_timeout 1800s; + proxy_send_timeout 1800s; + } + + location /api/raw { + proxy_pass http://127.0.0.1:8080; + # rewrite ^/server(.*)$ $1 break; + + # 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; + + client_body_timeout 1800s; + client_max_body_size 4000M; + proxy_request_buffering off; + keepalive_timeout 2700s; + proxy_read_timeout 1800s; + proxy_send_timeout 1800s; + } + + location /api/md5 { + proxy_pass http://127.0.0.1:8080; + # rewrite ^/server(.*)$ $1 break; + # 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 1800s; + client_max_body_size 4000M; + proxy_request_buffering off; + keepalive_timeout 2700s; + proxy_read_timeout 1800s; + proxy_send_timeout 1800s; + } + + location /api/paste { + proxy_pass http://127.0.0.1:8080; + # rewrite ^/server(.*)$ $1 break; + # 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 1800s; + client_max_body_size 4000M; + proxy_request_buffering off; + keepalive_timeout 2700s; + proxy_read_timeout 1800s; + proxy_send_timeout 1800s; + } + + location /api/cache { + proxy_pass http://127.0.0.1:8080; + # rewrite ^/server(.*)$ $1 break; + # 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 1800s; + client_max_body_size 4000M; + proxy_request_buffering off; + keepalive_timeout 2700s; + proxy_read_timeout 1800s; + proxy_send_timeout 1800s; } location /provider { diff --git a/third-party/seahub/config/cluster/deploy/seafile_deploy.yaml b/third-party/seahub/config/cluster/deploy/seafile_deploy.yaml index 707e0191..bde68cca 100644 --- a/third-party/seahub/config/cluster/deploy/seafile_deploy.yaml +++ b/third-party/seahub/config/cluster/deploy/seafile_deploy.yaml @@ -165,7 +165,7 @@ data: # end nginx.conf: |- user nginx; - worker_processes auto; + worker_processes 4; error_log /var/log/nginx/error.log notice; pid /var/run/nginx.pid; From dee89af9dd08f463ba776f7f24905116df0588bd Mon Sep 17 00:00:00 2001 From: huaiyuan <1029848564@qq.com> Date: Wed, 22 Jan 2025 20:11:25 +0800 Subject: [PATCH 2/3] fix: fix create new folder in sync and update nginx timeout --- .../user/helm-charts/files/templates/files_fe_deploy.yaml | 2 +- .../helm-charts/monitoring/templates/system-frontend.yaml | 2 +- apps/vault/config/cluster/deploy/vault_server_deploy.yaml | 4 ++-- .../config/user/helm-charts/vault/templates/vault_deploy.yaml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/files/config/user/helm-charts/files/templates/files_fe_deploy.yaml b/apps/files/config/user/helm-charts/files/templates/files_fe_deploy.yaml index 4929f526..f32e344d 100644 --- a/apps/files/config/user/helm-charts/files/templates/files_fe_deploy.yaml +++ b/apps/files/config/user/helm-charts/files/templates/files_fe_deploy.yaml @@ -297,7 +297,7 @@ spec: # - /filebrowser # - --noauth - name: files-frontend - image: beclab/files-frontend-1.11:v1.3.22 + image: beclab/files-frontend-1.11:v1.3.24 imagePullPolicy: IfNotPresent securityContext: runAsNonRoot: false diff --git a/apps/system-apps/config/user/helm-charts/monitoring/templates/system-frontend.yaml b/apps/system-apps/config/user/helm-charts/monitoring/templates/system-frontend.yaml index 66a8a883..77d223b0 100644 --- a/apps/system-apps/config/user/helm-charts/monitoring/templates/system-frontend.yaml +++ b/apps/system-apps/config/user/helm-charts/monitoring/templates/system-frontend.yaml @@ -226,7 +226,7 @@ spec: - mountPath: /www name: www-dir - name: wise-init - image: beclab/wise:v1.3.22 + image: beclab/wise:v1.3.24 imagePullPolicy: IfNotPresent command: - /bin/sh diff --git a/apps/vault/config/cluster/deploy/vault_server_deploy.yaml b/apps/vault/config/cluster/deploy/vault_server_deploy.yaml index 004da1a3..431833fe 100644 --- a/apps/vault/config/cluster/deploy/vault_server_deploy.yaml +++ b/apps/vault/config/cluster/deploy/vault_server_deploy.yaml @@ -83,7 +83,7 @@ spec: value: os_system_vault containers: - name: vault-server - image: beclab/vault-server:v1.3.22 + image: beclab/vault-server:v1.3.24 imagePullPolicy: IfNotPresent ports: - containerPort: 3000 @@ -114,7 +114,7 @@ spec: - name: vault-attach mountPath: /padloc/packages/server/attachments - name: vault-admin - image: beclab/vault-admin:v1.3.22 + image: beclab/vault-admin:v1.3.24 imagePullPolicy: IfNotPresent ports: - containerPort: 3010 diff --git a/apps/vault/config/user/helm-charts/vault/templates/vault_deploy.yaml b/apps/vault/config/user/helm-charts/vault/templates/vault_deploy.yaml index 4db1fdf4..2b19347f 100644 --- a/apps/vault/config/user/helm-charts/vault/templates/vault_deploy.yaml +++ b/apps/vault/config/user/helm-charts/vault/templates/vault_deploy.yaml @@ -88,13 +88,13 @@ spec: containers: - name: vault-frontend - image: beclab/vault-frontend:v1.3.22 + image: beclab/vault-frontend:v1.3.24 imagePullPolicy: IfNotPresent ports: - containerPort: 80 - name: notification-server - image: beclab/vault-notification:v1.3.22 + image: beclab/vault-notification:v1.3.24 imagePullPolicy: IfNotPresent ports: - containerPort: 3010 From 4f028e647895fba5b9de95231089522d8fecdfe9 Mon Sep 17 00:00:00 2001 From: liuyu <> Date: Wed, 22 Jan 2025 20:26:55 +0800 Subject: [PATCH 3/3] fix: increase the ingress read timeout --- frameworks/bfl/config/launcher/templates/bfl_deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/bfl/config/launcher/templates/bfl_deploy.yaml b/frameworks/bfl/config/launcher/templates/bfl_deploy.yaml index fdbe6c46..761bec70 100644 --- a/frameworks/bfl/config/launcher/templates/bfl_deploy.yaml +++ b/frameworks/bfl/config/launcher/templates/bfl_deploy.yaml @@ -296,7 +296,7 @@ spec: value: {{ .Values.bfl.terminus_dns_service_api }} - name: ingress - image: beclab/bfl-ingress:v0.2.18 + image: beclab/bfl-ingress:v0.2.19 imagePullPolicy: IfNotPresent volumeMounts: - name: ngxlog