From 4cf7c06f079656789290c92f53936b6bd54062ba Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 30 Dec 2020 10:34:17 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20k8s=20=E7=8E=AF=E5=A2=83=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9Anamespace?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 .../settings/system/TestResourcePool.vue      | 25 ++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index f27d1609d7..6f082f93de 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit f27d1609d77f7d6c988d37d709466e844d350e17
+Subproject commit 6f082f93de680139816f95349fc95cf538784c20
diff --git a/frontend/src/business/components/settings/system/TestResourcePool.vue b/frontend/src/business/components/settings/system/TestResourcePool.vue
index 645396711c..e9412c8547 100644
--- a/frontend/src/business/components/settings/system/TestResourcePool.vue
+++ b/frontend/src/business/components/settings/system/TestResourcePool.vue
@@ -66,7 +66,7 @@
         </el-form-item>
         <el-form-item :label="$t('test_resource_pool.type')" prop="type">
           <el-select v-model="form.type" :placeholder="$t('test_resource_pool.select_pool_type')"
-                     @change="changeResourceType()">
+                     @change="changeResourceType(form.type)">
             <el-option key="NODE" value="NODE" label="Node">Node</el-option>
             <el-option key="K8S" value="K8S" label="Kubernetes" v-xpack>Kubernetes</el-option>
           </el-select>
@@ -89,6 +89,14 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row>
+              <el-col>
+                <el-form-item label="Namespace"
+                              :rules="requiredRules">
+                  <el-input v-model="item.namespace" type="text"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row>
               <el-col>
                 <el-form-item :label="$t('test_resource_pool.max_threads')"
@@ -205,9 +213,20 @@ export default {
         this.total = data.itemCount;
       })
     },
-    changeResourceType() {
+    changeResourceType(type) {
       this.infoList = [];
-      this.infoList.push({})
+      let info = {};
+      if (type === 'NODE') {
+        info.ip = '';
+        info.port = '8082';
+      }
+      if (type === 'K8S') {
+        info.masterUrl = '';
+        info.token = '';
+        info.namespace = '';
+      }
+      info.maxConcurrency = 100;
+      this.infoList.push(info);
     },
 
     addResourceInfo() {