listEnvVars 修改

app/service.js

@@ -24,7 +24,7 @@ const getClient = require('./../resource/getClient')
 
 const router = new Router()
 module.exports = router
-
+const clientNew = {}
 router.get('/', async (ctx) => {
   const data = await getServicesFormat(ctx.client, ctx.query.namespace)
   ctx.body = ctx.ok({
@@ -142,9 +142,22 @@ router.post('/redeploy', async (ctx) => {
 // for dev
 router.get('/listEnvVars', async (ctx) => {
   const envVars = {}
+  let cluster;
+  let namespace;
+  const parmars = ctx.request.query.namespace || ''
+  if (parmars.search('@') === -1) {
+    cluster = 'qa'
+    namespace = ctx.request.query.namespace
+  } else {
+    namespace = parmars.split('@')[0];
+    cluster = parmars.split('@')[1]
+  }
+  if (!clientNew[cluster]) {
+    clientNew[cluster] = getClient(cluster)
+  }
   const res = await Promise.all([
-    getPods(ctx.client, ctx.request.query.namespace),
-    getServices(ctx.client, ctx.request.query.namespace),
+    getPods(clientNew[cluster], namespace),
+    getServices(clientNew[cluster], namespace),
   ])
 
   res[0].body.items.forEach(async (item) => {
@@ -174,7 +187,7 @@ router.get('/listEnvVars', async (ctx) => {
 })
 
 // for container
-const clientNew = {}
+
 router.get('/listEnvVarsNew', async (ctx) => {
   const envVars = {}
   let cluster;
@@ -188,7 +201,6 @@ router.get('/listEnvVarsNew', async (ctx) => {
     cluster = parmars.split('@')[1]
   }
   if (!clientNew[cluster]) {
-    console.log('为空')
     clientNew[cluster] = getClient(cluster)
   }
   const res = await Promise.all([

middleware/client/index.js

@@ -5,7 +5,7 @@ const config = require('kubernetes-client').config
 module.exports = function client() {
   const client = {}
   return async function (ctx, next) {
-    const exclude = ['/service/listEnvVarsNew']
+    const exclude = ['/service/listEnvVarsNew', 'listEnvVars']
     if (exclude.includes(ctx.path)) {
       await next()
     } else {