fix(node): 禁用调度标签修改

1Panel-dev · Oct 29, 2021 · ff7b712 · ff7b712
1 parent 2e9551c
commit ff7b712
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/web/dashboard/src/business/app-layout/header-components/Help.vue b/web/dashboard/src/business/app-layout/header-components/Help.vue
@@ -15,7 +15,7 @@
         <img style="margin-left: 0;" :src="require('@/assets/KubePi-red.png')" class="sidebar-logo" alt="Sidebar Logo">
         <p>{{ $t("commons.personal.introduction") }}</p>
         <p>{{ $t("commons.personal.introduction2") }}</p>
-        <strong>{{ $t("commons.personal.version") }}: v1.1.1</strong>
+        <strong>{{ $t("commons.personal.version") }}: v1.1.2</strong>
       </div>
       <div style="padding:15px 20px;box-shadow:rgb(69 70 70) 0 -14px 24px -12px;">
         <el-row style="font-size: 6px;color: #ffffff;text-align: center">

diff --git a/web/dashboard/src/business/cluster/nodes/index.vue b/web/dashboard/src/business/cluster/nodes/index.vue
@@ -41,15 +41,15 @@
 <!--      </el-table-column>-->
       <el-table-column :label="$t('commons.table.status')">
         <template v-slot:default="{row}">
-          <el-button v-if="row.nodeStatus.indexOf('Cordoned') !== -1" type="warning" size="mini" plain round>
-            Cordoned
-          </el-button>
           <el-button v-if="row.nodeStatus.indexOf('NotReady') !== -1" type="warning" size="mini" plain round>
             NotReady
           </el-button>
           <el-button v-else type="success" size="mini" plain round>
             Ready
           </el-button>
+          <el-button v-if="row.nodeStatus.indexOf('SchedulingDisabled') !== -1" type="warning" size="mini" plain round>
+            SchedulingDisabled
+          </el-button>
         </template>
       </el-table-column>
       <el-table-column :label="$t('business.node.role')" prop="metadata.labels" min-width="180px" show-overflow-tooltip>
@@ -134,7 +134,7 @@ export default {
             }
           }
           if (node.spec.unschedulable) {
-            node.nodeStatus += ", Cordoned"
+            node.nodeStatus += ", SchedulingDisabled"
           }
         }
         this.paginationConfig.total = res.total

diff --git a/web/kubepi/src/business/app-layout/header-components/Help.vue b/web/kubepi/src/business/app-layout/header-components/Help.vue
@@ -15,7 +15,7 @@
         <img style="margin-left: 0;" :src="require('@/assets/KubePi-red.png')" class="sidebar-logo" alt="Sidebar Logo">
         <p>{{ $t("commons.personal.introduction") }}</p>
         <p>{{ $t("commons.personal.introduction2") }}</p>
-        <strong>{{ $t("commons.personal.version") }}: v1.1.1</strong>
+        <strong>{{ $t("commons.personal.version") }}: v1.1.2</strong>
       </div>
       <div style="padding:15px 20px;box-shadow:rgb(69 70 70) 0 -14px 24px -12px;">
         <el-row style="font-size: 6px;color: #ffffff;text-align: center">