Merge branch 'dev' of https://gitlink.org.cn/ci4s/ci4sManagement-cloud into dev

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;
+        }
+    }
+}

k8s/template-yaml/deploy/k8s-7management.yaml

@@ -15,9 +15,21 @@ spec:
     spec:
       containers:
       - name: ci4s-management-platform
-        image: 172.20.32.187/ci4s/ci4s-managent:202409181517
+        image: 172.20.32.187/ci4s/ci4s-managent:202409201355
+        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:
+        - name: resource-volume
+          mountPath: /home/resource/
+      volumes:
+      - name: resource-volume
+        persistentVolumeClaim:
+          claimName: platform-data-pvc-nfs
 ---
 apiVersion: v1
 kind: Service
@@ -27,9 +39,15 @@ metadata:
 spec:
   type: NodePort
   ports:
-    - port: 9213
+    - name: http
+      port: 9213
       nodePort: 31208
       protocol: TCP
+    - name: debug
+      nodePort: 34567
+      port: 5005
+      protocol: TCP
+      targetPort: 5005
   selector:
     app: ci4s-management-platform
 

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:
@@ -37,9 +39,15 @@ metadata:
 spec:
   type: NodePort
   ports:
-    - port: 9213
+    - name: http
+      port: 9213
       nodePort: 31208
       protocol: TCP
+    - name: debug
+      nodePort: 31219
+      port: 5005
+      protocol: TCP
+      targetPort: 5005
   selector:
     app: ci4s-management-platform