Merge remote-tracking branch 'origin/master'

# Conflicts:
#	kubeService/ingress.js

app/namespace.js

 const Router = require('koa-router')
 const yaml = require('js-yaml')
+const qs = require('querystring')
 const templates = require('../serviceTemplate')
 
 let newNsKey = ''
@@ -12,9 +13,16 @@ router.get('/', async (ctx) => {
   ctx.body = ctx.ok(data)
 })
 
+
+router.get('/info', async (ctx) => {
+  const data = await ctx.cluster.namespace_get()
+  const ns = data.namespaces.find(item => item.name === qs.unescape(ctx.request.query.namespace))
+  ctx.body = ctx.ok(ns)
+})
+
 router.post('/create', async (ctx) => {
   await ctx.cluster.namespace_create(ctx.request.body.name)
-  await ctx.cluster.ingress_create(ctx.request.body.name)
+  // await ctx.cluster.ingress_create(ctx.request.body.name)
   ctx.body = ctx.ok()
 })
 

app/service.js

-
 const Router = require('koa-router')
 const yaml = require('js-yaml')
+const logger = require('koa-log4').getLogger()
+
 const templates = require('../serviceTemplate')
 const { ingressCreate, ingressDelete } = require('../kubeService/ingress')
 
-const TYPES = ['ui', 'java', 'node', 'python', 'go']
-
-
 const router = new Router()
 module.exports = router
 
@@ -17,32 +15,31 @@ router.get('/', async (ctx) => {
 
 router.post('/create', async (ctx) => {
   const {
-    type, serviceName, namespace, image, system_name, lable,
+    type, serviceName, namespace, image, system_name, domain, label,
   } = ctx.request.body
-  if (!TYPES.includes(type)) {
-    ctx.body = ctx.fail('不支持的服务类型')
-    return ctx.body
-  }
+  logger.info('创建服务', ctx.request.body)
   const data = {
     serviceName,
     namespace,
     image,
     system_name,
-    lable,
   }
   if (!system_name) {
     // ui abTest的时候不一样
     data.system_name = serviceName
   }
+
   const template = templates[type].replace(/{{([A-Za-z0-9_]+)}}/g, function () {
     if (data[arguments[1]] === undefined) {
-      throw new Error('缺少模板所需变量')
+      throw new Error(`缺少模板所需变量: ${arguments[1]}`)
     }
     return data[arguments[1]]
   })
   const params = yaml.load(template)
-  await ctx.cluster.service_create(params, type)
-  await ingressCreate(namespace, serviceName)
+  await ctx.cluster.service_create(params, label)
+  if (domain) {
+    await ingressCreate({ namespace, serviceName, domain })
+  }
   ctx.body = ctx.ok('创建成功')
 })
 router.post('/details', async (ctx) => {

kubeService/ingress.js

@@ -4,6 +4,7 @@ const config = require('kubernetes-client').config
 
 
 // const client = new Client({ config: config.fromKubeconfig(), version: '1.9' })
+console.log(path.resolve(__dirname, './kubeConfig.yaml'))
 const client = new Client({
   config: config.fromKubeconfig(
     path.resolve(__dirname, './kubeConfig.yaml'),

serviceTemplate/java.template.txt

@@ -8,7 +8,7 @@ portMappings.0.lbPort: 80
 portMappings.0.containerPort: 80
 
 containers.0.containerName: {{system_name}}
-containers.0.image: {{image}}
+containers.0.image: ccr.ccs.tencentyun.com/{{image}}
 containers.0.envs.0.name: SYSTEM_NAME
 containers.0.envs.0.value: {{system_name}}
 containers.0.envs.1.name: NAMESPACE

serviceTemplate/mysql.template.txt

@@ -8,7 +8,7 @@ portMappings.0.lbPort: 3306
 portMappings.0.containerPort: 3306
 
 containers.0.containerName: mysql
-containers.0.image: {{image}}
+containers.0.image: ccr.ccs.tencentyun.com/{{image}}
 containers.0.volumeMounts.0.volumeName: mysql-vol
 containers.0.volumeMounts.0.mountPath: /var/lib/mysql
 containers.0.volumeMounts.0.mode: rw

serviceTemplate/node.template.txt

@@ -8,7 +8,7 @@ portMappings.0.lbPort: 80
 portMappings.0.containerPort: 80
 
 containers.0.containerName: {{serviceName}}
-containers.0.image: {{image}}
+containers.0.image: ccr.ccs.tencentyun.com/{{image}}
 containers.0.envs.0.name: SYSTEM_NAME
 containers.0.envs.0.value: {{serviceName}}
 containers.0.envs.1.name: NAMESPACE

serviceTemplate/rabbitmq.template.txt

@@ -12,7 +12,7 @@ portMappings.1.lbPort: 15672
 portMappings.1.containerPort: 15672
 
 containers.0.containerName: rabbitmq
-containers.0.image: {{image}}
+containers.0.image: ccr.ccs.tencentyun.com/{{image}}
 containers.0.volumeMounts.0.volumeName: rabbitmq-vol
 containers.0.volumeMounts.0.mountPath: /var/lib/rabbitmq
 containers.0.volumeMounts.0.mode: rw

serviceTemplate/redis.template.txt

@@ -24,7 +24,7 @@ portMappings.4.lbPort: 6383
 portMappings.4.containerPort: 6383
 
 containers.0.containerName: redis
-containers.0.image: {{image}}
+containers.0.image: ccr.ccs.tencentyun.com/{{image}}
 containers.0.volumeMounts.0.volumeName: redis-vol
 containers.0.volumeMounts.0.mountPath: /var/lib/redis
 containers.0.volumeMounts.0.mode: rw

serviceTemplate/ui.template.txt

@@ -8,7 +8,7 @@ portMappings.0.lbPort: 80
 portMappings.0.containerPort: 80
 
 containers.0.containerName: {{system_name}}
-containers.0.image: {{image}}
+containers.0.image: ccr.ccs.tencentyun.com/{{image}}
 containers.0.envs.0.name: SYSTEM_NAME
 containers.0.envs.0.value: {{system_name}}
 containers.0.envs.1.name: NAMESPACE

serviceTemplate/zookeeper.template.txt

@@ -12,7 +12,7 @@ portMappings.1.lbPort: 9090
 portMappings.1.containerPort: 9090
 
 containers.0.containerName: zookeeper
-containers.0.image: {{image}}
+containers.0.image: ccr.ccs.tencentyun.com/{{image}}
 containers.0.volumeMounts.0.volumeName: zookeeper-vol
 containers.0.volumeMounts.0.mountPath: /var/lib/zookeeper
 containers.0.volumeMounts.0.mode: rw

services/tke.clusterService.js

+const logger = require('koa-log4').getLogger()
+
 const Client = require('./tke.service')
 const domainConfig = require('../config')
 
@@ -28,6 +30,7 @@ class Cluster extends Client {
   }
 
   async service_create(params, type) {
+    logger.info('创建服务详细信息：', params, type)
     params.clusterId = this.clusterId
     const str = JSON.stringify(params)
     await this.post('CreateClusterService', params)
@@ -68,6 +71,7 @@ class Cluster extends Client {
   }
 
   ingress_create(namespace) {
+    logger.info()
     return this.post('CreateIngress', {
       ingressName: `qa-${namespace}`,
       ingressDesc: '',