Merge branch 'svc' into 'master'

修复更新、删除服务失败问题



See merge request !13

config/index.js

@@ -7,6 +7,7 @@ module.exports = {
   protocal: 'https://',
   clusterPoint: 'ccs.api.qcloud.com', // 访问集群以及服务的域名
   containerPoint: 'ccr.api.qcloud.com', // 访问镜像仓库的域名
+  imageDomain: 'ccr.ccs.tencentyun.com',
   path: '/v2/index.php',
   domain: '.lkbang.com',
 

kubeService/ingress.js

 const path = require('path')
 const Client = require('kubernetes-client').Client
 const config = require('kubernetes-client').config
+const logger = require('koa-log4').getLogger()
 
 
 // const client = new Client({ config: config.fromKubeconfig(), version: '1.9' })
@@ -41,18 +42,22 @@ const getManifest = (namespace, servicename, doamin) => ({
 })
 const ingressGet = async (namespace, servicename) => client.apis.extensions.v1beta1.namespaces(namespace)
   .ingresses(servicename).get()
+  
 const ingressCreate = async (namespace, servicename, doamin) => {
   const Manifest = getManifest(namespace, servicename, doamin)
+  logger.info('创建ingress', Manifest)
   await client.apis.extensions.v1beta1.namespace(namespace).ingresses
     .post({ body: Manifest })
 }
 const ingressUpdate = async (namespace, servicename, host) => {
   const Manifest = getManifest(namespace, servicename)
   Manifest.spec.rules[0].host = host
+  logger.info('更新ingress', Manifest)
   await client.apis.extensions.v1beta1.namespace(namespace).ingresses(servicename)
     .patch({ body: Manifest })
 }
 const ingressDelete = async (namespace, servicename) => {
+  logger.info('删除ingress', namespace, servicename)
   await client.apis.extensions.v1beta1.namespaces(namespace).ingresses(servicename).delete()
 }
 module.exports = {

services/tke.clusterService.js

@@ -7,6 +7,7 @@ class Cluster extends Client {
   constructor() {
     super();
     this.endpoint = domainConfig.clusterPoint
+    this.imageDomain = domainConfig.imageDomain
   }
 
   namespace_get() {
@@ -54,7 +55,9 @@ class Cluster extends Client {
 
   service_modifyImage(serviceName, image, namespace) {
     return this.post('ModifyClusterServiceImage', {
-      serviceName, namespace, image, clusterId: this.clusterId,
+      serviceName, namespace,
+      image: this.imageDomain + '/' + image,
+      clusterId: this.clusterId,
     })
   }