模板增加env : debug

app/service.js

@@ -47,7 +47,7 @@ router.get('/', async (ctx) => {
 
 const createService = async (ctx) => {
   const {
-    type, serviceName, namespace, image, system_name, domain, label,
+    type, serviceName, namespace, image, system_name, domain, label, debug,
   } = ctx.request.body
   logger.info('创建服务', ctx.request.body)
   if (label === 'base') {
@@ -60,6 +60,7 @@ const createService = async (ctx) => {
     namespace,
     image,
     system_name,
+    debug,
   }
   if (!system_name) {
     // ui abTest的时候不一样
@@ -106,11 +107,10 @@ router.post('/details', async (ctx) => {
     namespace: ctx.Joi.string().required(),
   }))
 
-  // const res = await ctx.cluster.node_list()
-  // const lanIp = _.get(res, 'nodes[0].lanIp', '')
-
   const podData = await podGet(ctx.request.body.namespace)
-  const lanIp = podData.body.items.filter(i => i.metadata.name.indexOf(ctx.request.body.serviceName) !== -1)[0].status.hostIP
+  // const lanIp = podData.body.items.filter(i => i.metadata.name.indexOf(ctx.request.body.serviceName) !== -1)[0].status.hostIP
+  const serviceItems = podData.body.items.filter(i => i.metadata.name.indexOf(ctx.request.body.serviceName) !== -1)
+  const lanIp = _.get(serviceItems, '[0].status.hostIP', '')
 
   const data = await ctx.cluster.service_get(ctx.request.body.serviceName, ctx.request.body.namespace)
   ctx.body = ctx.ok(Object.assign({}, data, { lanIp }))

serviceTemplate/java.template.txt

@@ -13,6 +13,8 @@ containers.0.envs.0.name: SYSTEM_NAME
 containers.0.envs.0.value: {{system_name}}
 containers.0.envs.1.name: NAMESPACE
 containers.0.envs.1.value: {{namespace}}
+containers.0.envs.2.name: DEBUG
+containers.0.envs.2.value: {{debug}}
 
 containers.0.cpu: {{resources.cpu.request}}
 containers.0.cpuLimits: {{resources.cpu.limit}}

serviceTemplate/node.template.txt

@@ -13,6 +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.envs.2.name: DEBUG
+containers.0.envs.2.value: {{debug}}
 
 containers.0.cpu: {{resources.cpu.request}}
 containers.0.cpuLimits: {{resources.cpu.limit}}

serviceTemplate/ui.template.txt

@@ -13,9 +13,10 @@ containers.0.envs.0.name: SYSTEM_NAME
 containers.0.envs.0.value: {{system_name}}
 containers.0.envs.1.name: NAMESPACE
 containers.0.envs.1.value: {{namespace}}
+containers.0.envs.2.name: DEBUG
+containers.0.envs.2.value: {{debug}}
 
 containers.0.cpu: {{resources.cpu.request}}
 containers.0.cpuLimits: {{resources.cpu.limit}}
 containers.0.memory: {{resources.memory.request}}
 containers.0.memoryLimits: {{resources.memory.limit}}
-