Merge branch 'kewei.jia' into 'master'

Kewei.jia



See merge request !10

app/service.js

@@ -37,8 +37,8 @@ router.post('/create', async (ctx) => {
   })
   const params = yaml.load(template)
   await ctx.cluster.service_create(params, label)
-  if (domain) {
-    await ingressCreate({ namespace, serviceName, domain })
+  if (label !== 'base') {
+    await ingressCreate(namespace, serviceName, domain)
   }
   ctx.body = ctx.ok('创建成功')
 })

kubeService/ingress.js

@@ -2,17 +2,19 @@ const path = require('path')
 const Client = require('kubernetes-client').Client
 const config = require('kubernetes-client').config
 
+
+// const client = new Client({ config: config.fromKubeconfig(), version: '1.9' })
 const client = new Client({
   config: config.fromKubeconfig(
     path.resolve(__dirname, './kubeConfig.yaml'),
   ),
   version: '1.10',
 })
-const getManifest = ({ namespace, serviceName, domain }) => ({
+const getManifest = (namespace, servicename, doamin) => ({
   apiVersion: 'extensions/v1beta1',
   kind: 'Ingress',
   metadata: {
-    name: serviceName,
+    name: servicename,
     namespace,
     annotations: {
       'kubernetes.io/ingress.class': 'traefik',
@@ -21,13 +23,13 @@ const getManifest = ({ namespace, serviceName, domain }) => ({
   spec: {
     rules: [
       {
-        host: `${domain}-${namespace}.liangkebang.net`,
+        host: `${doamin}-${namespace}.liangkebang.net`,
         http: {
           paths: [
             {
               path: '/',
               backend: {
-                serviceName: `${serviceName}`,
+                serviceName: `${servicename}`,
                 servicePort: 80,
               },
             },
@@ -39,20 +41,17 @@ const getManifest = ({ namespace, serviceName, domain }) => ({
 })
 const ingressGet = async (namespace, servicename) => client.apis.extensions.v1beta1.namespaces(namespace)
   .ingresses(servicename).get()
-
-const ingressCreate = async (options) => {
-  const m = getManifest(options)
-  await client.apis.extensions.v1beta1.namespace(options.namespace).ingresses
-    .post({ body: m })
+const ingressCreate = async (namespace, servicename, doamin) => {
+  const Manifest = getManifest(namespace, servicename, doamin)
+  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
   await client.apis.extensions.v1beta1.namespace(namespace).ingresses(servicename)
     .patch({ body: Manifest })
 }
-
 const ingressDelete = async (namespace, servicename) => {
   await client.apis.extensions.v1beta1.namespaces(namespace).ingresses(servicename).delete()
 }

serviceTemplate/mysql.template.txt

 serviceName: mysql
 namespace:  {{namespace}}
 replicas: 1
-accessType: LoadBalancer
+accessType: NodePort
 
 portMappings.0.protocol: TCP
-portMappings.0.lbPort: 3306
 portMappings.0.containerPort: 3306
 
 containers.0.containerName: mysql

serviceTemplate/rabbitmq.template.txt

 serviceName: rabbitmq
 namespace:  {{namespace}}
 replicas: 1
-accessType: ClusterIP
+accessType: NodePort
 
 portMappings.0.protocol: TCP
-portMappings.0.lbPort: 5672
 portMappings.0.containerPort: 5672
 
 portMappings.1.protocol: TCP
-portMappings.1.lbPort: 15672
 portMappings.1.containerPort: 15672
 
 containers.0.containerName: rabbitmq

serviceTemplate/redis.template.txt

 serviceName: redis
 namespace:  {{namespace}}
 replicas: 1
-accessType: ClusterIP
+accessType: NodePort
 
 portMappings.0.protocol: TCP
-portMappings.0.lbPort: 6379
 portMappings.0.containerPort: 6379
 
 portMappings.1.protocol: TCP
-portMappings.1.lbPort: 6380
 portMappings.1.containerPort: 6380
 
 portMappings.2.protocol: TCP
-portMappings.2.lbPort: 6381
 portMappings.2.containerPort: 6381
 
 portMappings.3.protocol: TCP
-portMappings.3.lbPort: 6382
 portMappings.3.containerPort: 6382
 
 portMappings.4.protocol: TCP
-portMappings.4.lbPort: 6383
 portMappings.4.containerPort: 6383
 
 containers.0.containerName: redis

serviceTemplate/zookeeper.template.txt

 serviceName: zookeeper
 namespace:  {{namespace}}
 replicas: 1
-accessType: ClusterIP
+accessType: NodePort
 
 portMappings.0.protocol: TCP
-portMappings.0.lbPort: 2181
 portMappings.0.containerPort: 2181
 
 portMappings.1.protocol: TCP
-portMappings.1.lbPort: 9090
 portMappings.1.containerPort: 9090
 
 containers.0.containerName: zookeeper

services/tke.clusterService.js

@@ -29,8 +29,8 @@ class Cluster extends Client {
     return this.post('DescribeClusterServiceInfo', { serviceName, namespace, clusterId: this.clusterId })
   }
 
-  async service_create(params, type) {
-    logger.info('创建服务详细信息：', params, type)
+  async service_create(params, lable) {
+    logger.info('创建服务详细信息：', params, lable)
     params.clusterId = this.clusterId
     const str = JSON.stringify(params)
     await this.post('CreateClusterService', params)
@@ -42,9 +42,9 @@ class Cluster extends Client {
       clusterId: params.clusterId,
       serviceName: params.serviceName,
       namespace: params.namespace,
-      'labels.type': type,
+      'labels.type': lable,
     }
-
+    logger.info('修改服务标签信息：', updateLabels)
     return this.post('ModifyServiceLabels', updateLabels)
   }