Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm

app-dm/src/pages/ListPages/Training/Operation2.jsx

@@ -130,7 +130,7 @@ function Operation2() {
         <div className='nav-operation2'>
             {/* 导航 */}
             {/* <h1>{OperationId}</h1> */}
-            <p>剩余时间：{formatTime(countdown)}</p>
+            {countdown>0&& <p>剩余时间：{formatTime(countdown)}</p>}
         </div>
         <div className='body-operation2'>
             <div className='nav-left-operation2'>

python/assets/type0-pod.yaml

@@ -17,8 +17,8 @@ spec:
         runAsGroup: 0
       resources:
         limits:
-          cpu: '0.2'
-          memory: 0.2Gi
+          cpu: '0.5'
+          memory: 1.2Gi
         requests:
-          cpu: '0.1'
-          memory: 0.1Gi
+          cpu: '0'
+          memory: 0Gi

python/assets/type1-pod.yaml

@@ -15,8 +15,8 @@ spec:
         runAsGroup: 0
       resources:
         limits:
-          cpu: '0.2'
-          memory: 0.2Gi
+          cpu: '0.7'
+          memory: 1.5Gi
         requests:
-          cpu: '0.1'
-          memory: 0.1Gi
+          cpu: '0'
+          memory: 0Gi

python/del.py

@@ -1,5 +1,5 @@
 import k8s_func
-studentList=['n20240101-63','n20240102-63','s20240101-66']
+studentList=['s20240101-67','s20240102-67']
 
 for i in studentList:
     k8s_func.delete_pod(i)