From 9758db11f2ffdcd34e1e801acb8020a14e78f2c0 Mon Sep 17 00:00:00 2001
From: wujun <897415845@qq.com>
Date: Wed, 13 Jul 2022 15:26:39 +0800
Subject: [PATCH 1/8] HARVESTER: add upgrade note link

---
 shell/assets/translations/en-us.yaml          |  5 +++
 .../VirtualMachineVolume/type/vmImage.vue     |  1 +
 .../HarvesterUpgrade.vue                      | 15 +++----
 .../harvesterhci.io.dashboard/UpgradeInfo.vue | 40 +++++++++++++++++++
 .../harvester/airgapupgrade/index.vue         |  7 +++-
 5 files changed, 59 insertions(+), 9 deletions(-)
 create mode 100644 shell/list/harvesterhci.io.dashboard/UpgradeInfo.vue

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 8fe640c822..7a1f458f18 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -5992,6 +5992,11 @@ harvester:
       fail:  Fail
       ongoing: on-going
     dismissMessage: Dismiss it
+    upgradeInfo:
+      warning: WARNING
+      doc: Before you upgrade to the newer Harvester version, you must perform the required <a href="https://docs.harvesterhci.io/v1.0/upgrade/automatic/" target="_blank"> pre-upgrade checks </a>for your cluster. Complete only those tasks that apply to your environment.
+      tip: Failure to perform these checks may result in a failed upgrade or hitting known issues that require a manual workaround fix.
+      moreNotes: For more details about the release notes, please visit - 
 
   backup:
     label: Backups
diff --git a/shell/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/vmImage.vue b/shell/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/vmImage.vue
index 7e87c72edb..2ffd42f9b0 100644
--- a/shell/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/vmImage.vue
+++ b/shell/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/vmImage.vue
@@ -229,6 +229,7 @@ export default {
             :label="t('harvester.fields.image')"
             :options="imagesOption"
             :mode="mode"
+            :searchable="true"
             :required="validateRequired"
             @input="onImageChange"
           />
diff --git a/shell/list/harvesterhci.io.dashboard/HarvesterUpgrade.vue b/shell/list/harvesterhci.io.dashboard/HarvesterUpgrade.vue
index 1ea73e64fd..ae3d1aa76e 100644
--- a/shell/list/harvesterhci.io.dashboard/HarvesterUpgrade.vue
+++ b/shell/list/harvesterhci.io.dashboard/HarvesterUpgrade.vue
@@ -5,12 +5,13 @@ import { allHash } from '@shell/utils/promise';
 import ModalWithCard from '@shell/components/ModalWithCard';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { Banner } from '@components/Banner';
+import UpgradeInfo from './UpgradeInfo';
 
 export default {
   name: 'HarvesterUpgrade',
 
   components: {
-    ModalWithCard, LabeledSelect, Banner
+    ModalWithCard, LabeledSelect, Banner, UpgradeInfo
   },
 
   async fetch() {
@@ -121,19 +122,19 @@ export default {
       </button>
     </header>
 
-    <ModalWithCard ref="deleteTip" name="deleteTip" :width="500">
+    <ModalWithCard ref="deleteTip" name="deleteTip" :width="850">
       <template #title>
         <t k="harvester.upgradePage.upgradeApp" />
       </template>
 
       <template #content>
-        <div class="currentVersion">
+        <UpgradeInfo :version="version" />
+
+        <div class="currentVersion mb-15">
           <span> <t k="harvester.upgradePage.currentVersion" /> </span>
           <span class="version">{{ currentVersion }}</span>
         </div>
 
-        <p class="bordered-section"></p>
-
         <div v-if="selectMode">
           <LabeledSelect
             v-model="version"
@@ -151,10 +152,10 @@ export default {
 
       <template #footer>
         <div class="footer">
-          <button class="btn role-secondary btn-sm mr-20" @click.prevent="cancel">
+          <button class="btn role-secondary mr-20" @click.prevent="cancel">
             <t k="generic.close" />
           </button>
-          <button class="btn role-tertiary bg-primary btn-sm mr-20" @click.prevent="handleUpgrade">
+          <button class="btn role-tertiary bg-primary" @click.prevent="handleUpgrade">
             <t k="harvester.upgradePage.upgrade" />
           </button>
         </div>
diff --git a/shell/list/harvesterhci.io.dashboard/UpgradeInfo.vue b/shell/list/harvesterhci.io.dashboard/UpgradeInfo.vue
new file mode 100644
index 0000000000..befe02d70f
--- /dev/null
+++ b/shell/list/harvesterhci.io.dashboard/UpgradeInfo.vue
@@ -0,0 +1,40 @@
+<script>
+import { Banner } from '@components/Banner';
+
+export default {
+  name: 'HarvesterUpgradeInfo',
+
+  components: { Banner },
+
+  props: {
+    version: {
+      type:    String,
+      default: ''
+    }
+  },
+
+  computed: {
+    releaseVersion() {
+      return !!this.version ? `https://github.com/harvester/harvester/releases/tag/${ this.version }` : `https://github.com/harvester/harvester/releases`;
+    }
+  },
+};
+</script>
+
+<template>
+  <div>
+    <Banner color="warning">
+      <strong>{{ t('harvester.upgradePage.upgradeInfo.warning') }}:</strong>
+      <p class="mb-5" v-html="t('harvester.upgradePage.upgradeInfo.doc', {}, true)">
+      </p>
+
+      <p class="mb-5">
+        {{ t('harvester.upgradePage.upgradeInfo.tip') }}
+      </p>
+
+      <p class="mb-5">
+        {{ t('harvester.upgradePage.upgradeInfo.moreNotes') }} <a :href="releaseVersion" target="_blank">{{ t('generic.moreInfo') }} </a>
+      </p>
+    </Banner>
+  </div>
+</template>
diff --git a/shell/pages/c/_cluster/harvester/airgapupgrade/index.vue b/shell/pages/c/_cluster/harvester/airgapupgrade/index.vue
index 6436c7fcdd..12321857f5 100644
--- a/shell/pages/c/_cluster/harvester/airgapupgrade/index.vue
+++ b/shell/pages/c/_cluster/harvester/airgapupgrade/index.vue
@@ -3,6 +3,7 @@ import CruResource from '@shell/components/CruResource';
 import { RadioGroup } from '@components/Form/Radio';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
+import UpgradeInfo from '@shell/list/harvesterhci.io.dashboard/UpgradeInfo';
 
 import { HCI } from '@shell/config/types';
 import { exceptionToErrorsArray } from '@shell/utils/error';
@@ -19,7 +20,7 @@ const UPLOAD = 'upload';
 export default {
   name:       'HarvesterAirgapUpgrade',
   components: {
-    CruResource, LabeledSelect, LabeledInput, RadioGroup
+    CruResource, LabeledSelect, LabeledInput, RadioGroup, UpgradeInfo
   },
 
   async fetch() {
@@ -216,7 +217,7 @@ export default {
     >
       <RadioGroup
         v-model="imageSource"
-        class="mb-20 image-group"
+        class="image-group"
         name="image"
         :options="[
           IMAGE_METHOD.NEW,
@@ -228,6 +229,8 @@ export default {
         ]"
       />
 
+      <UpgradeInfo />
+
       <div v-if="uploadImage">
         <LabeledInput v-model.trim="imageValue.spec.displayName" class="mb-20" label-key="harvester.fields.name" required />
 

From 5d3d78140677ff5921bf67b0acb990a4025b7989 Mon Sep 17 00:00:00 2001
From: n313893254 <n313893254@126.com>
Date: Tue, 12 Jul 2022 17:57:07 +0800
Subject: [PATCH 2/8] HARVESTER: Cluster member and cluster owner see
 inconsistent statistics

(cherry picked from commit f6e2b8f6a8db0a458e64a6d5ed97a8542fe11997)
---
 shell/config/labels-annotations.js            |  3 +-
 .../HarvesterHostBasic.vue                    | 27 ++++++++--
 .../list/harvesterhci.io.dashboard/index.vue  | 52 ++++++-------------
 shell/list/harvesterhci.io.host/index.vue     | 33 +++++++-----
 shell/models/harvester/node.js                | 40 ++++----------
 5 files changed, 72 insertions(+), 83 deletions(-)

diff --git a/shell/config/labels-annotations.js b/shell/config/labels-annotations.js
index d9f44759c2..40d34bb9aa 100644
--- a/shell/config/labels-annotations.js
+++ b/shell/config/labels-annotations.js
@@ -166,7 +166,8 @@ export const HCI = {
   DYNAMIC_SSHKEYS_USERS:        'harvesterhci.io/dynamic-ssh-key-users',
   VM_VOLUME_STATUS:             'harvesterhci.io/volume-status',
   IMAGE_SUFFIX:                 'harvesterhci.io/image-type',
-  OS_TYPE:                      'harvesterhci.io/os-type'
+  OS_TYPE:                      'harvesterhci.io/os-type',
+  HOST_REQUEST:                 'management.cattle.io/pod-requests',
 };
 
 // Annotations that can be on management.cattle.io.cluster to configure a custom badge
diff --git a/shell/detail/harvesterhci.io.host/HarvesterHostBasic.vue b/shell/detail/harvesterhci.io.host/HarvesterHostBasic.vue
index 2770fecad9..78ec3127d8 100644
--- a/shell/detail/harvesterhci.io.host/HarvesterHostBasic.vue
+++ b/shell/detail/harvesterhci.io.host/HarvesterHostBasic.vue
@@ -208,6 +208,12 @@ export default {
 
       return !!this.$store.getters[`${ inStore }/schemaFor`](HCI.NODE_NETWORK);
     },
+
+    hasLonghornSchema() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+
+      return !!this.$store.getters[`${ inStore }/schemaFor`](LONGHORN.NODES);
+    },
   },
 
   methods: {
@@ -294,21 +300,36 @@ export default {
       <hr class="divider" />
       <h3>{{ t('harvester.host.tabs.monitor') }}</h3>
       <div class="row mb-20">
-        <div class="col span-4">
+        <div
+          class="col"
+          :class="{
+            'span-4': hasLonghornSchema,
+            'span-6': !hasLonghornSchema,
+          }"
+        >
           <HarvesterCPUUsed
             :row="value"
             :resource-name="t('node.detail.glance.consumptionGauge.cpu')"
             :show-used="true"
           />
         </div>
-        <div class="col span-4">
+        <div
+          class="col"
+          :class="{
+            'span-4': hasLonghornSchema,
+            'span-6': !hasLonghornSchema,
+          }"
+        >
           <HarvesterMemoryUsed
             :row="value"
             :resource-name="t('node.detail.glance.consumptionGauge.memory')"
             :show-used="true"
           />
         </div>
-        <div class="col span-4">
+        <div
+          v-if="hasLonghornSchema"
+          class="col span-4"
+        >
           <HarvesterStorageUsed
             :row="value"
             :resource-name="t('harvester.host.detail.storage')"
diff --git a/shell/list/harvesterhci.io.dashboard/index.vue b/shell/list/harvesterhci.io.dashboard/index.vue
index 5ebf02e492..80ba2f6ba4 100644
--- a/shell/list/harvesterhci.io.dashboard/index.vue
+++ b/shell/list/harvesterhci.io.dashboard/index.vue
@@ -172,7 +172,7 @@ export default {
   },
 
   computed: {
-    ...mapGetters(['currentCluster']),
+    ...mapGetters(['currentCluster', 'isVirtualCluster']),
 
     accessibleResources() {
       const inStore = this.$store.getters['currentProduct'].inStore;
@@ -375,50 +375,22 @@ export default {
     },
 
     cpuReserved() {
-      const useful = this.pods.filter((pod) => {
-        const nodeName = pod?.spec?.nodeName;
-
-        return this.availableNodes.includes(nodeName);
-      }).reduce((sum, pod) => {
-        const containers = pod?.spec?.containers || [];
-
-        const containerCpuReserved = containers.reduce((sum, c) => {
-          sum += parseSi(c?.resources?.requests?.cpu || '0m');
-
-          return sum;
-        }, 0);
-
-        sum += containerCpuReserved;
-
-        return sum;
+      const useful = this.nodes.reduce((total, node) => {
+        return total + node.cpuReserved;
       }, 0);
 
       return {
-        total:  this.cpusTotal,
-        useful: Number(formatSi(useful)),
+        total: this.cpusTotal,
+        useful,
       };
     },
 
     ramReserved() {
-      const useful = this.pods.filter((pod) => {
-        const nodeName = pod?.spec?.nodeName;
-
-        return this.availableNodes.includes(nodeName);
-      }).reduce((sum, pod) => {
-        const containers = pod?.spec?.containers || [];
-
-        const containerMemoryReserved = containers.reduce((sum, c) => {
-          sum += parseSi(c?.resources?.requests?.memory || '0m', { increment: 1024 });
-
-          return sum;
-        }, 0);
-
-        sum += containerMemoryReserved;
-
-        return sum;
+      const useful = this.nodes.reduce((total, node) => {
+        return total + node.memoryReserved;
       }, 0);
 
-      return this.createMemoryValues(this.memoryTotal, useful);
+      return createMemoryValues(this.memoryTotal, useful);
     },
 
     availableNodes() {
@@ -583,7 +555,12 @@ export default {
       <h3 class="mt-40">
         {{ t('clusterIndexPage.sections.capacity.label') }}
       </h3>
-      <div class="hardware-resource-gauges">
+      <div
+        class="hardware-resource-gauges"
+        :class="{
+          live: !storageTotal,
+        }"
+      >
         <HardwareResourceGauge
           :name="t('harvester.dashboard.hardwareResourceGauge.cpu')"
           :reserved="cpuReserved"
@@ -595,6 +572,7 @@ export default {
           :used="ramUsed"
         />
         <HardwareResourceGauge
+          v-if="storageTotal"
           :name="t('harvester.dashboard.hardwareResourceGauge.storage')"
           :used="storageUsed"
           :reserved="storageReserved"
diff --git a/shell/list/harvesterhci.io.host/index.vue b/shell/list/harvesterhci.io.host/index.vue
index 6461bcce4c..869f167fb3 100644
--- a/shell/list/harvesterhci.io.host/index.vue
+++ b/shell/list/harvesterhci.io.host/index.vue
@@ -44,6 +44,8 @@ export default {
 
     if (this.$store.getters['harvester/schemaFor'](LONGHORN.NODES)) {
       _hash.longhornNodes = this.$store.dispatch('harvester/findAll', { type: LONGHORN.NODES });
+    } else {
+      this.hasLonghornSchema = false;
     }
 
     if (this.$store.getters['harvester/schemaFor'](HCI.BLOCK_DEVICE)) {
@@ -57,8 +59,9 @@ export default {
 
   data() {
     return {
-      rows:            [],
-      hasMetricSchema: true
+      rows:              [],
+      hasMetricSchema:   true,
+      hasLonghornSchema: true,
     };
   },
 
@@ -86,12 +89,13 @@ export default {
       ];
 
       if (this.hasMetricSchema) {
+        const width = this.hasLonghornSchema ? '230' : '345';
         const metricCol = [
           {
             name:          'cpu',
             labelKey:      'node.detail.glance.consumptionGauge.cpu',
             value:         'id',
-            width:         '230',
+            width,
             formatter:     'HarvesterCPUUsed',
             formatterOpts: { showUsed: true },
           },
@@ -99,23 +103,28 @@ export default {
             name:          'memory',
             labelKey:      'node.detail.glance.consumptionGauge.memory',
             value:         'id',
-            width:         '230',
+            width,
             formatter:     'HarvesterMemoryUsed',
             formatterOpts: { showUsed: true },
           },
-          {
-            name:          'storage',
-            labelKey:      'tableHeaders.storage',
-            value:         'id',
-            width:         '230',
-            formatter:     'HarvesterStorageUsed',
-            formatterOpts: { showReserved: true },
-          }
         ];
 
         out.splice(-1, 0, ...metricCol);
       }
 
+      if (this.hasLonghornSchema) {
+        const storageHeader = {
+          name:          'storage',
+          labelKey:      'tableHeaders.storage',
+          value:         'id',
+          width:         '230',
+          formatter:     'HarvesterStorageUsed',
+          formatterOpts: { showReserved: true },
+        };
+
+        out.splice(-1, 0, storageHeader);
+      }
+
       out.push(AGE);
 
       return out;
diff --git a/shell/models/harvester/node.js b/shell/models/harvester/node.js
index 2ab2a1e1e6..a750373204 100644
--- a/shell/models/harvester/node.js
+++ b/shell/models/harvester/node.js
@@ -231,40 +231,20 @@ export default class HciNode extends SteveModel {
     return pods.filter(p => p?.spec?.nodeName === this.id && p?.metadata?.name !== 'removing');
   }
 
+  get reserved() {
+    try {
+      return JSON.parse(this.metadata.annotations[HCI_ANNOTATIONS.HOST_REQUEST] || '{}');
+    } catch {
+      return {};
+    }
+  }
+
   get cpuReserved() {
-    const out = this.pods.reduce((sum, pod) => {
-      const containers = pod?.spec?.containers || [];
-
-      const containerCpuReserved = containers.reduce((sum, c) => {
-        sum += parseSi(c?.resources?.requests?.cpu || '0m');
-
-        return sum;
-      }, 0);
-
-      sum += containerCpuReserved;
-
-      return sum;
-    }, 0);
-
-    return out;
+    return parseSi(this.reserved.cpu || '0');
   }
 
   get memoryReserved() {
-    const out = this.pods.reduce((sum, pod) => {
-      const containers = pod?.spec?.containers || [];
-
-      const containerMemoryReserved = containers.reduce((sum, c) => {
-        sum += parseSi(c?.resources?.requests?.memory || '0m', { increment: 1024 });
-
-        return sum;
-      }, 0);
-
-      sum += containerMemoryReserved;
-
-      return sum;
-    }, 0);
-
-    return out;
+    return parseSi(this.reserved.memory || '0');
   }
 
   get canDelete() {

From 20ff3550c9fc630429befcb014eb4b6f0b8e6e1a Mon Sep 17 00:00:00 2001
From: yuzeng <cridequeger@yahoo.com>
Date: Thu, 14 Jul 2022 19:15:02 +0800
Subject: [PATCH 3/8] Remove pod/node scheduling correctly

---
 shell/components/form/NodeAffinity.vue | 63 ++++++++++++++++----------
 shell/components/form/PodAffinity.vue  | 13 +++++-
 2 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/shell/components/form/NodeAffinity.vue b/shell/components/form/NodeAffinity.vue
index 51653d9836..6f68fd4ea3 100644
--- a/shell/components/form/NodeAffinity.vue
+++ b/shell/components/form/NodeAffinity.vue
@@ -1,4 +1,5 @@
 <script>
+import debounce from 'lodash/debounce';
 import { _VIEW } from '@shell/config/query-params';
 import { mapGetters } from 'vuex';
 import { get, isEmpty, clone } from '@shell/utils/object';
@@ -50,7 +51,10 @@ export default {
       return {
         allSelectorTerms,
         weightedNodeSelectorTerms: preferredDuringSchedulingIgnoredDuringExecution,
-        defaultWeight:             1
+        defaultWeight:             1,
+        // rules in MatchExpressions.vue can not catch changes what happens on parent component
+        // we need re-render it via key changing
+        rerenderNums:              0
       };
     }
   },
@@ -73,35 +77,38 @@ export default {
     }
   },
 
-  mounted() {
-    this.update();
+  created() {
+    this.queueUpdate = debounce(this.update, 500);
   },
 
   methods: {
     update() {
-      this.$nextTick(() => {
-        const out = {};
-        const requiredDuringSchedulingIgnoredDuringExecution = { nodeSelectorTerms: [] };
-        const preferredDuringSchedulingIgnoredDuringExecution = [] ;
+      const out = {};
+      const requiredDuringSchedulingIgnoredDuringExecution = { nodeSelectorTerms: [] };
+      const preferredDuringSchedulingIgnoredDuringExecution = [] ;
 
-        this.allSelectorTerms.forEach((term) => {
-          if (term.weight) {
-            const neu = { weight: 1, preference: term };
+      this.allSelectorTerms.forEach((term) => {
+        if (term.weight) {
+          const neu = { weight: 1, preference: term };
 
-            preferredDuringSchedulingIgnoredDuringExecution.push(neu);
-          } else {
-            requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms.push(term);
-          }
-        });
-
-        if (preferredDuringSchedulingIgnoredDuringExecution.length) {
-          out.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution;
+          preferredDuringSchedulingIgnoredDuringExecution.push(neu);
+        } else {
+          requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms.push(term);
         }
-        if (requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms.length) {
-          out.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution;
-        }
-        this.$emit('input', out);
       });
+
+      if (preferredDuringSchedulingIgnoredDuringExecution.length) {
+        out.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution;
+      }
+      if (requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms.length) {
+        out.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution;
+      }
+      this.$emit('input', out);
+    },
+
+    remove() {
+      this.rerenderNums += 1;
+      this.queueUpdate();
     },
 
     changePriority(term) {
@@ -126,9 +133,16 @@ export default {
 </script>
 
 <template>
-  <div class="row" @input="update">
+  <div class="row" @input="queueUpdate">
     <div class="col span-12">
-      <ArrayListGrouped v-model="allSelectorTerms" class="mt-20" :mode="mode" :default-add-value="{matchExpressions:[]}" :add-label="t('workload.scheduling.affinity.addNodeSelector')">
+      <ArrayListGrouped
+        v-model="allSelectorTerms"
+        class="mt-20"
+        :mode="mode"
+        :default-add-value="{matchExpressions:[]}"
+        :add-label="t('workload.scheduling.affinity.addNodeSelector')"
+        @remove="remove"
+      >
         <template #default="props">
           <div class="row">
             <div class="col span-6">
@@ -142,6 +156,7 @@ export default {
             </div>
           </div>
           <MatchExpressions
+            :key="rerenderNums"
             v-model="props.row.value.matchExpressions"
             :mode="mode"
             class="col span-12 mt-20"
diff --git a/shell/components/form/PodAffinity.vue b/shell/components/form/PodAffinity.vue
index eee557a337..9ad3367471 100644
--- a/shell/components/form/PodAffinity.vue
+++ b/shell/components/form/PodAffinity.vue
@@ -71,7 +71,10 @@ export default {
 
     return {
       allSelectorTerms,
-      defaultWeight: 1
+      defaultWeight: 1,
+      // rules in MatchExpressions.vue can not catch changes what happens on parent component
+      // we need re-render it via key changing
+      rerenderNums:  0
     };
   },
   computed: {
@@ -104,6 +107,7 @@ export default {
       return getUniqueLabelKeys(this.nodes);
     }
   },
+
   created() {
     this.queueUpdate = debounce(this.update, 500);
   },
@@ -134,6 +138,11 @@ export default {
       Object.assign(this.value.affinity, { podAffinity, podAntiAffinity });
     },
 
+    remove() {
+      this.rerenderNums += 1;
+      this.queueUpdate();
+    },
+
     addSelector() {
       const neu = {
         namespaces:    null,
@@ -190,6 +199,7 @@ export default {
         :default-add-value="{ matchExpressions: [] }"
         :mode="mode"
         :add-label="t('workload.scheduling.affinity.addNodeSelector')"
+        @remove="remove"
       >
         <template #default="props">
           <div class="row mt-20 mb-20">
@@ -235,6 +245,7 @@ export default {
             />
           </div>
           <MatchExpressions
+            :key="rerenderNums"
             :mode="mode"
             class=" col span-12 mt-20"
             :type="pod"

From c40439aee6a4c17d80bffa5e7239a28971694320 Mon Sep 17 00:00:00 2001
From: yuzeng <cridequeger@yahoo.com>
Date: Thu, 14 Jul 2022 19:16:52 +0800
Subject: [PATCH 4/8] Harvester: add the configuration of node/pod scheduling
 on Harvester node driver(RKE2)

---
 shell/components/form/PodAffinity.vue |  1 +
 shell/machine-config/harvester.vue    | 64 +++++++++++++++++++++++++--
 2 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/shell/components/form/PodAffinity.vue b/shell/components/form/PodAffinity.vue
index 9ad3367471..90f53b1254 100644
--- a/shell/components/form/PodAffinity.vue
+++ b/shell/components/form/PodAffinity.vue
@@ -136,6 +136,7 @@ export default {
       });
 
       Object.assign(this.value.affinity, { podAffinity, podAntiAffinity });
+      this.$emit('update', this.value);
     },
 
     remove() {
diff --git a/shell/machine-config/harvester.vue b/shell/machine-config/harvester.vue
index dab6e9dc22..dbcb322168 100644
--- a/shell/machine-config/harvester.vue
+++ b/shell/machine-config/harvester.vue
@@ -1,5 +1,7 @@
 <script>
 import isEmpty from 'lodash/isEmpty';
+import NodeAffinity from '@shell/components/form/NodeAffinity';
+import PodAffinity from '@shell/components/form/PodAffinity';
 import Loading from '@shell/components/Loading';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
@@ -11,10 +13,11 @@ import { Banner } from '@components/Banner';
 import { get } from '@shell/utils/object';
 import { mapGetters } from 'vuex';
 import {
-  HCI, NAMESPACE, MANAGEMENT, CONFIG_MAP, NORMAN
+  HCI, NAMESPACE, MANAGEMENT, CONFIG_MAP, NORMAN, NODE
 } from '@shell/config/types';
 import { base64Decode, base64Encode } from '@shell/utils/crypto';
 import { allHashSettled } from '@shell/utils/promise';
+import { podAffinity as podAffinityValidator } from '@shell/utils/validators/pod-affinity';
 import { stringify, exceptionToErrorsArray } from '@shell/utils/error';
 import { HCI as HCI_ANNOTATIONS } from '@shell/config/labels-annotations';
 import { isReady } from '@shell/models/harvester/harvesterhci.io.virtualmachineimage';
@@ -23,7 +26,7 @@ export default {
   name: 'ConfigComponentHarvester',
 
   components: {
-    Loading, LabeledSelect, LabeledInput, UnitInput, Banner, YamlEditor
+    Loading, LabeledSelect, LabeledInput, UnitInput, Banner, YamlEditor, NodeAffinity, PodAffinity
   },
 
   mixins: [CreateEditView],
@@ -70,6 +73,7 @@ export default {
 
       if (clusterId && isImportCluster) {
         const res = await allHashSettled({
+          nodes:        this.$store.dispatch('cluster/request', { url: `${ url }/${ NODE }s` }),
           namespaces:   this.$store.dispatch('cluster/request', { url: `${ url }/${ NAMESPACE }s` }),
           images:       this.$store.dispatch('cluster/request', { url: `${ url }/${ HCI.IMAGE }s` }),
           configMaps:   this.$store.dispatch('cluster/request', { url: `${ url }/${ CONFIG_MAP }s` }),
@@ -117,6 +121,8 @@ export default {
         this.userDataOptions = userDataOptions;
         this.networkDataOptions = networkDataOptions;
         this.images = res.images.value?.data;
+        this.allNodeObjects = res.nodes.value?.data || [];
+        this.allNodes = this.allNodeObjects.map(node => node.id);
 
         this.networkOptions = (res.networks.value?.data || []).map( (O) => {
           let value;
@@ -169,9 +175,14 @@ export default {
   },
 
   data() {
+    let vmAffinity = { affinity: {} };
     let userData = '';
     let networkData = '';
 
+    if (this.value.vmAffinity) {
+      vmAffinity = { affinity: JSON.parse(base64Decode(this.value.vmAffinity)) };
+    }
+
     if (this.value.userData) {
       userData = base64Decode(this.value.userData);
     }
@@ -183,6 +194,7 @@ export default {
     return {
       credential:         null,
       isImportCluster:    false,
+      vmAffinity,
       userData,
       networkData,
       images:             [],
@@ -190,6 +202,8 @@ export default {
       networkOptions:     [],
       userDataOptions:    [],
       networkDataOptions: [],
+      allNodes:           [],
+      allNodeObjects:     [],
       cpuCount:           ''
     };
   },
@@ -226,9 +240,11 @@ export default {
         this.imageOptions = [];
         this.networkOptions = [];
         this.namespaceOptions = [];
+        this.vmAffinity = { affinity: {} };
         this.value.imageName = '';
         this.value.networkName = '';
         this.value.vmNamespace = '';
+        this.value.vmAffinity = '';
       }
 
       this.$fetch();
@@ -304,6 +320,8 @@ export default {
         errors.push(message);
       }
 
+      podAffinityValidator(this.vmAffinity.affinity, this.$store.getters, errors);
+
       return { errors };
     },
 
@@ -332,6 +350,30 @@ export default {
       } catch (e) {
         this.errors = exceptionToErrorsArray(e);
       }
+    },
+
+    updateScheduling(neu) {
+      const { affinity } = neu;
+
+      if (!affinity.nodeAffinity && !affinity.podAffinity && !affinity.podAntiAffinity) {
+        this.value.vmAffinity = '';
+        this.vmAffinity = { affinity: {} };
+
+        return;
+      }
+
+      this.value.vmAffinity = base64Encode(JSON.stringify(affinity));
+      this.vmAffinity = neu;
+    },
+
+    updateNodeScheduling(nodeAffinity) {
+      if (!this.vmAffinity.affinity) {
+        Object.assign(this.vmAffinity, { affinity: { nodeAffinity } });
+      } else {
+        Object.assign(this.vmAffinity.affinity, { nodeAffinity });
+      }
+
+      this.updateScheduling(this.vmAffinity);
     }
   },
 };
@@ -478,7 +520,23 @@ export default {
       </div>
 
       <portal :to="'advanced-'+uuid">
-        <h3>{{ t("cluster.credential.harvester.userData.title") }}</h3>
+        <h3 class="mt-20">
+          {{ t("workload.container.titles.nodeScheduling") }}
+        </h3>
+        <NodeAffinity
+          :mode="mode"
+          :value="vmAffinity.affinity.nodeAffinity"
+          @input="updateNodeScheduling"
+        />
+
+        <h3 class="mt-20">
+          {{ t("workload.container.titles.podScheduling") }}
+        </h3>
+        <PodAffinity :mode="mode" :value="vmAffinity" :nodes="allNodeObjects" @update="updateScheduling" />
+
+        <h3 class="mt-20">
+          {{ t("cluster.credential.harvester.userData.title") }}
+        </h3>
         <div>
           <LabeledSelect
             v-if="isImportCluster && isCreate"

From 3784ddece95689c55fff095196063b6293ff08f2 Mon Sep 17 00:00:00 2001
From: yuzeng <cridequeger@yahoo.com>
Date: Wed, 20 Jul 2022 14:07:30 +0800
Subject: [PATCH 5/8] Harvester: Harvester node driver with external
 credentials enhancement

---
 shell/assets/translations/en-us.yaml   |  3 +++
 shell/assets/translations/zh-hans.yaml |  3 +++
 shell/components/form/PodAffinity.vue  | 31 ++++++++++++++++++++++++++
 shell/machine-config/harvester.vue     | 29 ++++++++++++++----------
 4 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 7a1f458f18..a91d542e90 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -1154,6 +1154,9 @@ cluster:
         label: KubeconfigContent
       placeholder: 'Namespace/Name'
       cluster: Cluster
+      affinity:
+        namespaces:
+          tooltip: e.g. default,system,base
   description:
     label: Cluster Description
     placeholder: Any text you want that better describes this cluster
diff --git a/shell/assets/translations/zh-hans.yaml b/shell/assets/translations/zh-hans.yaml
index 054c947cac..385e0074ac 100644
--- a/shell/assets/translations/zh-hans.yaml
+++ b/shell/assets/translations/zh-hans.yaml
@@ -1166,6 +1166,9 @@ cluster:
         label: KubeconfigContent
       placeholder: '命名空间/名称'
       cluster: 集群
+      affinity:
+        namespaces:
+          tooltip: 例如：default,system,base
   description:
     label: 集群描述
     placeholder: 输入可以描述该集群的文本
diff --git a/shell/components/form/PodAffinity.vue b/shell/components/form/PodAffinity.vue
index 90f53b1254..74e5321e1a 100644
--- a/shell/components/form/PodAffinity.vue
+++ b/shell/components/form/PodAffinity.vue
@@ -35,6 +35,11 @@ export default {
       type:    Array,
       default: () => []
     },
+
+    hasNodesAndNs: {
+      type:    Boolean,
+      default: true
+    }
   },
 
   data() {
@@ -49,6 +54,7 @@ export default {
       out._anti = false;
       if (term.podAffinityTerm) {
         Object.assign(out, term.podAffinityTerm);
+        out._namespaces = (term.podAffinityTerm.namespaces || []).toString();
         delete out.podAffinityTerm;
       }
 
@@ -61,6 +67,7 @@ export default {
       out._anti = true;
       if (term.podAffinityTerm) {
         Object.assign(out, term.podAffinityTerm);
+        out._namespaces = (term.podAffinityTerm.namespaces || []).toString();
         delete out.podAffinityTerm;
       }
 
@@ -173,14 +180,18 @@ export default {
     changeNamespaceMode(term, idx) {
       if (term.namespaces) {
         term.namespaces = null;
+        term._namespaces = null;
       } else {
         this.$set(term, 'namespaces', []);
+        this.$set(term, '_namespaces', '');
       }
       this.$set(this.allSelectorTerms, idx, term);
+      this.queueUpdate();
     },
 
     updateNamespaces(term, namespaces) {
       this.$set(term, 'namespaces', namespaces);
+      this.queueUpdate();
     },
 
     isEmpty,
@@ -237,6 +248,7 @@ export default {
           <div class="spacer"></div>
           <div v-if="!!props.row.value.namespaces || !!get(props.row.value, 'podAffinityTerm.namespaces')" class="row mb-20">
             <LabeledSelect
+              v-if="hasNodesAndNs"
               v-model="props.row.value.namespaces"
               :mode="mode"
               :multiple="true"
@@ -244,6 +256,15 @@ export default {
               :options="allNamespaces"
               :label="t('workload.scheduling.affinity.matchExpressions.inNamespaces')"
             />
+            <LabeledInput
+              v-else
+              v-model="props.row.value._namespaces"
+              :mode="mode"
+              :label="t('workload.scheduling.affinity.matchExpressions.inNamespaces')"
+              :placeholder="t('workload.scheduling.affinity.matchExpressions.inNamespaces')"
+              :tooltip="t('cluster.credential.harvester.affinity.namespaces.tooltip')"
+              @input="updateNamespaces(props.row.value, props.row.value._namespaces.split(','))"
+            />
           </div>
           <MatchExpressions
             :key="rerenderNums"
@@ -258,6 +279,7 @@ export default {
           <div class="row">
             <div class="col span-12">
               <LabeledSelect
+                v-if="hasNodesAndNs"
                 v-model="props.row.value.topologyKey"
                 :taggable="true"
                 :searchable="true"
@@ -270,6 +292,15 @@ export default {
                 :disabled="mode==='view'"
                 @input="update"
               />
+              <LabeledInput
+                v-else
+                v-model="props.row.value.topologyKey"
+                :mode="mode"
+                :label="t('workload.scheduling.affinity.topologyKey.label')"
+                :placeholder="t('workload.scheduling.affinity.topologyKey.placeholder')"
+                required
+                @input="update"
+              />
             </div>
           </div>
 
diff --git a/shell/machine-config/harvester.vue b/shell/machine-config/harvester.vue
index dbcb322168..5b8228489c 100644
--- a/shell/machine-config/harvester.vue
+++ b/shell/machine-config/harvester.vue
@@ -215,18 +215,23 @@ export default {
       return this.disabled || !!(this.isEdit && this.value.id);
     },
 
-    imageOptions() {
-      return (this.images || []).filter( (O) => {
-        return !O.spec.url.endsWith('.iso') && isReady.call(O);
-      }).sort((a, b) => a.metadata.creationTimestamp > b.metadata.creationTimestamp ? -1 : 1).map( (O) => {
-        const value = O.id;
-        const label = `${ O.spec.displayName } (${ value })`;
+    imageOptions: {
+      get() {
+        return (this.images || []).filter( (O) => {
+          return !O.spec.url.endsWith('.iso') && isReady.call(O);
+        }).sort((a, b) => a.metadata.creationTimestamp > b.metadata.creationTimestamp ? -1 : 1).map( (O) => {
+          const value = O.id;
+          const label = `${ O.spec.displayName } (${ value })`;
 
-        return {
-          label,
-          value
-        };
-      });
+          return {
+            label,
+            value
+          };
+        });
+      },
+      set() {
+        this.images = [];
+      }
     },
 
     namespaceDisabled() {
@@ -532,7 +537,7 @@ export default {
         <h3 class="mt-20">
           {{ t("workload.container.titles.podScheduling") }}
         </h3>
-        <PodAffinity :mode="mode" :value="vmAffinity" :nodes="allNodeObjects" @update="updateScheduling" />
+        <PodAffinity :mode="mode" :value="vmAffinity" :nodes="allNodeObjects" :has-nodes-and-ns="isImportCluster" @update="updateScheduling" />
 
         <h3 class="mt-20">
           {{ t("cluster.credential.harvester.userData.title") }}

From c3666c61fbefab3bbc61fe67ed8654fb63166e44 Mon Sep 17 00:00:00 2001
From: yuzeng <cridequeger@yahoo.com>
Date: Wed, 20 Jul 2022 14:39:28 +0800
Subject: [PATCH 6/8] Harvester: Use random string to trigger pod/node affinity
 re-render

---
 shell/components/form/NodeAffinity.vue | 4 ++--
 shell/components/form/PodAffinity.vue  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/shell/components/form/NodeAffinity.vue b/shell/components/form/NodeAffinity.vue
index 6f68fd4ea3..7af92352c3 100644
--- a/shell/components/form/NodeAffinity.vue
+++ b/shell/components/form/NodeAffinity.vue
@@ -54,7 +54,7 @@ export default {
         defaultWeight:             1,
         // rules in MatchExpressions.vue can not catch changes what happens on parent component
         // we need re-render it via key changing
-        rerenderNums:              0
+        rerenderNums:              randomStr(4)
       };
     }
   },
@@ -107,7 +107,7 @@ export default {
     },
 
     remove() {
-      this.rerenderNums += 1;
+      this.rerenderNums = randomStr(4);
       this.queueUpdate();
     },
 
diff --git a/shell/components/form/PodAffinity.vue b/shell/components/form/PodAffinity.vue
index 74e5321e1a..3041f2cef6 100644
--- a/shell/components/form/PodAffinity.vue
+++ b/shell/components/form/PodAffinity.vue
@@ -81,7 +81,7 @@ export default {
       defaultWeight: 1,
       // rules in MatchExpressions.vue can not catch changes what happens on parent component
       // we need re-render it via key changing
-      rerenderNums:  0
+      rerenderNums:  randomStr(4)
     };
   },
   computed: {
@@ -147,7 +147,7 @@ export default {
     },
 
     remove() {
-      this.rerenderNums += 1;
+      this.rerenderNums = randomStr(4);
       this.queueUpdate();
     },
 

From b00d78a1711f399437bfaa08b355eb94a0c32258 Mon Sep 17 00:00:00 2001
From: n313893254 <n313893254@126.com>
Date: Wed, 20 Jul 2022 17:31:43 +0800
Subject: [PATCH 7/8] HARVESTER: Remove unused code

---
 shell/list/harvesterhci.io.dashboard/index.vue | 2 +-
 shell/machine-config/harvester.vue             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/shell/list/harvesterhci.io.dashboard/index.vue b/shell/list/harvesterhci.io.dashboard/index.vue
index 80ba2f6ba4..6f8618c9f5 100644
--- a/shell/list/harvesterhci.io.dashboard/index.vue
+++ b/shell/list/harvesterhci.io.dashboard/index.vue
@@ -172,7 +172,7 @@ export default {
   },
 
   computed: {
-    ...mapGetters(['currentCluster', 'isVirtualCluster']),
+    ...mapGetters(['currentCluster']),
 
     accessibleResources() {
       const inStore = this.$store.getters['currentProduct'].inStore;
diff --git a/shell/machine-config/harvester.vue b/shell/machine-config/harvester.vue
index 5b8228489c..5f62d3b46e 100644
--- a/shell/machine-config/harvester.vue
+++ b/shell/machine-config/harvester.vue
@@ -229,8 +229,8 @@ export default {
           };
         });
       },
-      set() {
-        this.images = [];
+      set(neu) {
+        this.images = neu;
       }
     },
 

From 75010054cfbfa5f8b71bc2cfb260e37a1215a101 Mon Sep 17 00:00:00 2001
From: Nancy Butler <42977925+mantis-toboggan-md@users.noreply.github.com>
Date: Wed, 20 Jul 2022 12:51:45 -0700
Subject: [PATCH 8/8] harvester: update podaffinity from pr feedback

---
 shell/assets/translations/en-us.yaml   | 2 +-
 shell/assets/translations/zh-hans.yaml | 2 +-
 shell/components/form/PodAffinity.vue  | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index a91d542e90..08fda0b8c2 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -1156,7 +1156,7 @@ cluster:
       cluster: Cluster
       affinity:
         namespaces:
-          tooltip: e.g. default,system,base
+          placeholder: e.g. default,system,base
   description:
     label: Cluster Description
     placeholder: Any text you want that better describes this cluster
diff --git a/shell/assets/translations/zh-hans.yaml b/shell/assets/translations/zh-hans.yaml
index 385e0074ac..abeed6f23d 100644
--- a/shell/assets/translations/zh-hans.yaml
+++ b/shell/assets/translations/zh-hans.yaml
@@ -1168,7 +1168,7 @@ cluster:
       cluster: 集群
       affinity:
         namespaces:
-          tooltip: 例如：default,system,base
+          placeholder: 例如：default,system,base
   description:
     label: 集群描述
     placeholder: 输入可以描述该集群的文本
diff --git a/shell/components/form/PodAffinity.vue b/shell/components/form/PodAffinity.vue
index 3041f2cef6..5e2bc8b6f0 100644
--- a/shell/components/form/PodAffinity.vue
+++ b/shell/components/form/PodAffinity.vue
@@ -190,7 +190,9 @@ export default {
     },
 
     updateNamespaces(term, namespaces) {
-      this.$set(term, 'namespaces', namespaces);
+      const nsArray = namespaces.split(',').map(ns => ns.trim()).filter(ns => ns?.length);
+
+      this.$set(term, 'namespaces', nsArray);
       this.queueUpdate();
     },
 
@@ -261,9 +263,8 @@ export default {
               v-model="props.row.value._namespaces"
               :mode="mode"
               :label="t('workload.scheduling.affinity.matchExpressions.inNamespaces')"
-              :placeholder="t('workload.scheduling.affinity.matchExpressions.inNamespaces')"
-              :tooltip="t('cluster.credential.harvester.affinity.namespaces.tooltip')"
-              @input="updateNamespaces(props.row.value, props.row.value._namespaces.split(','))"
+              :placeholder="t('cluster.credential.harvester.affinity.namespaces.placeholder')"
+              @input="updateNamespaces(props.row.value, props.row.value._namespaces)"
             />
           </div>
           <MatchExpressions