Merge pull request #1595 from vincent99/master

Fleet bugs
rancher · Oct 2, 2020 · 691dcab · 691dcab
2 parents 4de777f + 94a09a9
commit 691dcab
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/components/nav/WorkspaceSwitcher.vue b/components/nav/WorkspaceSwitcher.vue
@@ -70,7 +70,14 @@ export default {
   .filter ::v-deep .v-select .vs__actions:after {
     fill: white !important;
     color: white !important;
-}
+  }
+
+  .filter ::v-deep .vs__search {
+    width: 0;
+    padding: 0;
+    margin: 0;
+    opacity: 0;
+  }
 </style>
 
 <template>
@@ -80,7 +87,6 @@ export default {
       v-model="value"
       label="label"
       :options="options"
-      :searchable="false"
       :clearable="false"
       :reduce="opt=>opt.value"
     />

diff --git a/config/labels-annotations.js b/config/labels-annotations.js
@@ -52,7 +52,7 @@ export const CATALOG = {
 
 const CATTLE_REGEX = /cattle\.io\//;
 
-export const FLEET = { CLUSTER_NAME: 'management.cattle.io/cluster-display-name' };
+export const FLEET = { CLUSTER_NAME: 'management.cattle.io/cluster-name' };
 
 export const RKE = { EXTERNAL_IP: 'rke.cattle.io/external-ip' };
 

diff --git a/edit/fleet.cattle.io.gitrepo.vue b/edit/fleet.cattle.io.gitrepo.vue
@@ -1,7 +1,7 @@
 <script>
 import { exceptionToErrorsArray } from '@/utils/error';
 import { mapGetters } from 'vuex';
-import { FLEET, MANAGEMENT, SECRET } from '@/config/types';
+import { FLEET, SECRET } from '@/config/types';
 import { FLEET as FLEET_LABELS } from '@/config/labels-annotations';
 import { set } from '@/utils/object';
 import ArrayList from '@/components/form/ArrayList';
@@ -283,11 +283,11 @@ export default {
       } else if ( kind === 'none' ) {
         spec.targets = [];
       } else if ( kind === 'cluster' ) {
-        const mgmt = this.$store.getters['management/byId'](MANAGEMENT.CLUSTER, value);
+        // const mgmt = this.$store.getters['management/byId'](MANAGEMENT.CLUSTER, value);
 
-        if ( mgmt ) {
-          mgmt.setClusterNameLabel(true);
-        }
+        // if ( mgmt ) {
+        //   mgmt.setClusterNameLabel(true);
+        // }
 
         spec.targets = [
           { clusterSelector: { matchLabels: { [FLEET_LABELS.CLUSTER_NAME]: value } } }

diff --git a/edit/service.vue b/edit/service.vue
@@ -179,7 +179,7 @@ export default {
 
     <div class="spacer"></div>
 
-    <Tabbed>
+    <Tabbed :side-tabs="true">
       <Tab
         v-if="checkTypeIs('ExternalName')"
         name="define-external-name"