Merge branch 'kewei' into 'master'

Kewei



See merge request !2

app/index.js

@@ -7,33 +7,29 @@ const result = require('../middleware/result')
 
 const namespaceRoute = require('./namespace')
 const serviceRoute = require('./service')
-// const rabbitmqRoute = require('./rabbitmq')
-// const zookeeperRoute = require('./zookeeper')
+const repositoryRouter = require('./repository')
+const tag = require('./tag')
 const commonServiceRoute = require('./commonService')
 const ingressRoute = require('./ingress')
 
-const client = require('../services/tke.service').create({
-  secretId: 'AKID4rY7wwNphsUcaFsy1pRtKhQvDj4CA3Ac',
-  secretKey: 'YBduRnjgVRGzmagZJbss3Vo58wWCyhgc',
-  clusterId: 'cls-acfx4pvj',
-  region: 'ap-beijing'
-})
-
+const cluster = require('../services/tke.clusterService').create()
+const container = require('../services/tke.containerService').create()
 function loadRoutes (router) {
   router
     .use(error())
     .use(result())
     .use(async (ctx, next) => {
       // 腾讯云
-      ctx.client = client
+      ctx.container = container
+      ctx.cluster = cluster
       await next()
     }, bodyParser())
       .use('/namespace', namespaceRoute.routes())
       .use('/service', serviceRoute.routes())
-    // .use('/rabbitmq', rabbitmqRoute.routes())
-    // .use('/zookeeper', zookeeperRoute.routes())
       .use('/commonService', commonServiceRoute.routes())
       .use('/ingress', ingressRoute.routes())
+      .use('/repository',repositoryRouter.routes())
+      .use('/tag',tag.routes())
 }
 
 exports.start = function () {

app/namespace.js

@@ -4,17 +4,17 @@ const router = new Router();
 module.exports = router
 
 router.get('/', async ctx => {
-  let data = await ctx.client.namespace_get()
+  let data = await ctx.cluster.namespace_get()
   ctx.body = ctx.ok(data)
 })
 
 router.post('/create', async ctx => {
-  await ctx.client.namespace_create(ctx.request.body.name)
-  await ctx.client.ingress_create(ctx.request.body.name)
+  await ctx.cluster.namespace_create(ctx.request.body.name)
+  await ctx.cluster.ingress_create(ctx.request.body.name)
   ctx.body = ctx.ok()
 })
 
 router.post('/delete', async ctx => {
-  await ctx.client.namespace_delete(ctx.request.body.name)
+  await ctx.cluster.namespace_delete(ctx.request.body.name)
   ctx.body = ctx.ok()
 })

app/rabbitmq.js

-const Router = require('koa-router')
-const yaml = require('js-yaml')
-const templates = require('../serviceTemplate')
-
-const IMAGES = ['rabbitmq:3.6-management']
-
-const router = new Router()
-module.exports = router
-
-router.post('/create', async ctx => {
-  // let svc = await ctx.client.service_get('rabbitmq', ctx.request.body.namespace)
-  // if (svc) {
-  //   ctx.body = ctx.fail('服务已经存在')
-  //   return
-  // }
-
-  let data = {
-    namespace: ctx.request.body.namespace,
-    image: IMAGES[0]
-  }
-  let template = templates['rabbitmq'].replace(/{{([A-Za-z0-9_]+)}}/g, function () {
-    if (data[arguments[1]] === undefined) {
-      throw new Error('缺少模板所需变量')
-    }
-    return data[arguments[1]]
-  })
-  let params = yaml.load(template)
-  await ctx.client.service_create(params)
-  ctx.body = ctx.ok('创建成功')
-})
-
-router.post('/delete', async ctx => {
-  await ctx.client.service_delete('rabbitmq', ctx.request.body.namespace)
-  ctx.body = ctx.ok('删除成功')
-})

app/repository.js

+const Router = require('koa-router')
+
+const router = new Router()
+module.exports = router
+router.post('/', async ctx => {
+    let data = await ctx.container.repository_get(ctx.request.body.namespace)
+    ctx.body = ctx.ok(data)
+})

app/service.js

@@ -2,35 +2,27 @@ const Router = require('koa-router')
 const yaml = require('js-yaml')
 const templates = require('../serviceTemplate')
 
-const TYPES = ['ui', 'java', 'nodejs', 'python', 'go']
+const TYPES = ['ui', 'java', 'node', 'python', 'go']
 
 const router = new Router()
 module.exports = router
 
 router.get('/', async ctx => {
-  let data = await ctx.client.service_list(ctx.query.namespace)
+    let data = await ctx.cluster.service_list(ctx.query.namespace)
     ctx.body = ctx.ok(data)
 })
 
 router.post('/create', async ctx => {
-  let { type, serviceName, namespace, image, system_name } = ctx.request.body
+    let {type, serviceName, namespace, image, system_name, lable} = ctx.request.body
     if (!TYPES.includes(type)) {
         return ctx.body = ctx.fail('不支持的服务类型')
     }
-
-  // try {
-  //   let svc = await ctx.client.service_get(serviceName, namespace)
-  //   if (svc) {
-  //     return ctx.body = ctx.fail('服务已经存在')
-  //   }
-  // } catch (e) {
-  // }
-
     let data = {
         serviceName,
         namespace,
         image,
-    system_name
+        system_name,
+        lable
     }
     if (!system_name) {
         // ui abTest的时候不一样
@@ -43,16 +35,19 @@ router.post('/create', async ctx => {
         return data[arguments[1]]
     })
     let params = yaml.load(template)
-  await ctx.client.service_create(params)
+    await ctx.cluster.service_create(params, type)
     ctx.body = ctx.ok('创建成功')
 })
-
+router.post('/details', async ctx => {
+    let data = await ctx.cluster.service_get(ctx.request.body.serviceName, ctx.request.body.namespace)
+    ctx.body = ctx.ok(data)
+})
 router.post('/delete', async ctx => {
-  await ctx.client.service_delete(ctx.request.body.serviceName, ctx.request.body.namespace)
+    await ctx.cluster.service_delete(ctx.request.body.serviceName, ctx.request.body.namespace)
     ctx.body = ctx.ok('删除成功')
 })
 
 router.post('/modifyImage', async ctx => {
-  await ctx.client.service_modifyImage(ctx.request.body.serviceName, ctx.request.body.image, ctx.request.body.namespace)
+    await ctx.cluster.service_modifyImage(ctx.request.body.serviceName, ctx.request.body.image, ctx.request.body.namespace)
     ctx.body = ctx.ok('更新成功')
 })

app/tag.js

+const Router = require('koa-router')
+
+const router = new Router()
+module.exports = router
+router.post('/', async ctx => {
+    let data = await ctx.container.tag_get(ctx.request.body.reponame)
+    ctx.body = ctx.ok(data)
+})

app/zookeeper.js

-const Router = require('koa-router')
-const yaml = require('js-yaml')
-const templates = require('../serviceTemplate')
-
-const IMAGES = ['zookeeper:3.4.10']
-
-const router = new Router()
-module.exports = router
-
-router.post('/create', async ctx => {
-  let data = {
-    namespace: ctx.request.body.namespace,
-    image: IMAGES[0]
-  }
-  let template = templates['zookeeper'].replace(/{{([A-Za-z0-9_]+)}}/g, function () {
-    if (data[arguments[1]] === undefined) {
-      throw new Error('缺少模板所需变量')
-    }
-    return data[arguments[1]]
-  })
-  let params = yaml.load(template)
-  await ctx.client.service_create(params)
-  ctx.body = ctx.ok('创建成功')
-})
-
-router.post('/delete', async ctx => {
-  await ctx.client.service_delete('zookeeper', ctx.request.body.namespace)
-  ctx.body = ctx.ok('删除成功')
-})

config/index.js

+module.exports={
+    secretId: 'AKID4rY7wwNphsUcaFsy1pRtKhQvDj4CA3Ac',
+    secretKey: 'YBduRnjgVRGzmagZJbss3Vo58wWCyhgc',
+    clusterId: 'cls-acfx4pvj',
+    region: 'ap-beijing',
+    method :'POST',
+    protocal : 'https://',
+    clusterPoint : 'ccs.api.qcloud.com',  //访问集群以及服务的域名
+    containerPoint : 'ccr.api.qcloud.com',  //访问镜像仓库的域名
+    path : '/v2/index.php',
+    domain : ".lkbang.com",
+
+}

serviceTemplate/index.js

 const fs = require('fs')
 const ui = fs.readFileSync('serviceTemplate/ui.template.txt', 'utf8')
 const java = fs.readFileSync('serviceTemplate/java.template.txt', 'utf8')
-const nodejs = fs.readFileSync('serviceTemplate/nodejs.template.txt', 'utf8')
+const node = fs.readFileSync('serviceTemplate/node.template.txt', 'utf8')
 const rabbitmq = fs.readFileSync('serviceTemplate/rabbitmq.template.txt', 'utf8')
 const zookeeper = fs.readFileSync('serviceTemplate/zookeeper.template.txt', 'utf8')
 const mysql = fs.readFileSync('serviceTemplate/mysql.template.txt', 'utf8')
 
 module.exports = {
   ui,
-  nodejs,
+  node,
   java,
   rabbitmq,
   zookeeper,

services/tke.clusterService.js

+const Client = require('./tke.service')
+const domainConfig = require('../config')
+
+class Cluster extends Client {
+    constructor() {
+        super();
+        this.endpoint = domainConfig.clusterPoint
+    }
+
+    namespace_get() {
+        return this.post('DescribeClusterNameSpaces', {clusterId: this.clusterId})
+    }
+
+    namespace_create(name) {
+        return this.post('CreateClusterNamespace', {name, description: '', clusterId: this.clusterId})
+    }
+
+    namespace_delete(name) {
+        return this.post('DeleteClusterNamespace', {"names.0": name, clusterId: this.clusterId})
+    }
+
+    service_list(namespace) {
+        return this.post('DescribeClusterService', {namespace, clusterId: this.clusterId, allnamespace: 0})
+    }
+
+    service_get(serviceName, namespace) {
+        return this.post('DescribeClusterServiceInfo', {serviceName, namespace, clusterId: this.clusterId})
+    }
+
+    async service_create(params, type) {
+        params.clusterId = this.clusterId
+        let str = JSON.stringify(params)
+        await this.post('CreateClusterService', params)
+        let updateLabels = {
+            clusterId: params.clusterId,
+            serviceName: params.serviceName,
+            namespace: params.namespace,
+            "labels.type": type
+        }
+
+        return this.post('ModifyServiceLabels', updateLabels)
+    }
+
+    service_delete(serviceName, namespace) {
+        return this.post('DeleteClusterService', {serviceName, namespace, clusterId: this.clusterId})
+    }
+
+    service_modifyImage(serviceName, image, namespace) {
+        return this.post('ModifyClusterServiceImage', {serviceName, namespace, image, clusterId: this.clusterId})
+    }
+
+    ingress_get(namespace) {
+        return this.post('DescribeIngress', {namespace, clusterId: this.clusterId})
+    }
+
+    ingress_create(namespace) {
+        return this.post('CreateIngress', {
+            ingressName: `qa-${namespace}`,
+            ingressDesc: '',
+            namespace,
+            clusterId: this.clusterId
+        })
+    }
+
+    ingress_delete(ingressName, namespace) {
+        return this.post('DeleteIngress', {ingressName, namespace, clusterId: this.clusterId})
+    }
+
+    ingress_modify(ingressName, namespace, rules) {
+        return this.post('MosifyIngress', {ingressName, namespace, ...rules, clusterId: this.clusterId})
+    }
+
+}
+
+exports.create = function () {
+    return new Cluster()
+}

services/tke.containerService.js

+const Client = require('./tke.service')
+const domainConfig = require('../config')
+
+class Container extends Client {
+    constructor() {
+        super();
+        this.endpoint = domainConfig.containerPoint
+    }
+
+    repository_get( namespace) {
+        return this.post('SearchUserRepository', {namespace})
+    }
+    tag_get( reponame) {
+        return this.post('GetTagList', {reponame})
+    }
+}
+
+exports.create = function () {
+    return new Container()
+}

services/tke.service.js

 const request = require('request')
 const crypto = require('crypto')
+const domainConfig = require('../config')
 
 class Client {
-  constructor ({secretId, secretKey, region, clusterId}) {
-    this.secretId = secretId
-    this.secretKey = secretKey
-    this.region = region
-    this.clusterId = clusterId
-    this.method = 'POST'
-    this.protocal = 'https://'
-    this.endpoint = 'ccs.api.qcloud.com'
-    this.path = '/v2/index.php'
-    this.domain = ".lkbang.com"
+    constructor() {
+        this.secretId = domainConfig.secretId
+        this.secretKey = domainConfig.secretKey
+        this.region = domainConfig.region
+        this.clusterId = domainConfig.clusterId
+        this.method = domainConfig.method
+        this.protocal = domainConfig.protocal
+        this.endpoint = ''
+        this.path = domainConfig.path
+        this.domain = domainConfig.domain
 
         // 禁止操作以下命名空间
         this.defaultNamespaces = ['default', 'kube-system', 'kube-public']
     }
 
-  sign (params, signMethod) {
+    sign(params, signMethod) {
         let str = ''
         let keys = Object.keys(params)
         keys.sort()
@@ -42,7 +43,7 @@ class Client  {
     // Nonce: null,
     // SecretId: '',
     // Signature: ''
-  formatRequestData (action, params = {}) {
+    formatRequestData(action, params = {}) {
         params.Action = action
         params.Region = this.region
         params.Timestamp = Math.round(Date.now() / 1000)
@@ -52,7 +53,7 @@ class Client  {
         params.Signature = this.sign(params, params.SignatureMethod)
     }
 
-  post (action, params = {}) {
+    post(action, params = {}) {
         if (params.namespace && this.defaultNamespaces.includes(params.namespace)) {
             return Promise.reject(new Error('未授权的namespace'))
         }
@@ -80,75 +81,6 @@ class Client  {
             })
         })
     }
-
-  namespace_get () {
-    return this.post('DescribeClusterNameSpaces', {clusterId: this.clusterId})
-  }
-
-  namespace_create (name) {
-    return this.post('CreateClusterNamespace', {name, description: '', clusterId: this.clusterId})
-  }
-
-  namespace_delete (name) {
-    return this.post('DeleteClusterNamespace', {"names.0": name, clusterId: this.clusterId})
-  }
-
-  service_list (namespace) {
-    return this.post('DescribeClusterService', {namespace, clusterId: this.clusterId, allnamespace: 0})
-  }
-
-  service_get (serviceName, namespace) {
-    return this.post('DescribeClusterServiceInfo', {serviceName, namespace, clusterId: this.clusterId})
-  }
-
-  async service_create (params) {
-    params.clusterId = this.clusterId
-    let str = JSON.stringify(params)
-    await this.post('CreateClusterService', params)
-    // 腾讯云api暂只能通过修改服务来改成Recreate策略
-    let modifyParams = JSON.parse(str)
-    modifyParams.strategy = 'Recreate'
-    return this.post('ModifyClusterService', modifyParams)
-  }
-
-  service_delete (serviceName, namespace) {
-    return this.post('DeleteClusterService', {serviceName, namespace, clusterId: this.clusterId})
-  }
-
-  service_modifyImage (serviceName, image, namespace) {
-    // 修改示例的第一个容器
-    return this.post('ModifyClusterServiceImage', {serviceName, namespace, image, clusterId: this.clusterId})
-  }
-
-  ingress_get (namespace) {
-    return this.post('DescribeIngress', {namespace, clusterId: this.clusterId})
-  }
-
-  ingress_create (namespace) {
-    return this.post('CreateIngress', {ingressName: `qa-${namespace}`, ingressDesc: '', namespace, clusterId: this.clusterId})
-  }
-
-  ingress_delete (ingressName, namespace) {
-    return this.post('DeleteIngress', {ingressName, namespace, clusterId: this.clusterId})
-  }
-
-  ingress_modify (ingressName, namespace, rules) {
-    return this.post('MosifyIngress', {ingressName, namespace, ...rules, clusterId: this.clusterId})
-  }
-
 }
 
-exports.create = function (config) {
-  return new Client(config)
-}
-
-// let client = new Client({
-//   secretId: 'AKID4rY7wwNphsUcaFsy1pRtKhQvDj4CA3Ac',
-//   secretKey: 'YBduRnjgVRGzmagZJbss3Vo58wWCyhgc',
-//   clusterId: 'cls-acfx4pvj',
-//   region: 'ap-beijing'
-// })
-
-// client.post('DescribeClusterNameSpaces', {clusterId: 'cls-acfx4pvj'}).then(res => {
-//   console.log(5, res)
-// })
+module.exports = Client
\ No newline at end of file