From e4858cc9767be236e3c04a8ea10aeddeeb19766a Mon Sep 17 00:00:00 2001 From: somunslotus Date: Fri, 20 Sep 2024 11:57:07 +0800 Subject: [PATCH 1/6] x --- k8s/template-yaml/deploy/k8s-7management.yaml | 12 +++++++++++- k8s/template-yaml/k8s-7management.yaml | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/k8s/template-yaml/deploy/k8s-7management.yaml b/k8s/template-yaml/deploy/k8s-7management.yaml index 9c00a04b..b6d87d08 100644 --- a/k8s/template-yaml/deploy/k8s-7management.yaml +++ b/k8s/template-yaml/deploy/k8s-7management.yaml @@ -15,9 +15,19 @@ spec: spec: containers: - name: ci4s-management-platform - image: 172.20.32.187/ci4s/ci4s-managent:202409181517 + image: 172.20.32.187/ci4s/ci4s-managent:202409201116 + env: + - name: TZ + value: Asia/Shanghai ports: - containerPort: 9213 + volumeMounts: + - name: resource-volume + mountPath: /home/resource/ + volumes: + - name: resource-volume + persistentVolumeClaim: + claimName: platform-data-pvc-nfs --- apiVersion: v1 kind: Service diff --git a/k8s/template-yaml/k8s-7management.yaml b/k8s/template-yaml/k8s-7management.yaml index d4c17efc..15d0bc5e 100644 --- a/k8s/template-yaml/k8s-7management.yaml +++ b/k8s/template-yaml/k8s-7management.yaml @@ -19,6 +19,8 @@ spec: env: - name: TZ value: Asia/Shanghai + - name: JAVA_TOOL_OPTIONS + value: -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=*:5005 ports: - containerPort: 9213 volumeMounts: From aa37cfaede3e3d722b5ef4fc4dcb984124e615f9 Mon Sep 17 00:00:00 2001 From: somunslotus Date: Fri, 20 Sep 2024 13:44:39 +0800 Subject: [PATCH 2/6] x --- k8s/template-yaml/k8s-7management.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/k8s/template-yaml/k8s-7management.yaml b/k8s/template-yaml/k8s-7management.yaml index 15d0bc5e..a868f8a0 100644 --- a/k8s/template-yaml/k8s-7management.yaml +++ b/k8s/template-yaml/k8s-7management.yaml @@ -42,6 +42,11 @@ spec: - port: 9213 nodePort: 31208 protocol: TCP + - name: debug + nodePort: 34567 + port: 5005 + porttocol: TCP + targetPort: 5005 selector: app: ci4s-management-platform From 64f949ec5ecbef5220009a1b844ab5a80754342e Mon Sep 17 00:00:00 2001 From: somunslotus Date: Fri, 20 Sep 2024 13:49:15 +0800 Subject: [PATCH 3/6] x --- k8s/dockerfiles/conf/nginx.conf.bak | 60 +++++++++++++++++++ k8s/template-yaml/deploy/k8s-7management.yaml | 9 ++- k8s/template-yaml/k8s-7management.yaml | 4 +- 3 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 k8s/dockerfiles/conf/nginx.conf.bak diff --git a/k8s/dockerfiles/conf/nginx.conf.bak b/k8s/dockerfiles/conf/nginx.conf.bak new file mode 100644 index 00000000..281ad4f4 --- /dev/null +++ b/k8s/dockerfiles/conf/nginx.conf.bak @@ -0,0 +1,60 @@ +worker_processes 1; + +events { + worker_connections 1024; +} + +http { + include mime.types; + default_type application/octet-stream; + sendfile on; + keepalive_timeout 65; + + server { + listen 8000; + server_name localhost; + + location /api/{ + rewrite ^/prod-api/(.*)$ /$1 break; + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header REMOTE-HOST $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass http://ci4s-gateway-service.argo.svc:8082/; + } + + location /label-studio { + rewrite ^/prod-api/(.*)$ /$1 break; + proxy_pass http://label-studio-ls-app.label-data.svc:80/; + proxy_hide_header X-Frame-Options; + add_header X-Frame-Options "ALLOW-FROM http://label-studio-ls-app.label-data.svc:80/"; + } + + location /api/v1/model/ { + proxy_pass http://pipeline-convert-service.argo.svc:80; + proxy_set_header REMOTE-HOST $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + + location / { + rewrite ^/prod-api/(.*)$ /$1 break; + root /home/ruoyi/projects/ruoyi-ui; + try_files $uri $uri/ /index.html; + index index.html index.htm; + } + + location @router { + rewrite ^.*$ /index.html last; + } + + # 避免actuator暴露 + if ($request_uri ~ "/actuator") { + return 403; + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } + } +} diff --git a/k8s/template-yaml/deploy/k8s-7management.yaml b/k8s/template-yaml/deploy/k8s-7management.yaml index b6d87d08..07f9525a 100644 --- a/k8s/template-yaml/deploy/k8s-7management.yaml +++ b/k8s/template-yaml/deploy/k8s-7management.yaml @@ -15,10 +15,12 @@ spec: spec: containers: - name: ci4s-management-platform - image: 172.20.32.187/ci4s/ci4s-managent:202409201116 + image: 172.20.32.187/ci4s/ci4s-managent:202409201345 env: - name: TZ value: Asia/Shanghai + - name: JAVA_TOOL_OPTIONS + value: -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=*:5005 ports: - containerPort: 9213 volumeMounts: @@ -40,6 +42,11 @@ spec: - port: 9213 nodePort: 31208 protocol: TCP + - name: debug + nodePort: 34567 + port: 5005 + porttocol: TCP + targetPort: 5005 selector: app: ci4s-management-platform diff --git a/k8s/template-yaml/k8s-7management.yaml b/k8s/template-yaml/k8s-7management.yaml index a868f8a0..7cbfab68 100644 --- a/k8s/template-yaml/k8s-7management.yaml +++ b/k8s/template-yaml/k8s-7management.yaml @@ -20,7 +20,7 @@ spec: - name: TZ value: Asia/Shanghai - name: JAVA_TOOL_OPTIONS - value: -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=*:5005 + value: "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=*:5005" ports: - containerPort: 9213 volumeMounts: @@ -45,7 +45,7 @@ spec: - name: debug nodePort: 34567 port: 5005 - porttocol: TCP + portocol: TCP targetPort: 5005 selector: app: ci4s-management-platform From 53e725e82187b612b404f11b67aa6e7cf7a7786d Mon Sep 17 00:00:00 2001 From: somunslotus Date: Fri, 20 Sep 2024 13:51:44 +0800 Subject: [PATCH 4/6] x --- k8s/template-yaml/deploy/k8s-7management.yaml | 6 +++--- k8s/template-yaml/k8s-7management.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/k8s/template-yaml/deploy/k8s-7management.yaml b/k8s/template-yaml/deploy/k8s-7management.yaml index 07f9525a..6f433e63 100644 --- a/k8s/template-yaml/deploy/k8s-7management.yaml +++ b/k8s/template-yaml/deploy/k8s-7management.yaml @@ -15,12 +15,12 @@ spec: spec: containers: - name: ci4s-management-platform - image: 172.20.32.187/ci4s/ci4s-managent:202409201345 + image: 172.20.32.187/ci4s/ci4s-managent:202409201350 env: - name: TZ value: Asia/Shanghai - name: JAVA_TOOL_OPTIONS - value: -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=*:5005 + value: "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=*:5005" ports: - containerPort: 9213 volumeMounts: @@ -45,7 +45,7 @@ spec: - name: debug nodePort: 34567 port: 5005 - porttocol: TCP + portocol: TCP targetPort: 5005 selector: app: ci4s-management-platform diff --git a/k8s/template-yaml/k8s-7management.yaml b/k8s/template-yaml/k8s-7management.yaml index 7cbfab68..2a237227 100644 --- a/k8s/template-yaml/k8s-7management.yaml +++ b/k8s/template-yaml/k8s-7management.yaml @@ -45,7 +45,7 @@ spec: - name: debug nodePort: 34567 port: 5005 - portocol: TCP + protocol: TCP targetPort: 5005 selector: app: ci4s-management-platform From 911dd2bb727ac7608dc3d790b2f048239c03b864 Mon Sep 17 00:00:00 2001 From: somunslotus Date: Fri, 20 Sep 2024 13:54:08 +0800 Subject: [PATCH 5/6] x --- k8s/template-yaml/deploy/k8s-7management.yaml | 4 ++-- k8s/template-yaml/k8s-7management.yaml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/k8s/template-yaml/deploy/k8s-7management.yaml b/k8s/template-yaml/deploy/k8s-7management.yaml index 6f433e63..859e9199 100644 --- a/k8s/template-yaml/deploy/k8s-7management.yaml +++ b/k8s/template-yaml/deploy/k8s-7management.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: ci4s-management-platform - image: 172.20.32.187/ci4s/ci4s-managent:202409201350 + image: 172.20.32.187/ci4s/ci4s-managent:202409201352 env: - name: TZ value: Asia/Shanghai @@ -45,7 +45,7 @@ spec: - name: debug nodePort: 34567 port: 5005 - portocol: TCP + protocol: TCP targetPort: 5005 selector: app: ci4s-management-platform diff --git a/k8s/template-yaml/k8s-7management.yaml b/k8s/template-yaml/k8s-7management.yaml index 2a237227..b506d6b5 100644 --- a/k8s/template-yaml/k8s-7management.yaml +++ b/k8s/template-yaml/k8s-7management.yaml @@ -39,7 +39,8 @@ metadata: spec: type: NodePort ports: - - port: 9213 + - name: http + port: 9213 nodePort: 31208 protocol: TCP - name: debug From 1d117b0ca59d442dad53bdf87995e1805b53d77a Mon Sep 17 00:00:00 2001 From: somunslotus Date: Fri, 20 Sep 2024 13:56:50 +0800 Subject: [PATCH 6/6] x --- k8s/template-yaml/deploy/k8s-7management.yaml | 5 +++-- k8s/template-yaml/k8s-7management.yaml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/k8s/template-yaml/deploy/k8s-7management.yaml b/k8s/template-yaml/deploy/k8s-7management.yaml index 859e9199..75f1b522 100644 --- a/k8s/template-yaml/deploy/k8s-7management.yaml +++ b/k8s/template-yaml/deploy/k8s-7management.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: ci4s-management-platform - image: 172.20.32.187/ci4s/ci4s-managent:202409201352 + image: 172.20.32.187/ci4s/ci4s-managent:202409201355 env: - name: TZ value: Asia/Shanghai @@ -39,7 +39,8 @@ metadata: spec: type: NodePort ports: - - port: 9213 + - name: http + port: 9213 nodePort: 31208 protocol: TCP - name: debug diff --git a/k8s/template-yaml/k8s-7management.yaml b/k8s/template-yaml/k8s-7management.yaml index b506d6b5..4fcddb15 100644 --- a/k8s/template-yaml/k8s-7management.yaml +++ b/k8s/template-yaml/k8s-7management.yaml @@ -44,7 +44,7 @@ spec: nodePort: 31208 protocol: TCP - name: debug - nodePort: 34567 + nodePort: 31219 port: 5005 protocol: TCP targetPort: 5005