所有服务设置资源限制

app/service.js

@@ -7,6 +7,7 @@ const templates = require('../serviceTemplate')
 const lruCache = require('../services/lruCache.service')
 const { ingressCreate, ingressDelete } = require('../kubeService/ingress')
 const { podGet } = require('../kubeService/service')
+const {projectConfig, defaultConfig} = require('../serviceTemplate/resourceLimit')
 
 const router = new Router()
 module.exports = router
@@ -60,24 +61,10 @@ const createService = async (ctx) => {
     data.system_name = serviceName
   }
 
-  // java 增加内存限制
-  if (type === 'java') {
-    data.resources = {
-      cpu: {
-        request: 100,
-        limit: 250,
-      },
-      memory: {
-        request: 100,
-        limit: 1024,
-      },
-    }
-
-    const special = ['xyqb', 'xyqb-user2']
-    if (special.includes(serviceName)) {
-      data.resources.memory.request = 600
-    }
-  }
+  // 资源限制
+  let resources = projectConfig[system_name] || defaultConfig[type]
+  logger.info('资源限制', JSON.stringify(resources))
+  data.resources = resources
 
   const template = templates[type].replace(/{{([A-Za-z0-9_\.]+)}}/g, function () {
     console.log(arguments[1])

serviceTemplate/java.template.txt

@@ -14,5 +14,7 @@ containers.0.envs.0.value: {{system_name}}
 containers.0.envs.1.name: NAMESPACE
 containers.0.envs.1.value: {{namespace}}
 
-containers.0.cpuLimits: 200
-containers.0.memoryLimits: 1024
+containers.0.cpu: {{resources.cpu.request}}
+containers.0.cpuLimits: {{resources.cpu.limit}}
\ No newline at end of file
+containers.0.memory: {{resources.memory.request}}
+containers.0.memoryLimits: {{resources.memory.limit}}
\ No newline at end of file

serviceTemplate/mysql.template.txt

@@ -18,10 +18,10 @@ containers.0.envs.1.value: qatest
 containers.0.envs.2.name: MYSQL_ROOT_PASSWORD
 containers.0.envs.2.value: qatest
 
-containers.0.cpu: 200
-containers.0.cpuLimits: 2000
-containers.0.memory: 1024
-containers.0.memoryLimits: 1500
+containers.0.cpu: {{resources.cpu.request}}
+containers.0.cpuLimits: {{resources.cpu.limit}}
+containers.0.memory: {{resources.memory.request}}
+containers.0.memoryLimits: {{resources.memory.limit}}
 
 volumes.0.name: mysql-vol
 volumes.0.volumeType: hostPath

serviceTemplate/node.template.txt

@@ -13,3 +13,8 @@ containers.0.envs.0.name: SYSTEM_NAME
 containers.0.envs.0.value: {{serviceName}}
 containers.0.envs.1.name: NAMESPACE
 containers.0.envs.1.value: {{namespace}}
+
+containers.0.cpu: {{resources.cpu.request}}
+containers.0.cpuLimits: {{resources.cpu.limit}}
+containers.0.memory: {{resources.memory.request}}
+containers.0.memoryLimits: {{resources.memory.limit}}

serviceTemplate/rabbitmq.template.txt

@@ -22,3 +22,8 @@ containers.0.envs.1.value: qatest
 volumes.0.name: rabbitmq-vol
 volumes.0.volumeType: hostPath
 volumes.0.hostPath: /var/lib/data/rabbitmq/{{namespace}}
+
+containers.0.cpu: {{resources.cpu.request}}
+containers.0.cpuLimits: {{resources.cpu.limit}}
+containers.0.memory: {{resources.memory.request}}
+containers.0.memoryLimits: {{resources.memory.limit}}

serviceTemplate/redis.template.txt

@@ -27,3 +27,8 @@ containers.0.volumeMounts.0.mode: rw
 volumes.0.name: redis-vol
 volumes.0.volumeType: hostPath
 volumes.0.hostPath: /var/lib/data/redis/{{namespace}}
+
+containers.0.cpu: {{resources.cpu.request}}
+containers.0.cpuLimits: {{resources.cpu.limit}}
+containers.0.memory: {{resources.memory.request}}
+containers.0.memoryLimits: {{resources.memory.limit}}

serviceTemplate/ui.template.txt

@@ -14,3 +14,8 @@ containers.0.envs.0.value: {{system_name}}
 containers.0.envs.1.name: NAMESPACE
 containers.0.envs.1.value: {{namespace}}
 
+containers.0.cpu: {{resources.cpu.request}}
+containers.0.cpuLimits: {{resources.cpu.limit}}
+containers.0.memory: {{resources.memory.request}}
+containers.0.memoryLimits: {{resources.memory.limit}}
+

serviceTemplate/zookeeper.template.txt

@@ -22,3 +22,8 @@ containers.0.envs.1.value: 2181
 volumes.0.name: zookeeper-vol
 volumes.0.volumeType: hostPath
 volumes.0.hostPath: /var/lib/data/zookeeper/{{namespace}}
+
+containers.0.cpu: {{resources.cpu.request}}
+containers.0.cpuLimits: {{resources.cpu.limit}}
+containers.0.memory: {{resources.memory.request}}
+containers.0.memoryLimits: {{resources.memory.limit}}