Merge branch 'release-6.0.1' into 'master'

Release 6.0.1

See merge request !7

kpl/cfg-kpl-backend.yaml.j2

@@ -73,10 +73,16 @@ data:
       iot: {{ iot_boolean }} # 默认false, 不开启边缘设备功能
       iot: {{ iot_boolean }} # 默认false, 不开启边缘设备功能
       open_grafana: {{ grafana_boolean }} # 默认false, 不开启grafana功能
       open_grafana: {{ grafana_boolean }} # 默认false, 不开启grafana功能
       disable_i18n: {{ disable_i18n_boolean }} # 默认false，开启国际化功能
       disable_i18n: {{ disable_i18n_boolean }} # 默认false，开启国际化功能
-      notebook_grafana_url: {{ notebook_grafana_url_string }}# 容器grafana跳转url http://10.69.75.115:8883/d/W-Y9JdKGk/pod_metric_dashboard?orgId=1&var-pod_prefix=%s&var-pod=%s
+      notebook_grafana_url: {{ notebook_grafana_url_string }} # 容器grafana跳转url http://10.69.75.115:8883/d/W-Y9JdKGk/pod_metric_dashboard?orgId=1&var-pod_prefix=%s&var-pod=%s
       node_grafana_url: {{ node_grafana_url_string }} # node节点grafana跳转url http://10.69.75.115:8883/d/9CWBz0bik/node-exporter-kpl?orgId=1&var-job=node-exporter&var-hostname=All&var-node=%s
       node_grafana_url: {{ node_grafana_url_string }} # node节点grafana跳转url http://10.69.75.115:8883/d/9CWBz0bik/node-exporter-kpl?orgId=1&var-job=node-exporter&var-hostname=All&var-node=%s
       use_fake_metric: {{ use_fake_metric_string }} # CPU,GPU,MEM 代表随机生成 cpu, gpu, mem的使用率, 可以只开启需要的类型, 以逗号分割
       use_fake_metric: {{ use_fake_metric_string }} # CPU,GPU,MEM 代表随机生成 cpu, gpu, mem的使用率, 可以只开启需要的类型, 以逗号分割
       temp_oidc_create: {{ temp_oidc_create_boolean }} # 默认false，如果需要开启则为true
       temp_oidc_create: {{ temp_oidc_create_boolean }} # 默认false，如果需要开启则为true
+      auto_stop_tasks_when_user_assets_is_empty: auto_stop_tasks_when_user_assets_is_empty_boolean # 当用户算力为0时, 自动停止所有该用户的任务, 默认false，如果需要开启则为true
+      open_cluster_monitor: true # 是否开启集群监控功能
+      open_gpu_share: true # 是否开启gpu share功能
+      system_header: # 是否关闭某个子系统功能
+        - "train" # 训练平台
+        - "inference" # 推理平台
 
 
     temp_oidc_create:
     temp_oidc_create:
       create_from: {{ create_from_string }} #对应的OIDC登录名称 kplsso
       create_from: {{ create_from_string }} #对应的OIDC登录名称 kplsso

kpl/cfg-kpl-frontend.yaml.j2

@@ -10,6 +10,14 @@ data:
       'apiTestUrl': `${host}`,
       'apiTestUrl': `${host}`,
       'adminUrl': `${host}/admin/login`,
       'adminUrl': `${host}/admin/login`,
     }
     }
+    
+    //推理平台
+    const inferenceHost = {
+      'baseUrl': `${host}/api/v1/ip`,
+      'adminUrl': `${host}/api/v1/admin/ip`,
+      'baseWebSocket': `${host.replace('http', 'ws')}/api/v1/ip`,
+    }
+    
     const kplStream = 'kpl_stream'
     const kplStream = 'kpl_stream'
 kind: ConfigMap
 kind: ConfigMap
 metadata:
 metadata:

kpl/cfg-kpl-nginx.yaml.j2

@@ -53,6 +53,29 @@ data:
         proxy_set_header      Host $host;
         proxy_set_header      Host $host;
         client_max_body_size  10240m;
         client_max_body_size  10240m;
     }
     }
+    
+    location ~ /tensorboard/proxy/([-_.:\w]+)/(.*) {
+        resolver kube-dns.kube-system.svc.cluster.local valid=5s;
+        rewrite_log on;
+        rewrite ^/tensorboard/proxy/([-_.:\w]+)/(.*) /$2 break;
+        proxy_pass http://$1.autodl.svc.cluster.local:9999;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Origin "";
+    }
+    
+    location /grafana {
+        root   html;
+        index  index.html index.htm;
+        add_header 'Access-Control-Allow-Origin' '*';
+        add_header Access-Control-Allow-Methods GET,POST,OPTIONS,DELETE;
+        add_header 'Access-Control-Allow-Headers' 'userId,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
+        proxy_pass http://wd-grafana.autodl.svc.cluster.local:3000;
+        rewrite ^/grafana/(.*) /$1 break;
+        proxy_set_header   Host $host;
+    }
+
 
 
     location = /basic_status {
     location = /basic_status {
         stub_status;
         stub_status;
@@ -127,6 +150,29 @@ data:
             proxy_set_header      Host $host;
             proxy_set_header      Host $host;
             client_max_body_size  10240m;
             client_max_body_size  10240m;
         }
         }
+        
+        location ~ /tensorboard/proxy/([-_.:\w]+)/(.*) {
+            resolver kube-dns.kube-system.svc.cluster.local valid=5s;
+            rewrite_log on;
+            rewrite ^/tensorboard/proxy/([-_.:\w]+)/(.*) /$2 break;
+            proxy_pass http://$1.autodl.svc.cluster.local:9999;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Origin "";
+        }
+
+        location /grafana {
+            root   html;
+            index  index.html index.htm;
+            add_header 'Access-Control-Allow-Origin' '*';
+            add_header Access-Control-Allow-Methods GET,POST,OPTIONS,DELETE;
+            add_header 'Access-Control-Allow-Headers' 'userId,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
+            proxy_pass http://wd-grafana.autodl.svc.cluster.local:3000;
+            rewrite ^/grafana/(.*) /$1 break;
+            proxy_set_header   Host $host;
+        }
+
 
 
         location = /basic_status {
         location = /basic_status {
             stub_status;
             stub_status;