Fix: k8s start/stop/sendcommand use podIp not podName

update changelist v3.0.5

Fix: k8s start/stop/sendcommand use podIp not podName
update changelist v3.0.5
41c0b4ed · ruanshudong · 8491e13b · 41c0b4ed · 41c0b4ed · 41c0b4ed
Commit 41c0b4ed authored 3 years ago by ruanshudong
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 39 additions and 21 deletions
+39 -21
--- a/ChangeList.md
+++ b/ChangeList.md
-## 20220713(3.0.4)
+
+## 20220713(3.0.5)
+
+
+### en
+
+- Fix: k8s delete server delete tendpoints
+- Fix: k8s start/stop/sendcommand use podIp not podName
+### cn
+
+- 修复: k8s删除服务时也同步删除tendpoints
+- 修复: k8s start/stop/sendcommand 使用podIp而不是podName
+
+## 20220712(3.0.4)


 ### en

--- a/client/dist/k8s.html
+++ b/client/dist/k8s.html
-<!DOCTYPE html><html lang=en><head id=head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><title>TarsK8s</title><link href=/static/css/chunk-common.b596fdc5.css rel=preload as=style><link href=/static/css/chunk-vendors.7e538d84.css rel=preload as=style><link href=/static/css/k8s.ac248a8b.css rel=preload as=style><link href=/static/js/chunk-common.0ef5daf2.js rel=preload as=script><link href=/static/js/chunk-vendors.e9a37c8e.js rel=preload as=script><link href=/static/js/k8s.50be8beb.js rel=preload as=script><link href=/static/css/chunk-vendors.7e538d84.css rel=stylesheet><link href=/static/css/chunk-common.b596fdc5.css rel=stylesheet><link href=/static/css/k8s.ac248a8b.css rel=stylesheet></head><body><noscript><strong>We're sorry but TarsK8s doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><div id=market></div><script src=/static/js/chunk-vendors.e9a37c8e.js></script><script src=/static/js/chunk-common.0ef5daf2.js></script><script src=/static/js/k8s.50be8beb.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang=en><head id=head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><title>TarsK8s</title><link href=/static/css/chunk-common.b596fdc5.css rel=preload as=style><link href=/static/css/chunk-vendors.7e538d84.css rel=preload as=style><link href=/static/css/k8s.ac248a8b.css rel=preload as=style><link href=/static/js/chunk-common.0ef5daf2.js rel=preload as=script><link href=/static/js/chunk-vendors.e9a37c8e.js rel=preload as=script><link href=/static/js/k8s.8040a97d.js rel=preload as=script><link href=/static/css/chunk-vendors.7e538d84.css rel=stylesheet><link href=/static/css/chunk-common.b596fdc5.css rel=stylesheet><link href=/static/css/k8s.ac248a8b.css rel=stylesheet></head><body><noscript><strong>We're sorry but TarsK8s doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><div id=market></div><script src=/static/js/chunk-vendors.e9a37c8e.js></script><script src=/static/js/chunk-common.0ef5daf2.js></script><script src=/static/js/k8s.8040a97d.js></script></body></html>
\ No newline at end of file
--- a/client/dist/static/js/k8s.50be8beb.js
+++ b/client/dist/static/js/k8s.50be8beb.js
--- a/client/src/k8s/server/manage.vue
+++ b/client/src/k8s/server/manage.vue
@@ -133,16 +133,16 @@
                v-if="scope.row.Source['tars.io/CloudInstall']"
                :content="
                  scope.row.Source['tars.io/CloudInstall'].group +
-                    '/' +
-                    scope.row.Source['tars.io/CloudInstall'].name +
-                    ':' +
-                    scope.row.Source['tars.io/CloudInstall'].version
+                  '/' +
+                  scope.row.Source['tars.io/CloudInstall'].name +
+                  ':' +
+                  scope.row.Source['tars.io/CloudInstall'].version
                "
                placement="top-start"
              >
                <i
                  class="el-icon-cloudy"
-                  style="cursor:pointer"
+                  style="cursor: pointer"
                  @click="goMarket(scope.row)"
                ></i>
              </el-tooltip>
@@ -619,7 +619,7 @@
                @click="addAdapter(props.row)"
                v-if="
                  props.$index ===
-                    servantAddModal.model.ServerServant.length - 1
+                  servantAddModal.model.ServerServant.length - 1
                "
              >
                {{ $t("operate.add") }}
@@ -655,7 +655,7 @@
      <let-form
        v-if="
          servantDetailModal.model &&
-            servantDetailModal.model.ServerServant.length === 1
+          servantDetailModal.model.ServerServant.length === 1
        "
        ref="servantDetailForm"
        itemWidth="360px"
@@ -1166,8 +1166,9 @@ export default {
          this.closeConfigModal();
          this.startServerList();
          this.$tip.error(
-            `${this.$t("serverList.restart.failed")}: ${err.err_msg ||
-              err.message}`
+            `${this.$t("serverList.restart.failed")}: ${
+              err.err_msg || err.message
+            }`
          );
        });
    },
@@ -1191,8 +1192,9 @@ export default {
        .catch((err) => {
          this.startServerList();
          this.$tip.error(
-            `${this.$t("serverList.restart.failed")}: ${err.err_msg ||
-              err.message}`
+            `${this.$t("serverList.restart.failed")}: ${
+              err.err_msg || err.message
+            }`
          );
        });
    },
@@ -1235,7 +1237,7 @@ export default {
        return;
      }

-      let podIp = checkedServerList.map((item) => item.PodName);
+      let podIp = checkedServerList.map((item) => item.PodIp);
      let serverApp = checkedServerList[0].ServerApp;
      let serverName = checkedServerList[0].ServerName;
      this.$confirm(
@@ -1289,7 +1291,7 @@ export default {
        return;
      }

-      let podIp = checkedServerList.map((item) => item.PodName);
+      let podIp = checkedServerList.map((item) => item.PodIp);
      let serverApp = checkedServerList[0].ServerApp;
      let serverName = checkedServerList[0].ServerName;
      this.$confirm(
@@ -1343,7 +1345,7 @@ export default {
        return;
      }

-      let podIp = checkedServerList.map((item) => item.PodName);
+      let podIp = checkedServerList.map((item) => item.PodIp);
      let serverApp = checkedServerList[0].ServerApp;
      let serverName = checkedServerList[0].ServerName;
      this.$confirm(
@@ -1473,8 +1475,9 @@ export default {
        })
        .catch((err) => {
          this.$tip.error(
-            `${this.$t("serverList.restart.failed")}: ${err.err_msg ||
-              err.message}`
+            `${this.$t("serverList.restart.failed")}: ${
+              err.err_msg || err.message
+            }`
          );
        });
    },
@@ -1572,7 +1575,8 @@ export default {
    checkServantEndpoint(endpoint) {
      const tmp = endpoint.split(/\s-/);
      const regProtocol = /^tcp|udp$/i;
-      let regHost = /^h\s(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/i;
+      let regHost =
+        /^h\s(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/i;
      let regT = /^t\s([1-9]|[1-9]\d+)$/i;
      let regPort = /^p\s\d{4,5}$/i;

@@ -1737,7 +1741,7 @@ export default {
        return;
      }

-      let podIp = checkedServerList.map((item) => item.PodName);
+      let podIp = checkedServerList.map((item) => item.PodIp);
      let serverApp = checkedServerList[0].ServerApp;
      let serverName = checkedServerList[0].ServerName;


--- a/package.json
+++ b/package.json
 {
    "name": "tars-web",
-    "version": "3.0.4",
+    "version": "3.0.5",
    "private": true,
    "scripts": {
        "start": "node bin/www",