删除pvc

app/service.js

@@ -15,6 +15,7 @@ const {
   imageUpdate,
   // getReplicaSet,
   replicaSetDelete,
+  pvcDelete,
 } = require('../kubeService/service')
 
 const router = new Router()
@@ -72,6 +73,7 @@ router.post('/delete', async (ctx) => {
 
   await serviceDelete(namespace, serviceName)
   await replicaSetDelete(namespace, serviceName)
+  await pvcDelete(namespace, serviceName)
 
   // let rsData = await getReplicaSet(namespace)
   // rsData = rsData.map(item => item.metadata.name).filter(item => item.indexOf(serviceName) !== -1)

kubeService/service.js

@@ -238,7 +238,7 @@ const serviceDelete = async (namespace, name) => {
     logger.info('删除svc', namespace, name)
     await client.api.v1.namespaces(namespace).services(name).delete()
   } catch (error) {
-    logger.error(error)
+    logger.warn(error.toString())
   }
 }
 
@@ -253,6 +253,15 @@ const replicaSetDelete = async (namespace, name) => {
   // await client.apis.apps.v1.namespaces(namespace).replicasets(rsName).delete()
 }
 
+const pvcDelete = async (namespace, name) => {
+  try {
+    logger.info('删除pvc', namespace, name)
+    await client.api.v1.namespaces(namespace).persistentvolumeclaim(`${name}-${namespace}`).delete()
+  } catch (error) {
+    logger.warn(error.toString())
+  }
+}
+
 const getServices = async (namespace) => {
   const data = await client.api.v1.namespaces(namespace).services.get()
   return data
@@ -271,4 +280,5 @@ module.exports = {
   imageUpdate,
   getReplicaSet,
   replicaSetDelete,
+  pvcDelete,
 }

serviceTemplate/resourceLimit.js

 /* eslint-disable no-multi-assign */
-const defaultRedis = {
+const defaultMysql = {
   memory: {
-    request: 100,
-    limit: 100,
+    request: 1024,
+    limit: 1024,
   },
   cpu: {
-    request: 100,
-    limit: 200,
+    request: 200,
+    limit: 2000,
   },
 }
 
-const defaultZookeeper = {
+const defaultRabbitmq = {
   memory: {
-    request: 300,
-    limit: 300,
+    request: 800,
+    limit: 800,
   },
   cpu: {
     request: 100,
@@ -21,21 +21,21 @@ const defaultZookeeper = {
   },
 }
 
-const defaultMysql = {
+const defaultZookeeper = {
   memory: {
-    request: 1024,
-    limit: 1024,
+    request: 300,
+    limit: 300,
   },
   cpu: {
-    request: 200,
-    limit: 2000,
+    request: 100,
+    limit: 200,
   },
 }
 
-const defaultRabbitmq = {
+const defaultRedis = {
   memory: {
-    request: 800,
-    limit: 800,
+    request: 100,
+    limit: 100,
   },
   cpu: {
     request: 100,
@@ -51,22 +51,22 @@ const memoryV1 = {
 }
 
 const memoryV2 = {
-  request: 300,
-  limit: 300,
+  request: 200,
+  limit: 240,
 }
 
 const memoryV2P = {
-  request: 600,
+  request: 500,
   limit: 600,
 }
 
 const memoryV3 = {
-  request: 1000,
+  request: 800,
   limit: 1000,
 }
 
 const memoryV4 = {
-  request: 1500,
+  request: 1200,
   limit: 1500,
 }
 

yamls/ui.node.yaml

@@ -65,7 +65,7 @@ spec:
               - /home/quant_group/readyCheck.sh
           initialDelaySeconds: 2
           timeoutSeconds: 2
-          periodSeconds: 1
+          periodSeconds: 3
           successThreshold: 1
           failureThreshold: 40
       restartPolicy: Always