From 375127a78ae208c7fa98f2d7ddda1db3fd735a30 Mon Sep 17 00:00:00 2001
From: Yi-Ya Chen <yiya.chen@suse.com>
Date: Tue, 11 Feb 2025 15:09:13 +0800
Subject: [PATCH 1/4] feat: add checkbox to skip checking

Signed-off-by: Yi-Ya Chen <yiya.chen@suse.com>
---
 pkg/harvester/components/HarvesterUpgrade.vue |  35 ++++--
 pkg/harvester/config/labels-annotations.js    | 113 +++++++++---------
 pkg/harvester/l10n/en-us.yaml                 |   1 +
 3 files changed, 84 insertions(+), 65 deletions(-)

diff --git a/pkg/harvester/components/HarvesterUpgrade.vue b/pkg/harvester/components/HarvesterUpgrade.vue
index c20c04a8..41e1a4c7 100644
--- a/pkg/harvester/components/HarvesterUpgrade.vue
+++ b/pkg/harvester/components/HarvesterUpgrade.vue
@@ -5,8 +5,10 @@ import { Checkbox } from '@components/Form/Checkbox';
 import ModalWithCard from '@shell/components/ModalWithCard';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { Banner } from '@components/Banner';
+import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 import { HCI } from '../types';
 import UpgradeInfo from './UpgradeInfo';
+
 export default {
   name: 'HarvesterUpgrade',
 
@@ -28,14 +30,15 @@ export default {
 
   data() {
     return {
-      upgrade:          [],
-      upgradeMessage:   [],
-      errors:           '',
-      selectMode:       true,
-      version:          '',
-      enableLogging:    true,
-      readyReleaseNote: false,
-      isOpen:           false
+      upgrade:                       [],
+      upgradeMessage:               [],
+      errors:                       '',
+      selectMode:                   true,
+      version:                      '',
+      enableLogging:                true,
+      skipSingleReplicaDetachedVol: false,
+      readyReleaseNote:             false,
+      isOpen:                       false
     };
   },
 
@@ -99,11 +102,16 @@ export default {
         type:     HCI.UPGRADE,
         metadata: {
           generateName: 'hvst-upgrade-',
-          namespace:    'harvester-system'
+          namespace:    'harvester-system',
         },
         spec: { version: this.version }
       };
 
+      if (this.skipSingleReplicaDetachedVol) {
+        upgradeValue.metadata.annotations =
+          { [HCI_ANNOTATIONS.SKIP_SINGLE_REPLICA_DETACHED_VOL]: JSON.stringify(this.skipSingleReplicaDetachedVol) };
+      }
+
       if (this.canEnableLogging) {
         upgradeValue.spec.logEnabled = this.enableLogging;
       }
@@ -190,6 +198,15 @@ export default {
             />
           </div>
 
+          <div class="mb-5">
+            <Checkbox
+              v-model:value="skipSingleReplicaDetachedVol"
+              class="check"
+              type="checkbox"
+              :label="t('harvester.upgradePage.skipSingleReplicaDetachedVol')"
+            />
+          </div>
+
           <div v-if="version">
             <p
               v-clean-html="t('harvester.upgradePage.releaseTip', {url: releaseLink}, true)"
diff --git a/pkg/harvester/config/labels-annotations.js b/pkg/harvester/config/labels-annotations.js
index 7d31002a..a38071d4 100644
--- a/pkg/harvester/config/labels-annotations.js
+++ b/pkg/harvester/config/labels-annotations.js
@@ -7,60 +7,61 @@ export const LABELS_TO_IGNORE_REGEX = [
 ];
 
 export const HCI = {
-  CLOUD_INIT:                     'harvesterhci.io/cloud-init-template',
-  CURRENT_IP:                     'rke2.io/internal-ip',
-  IMAGE_ID:                       'harvesterhci.io/imageId',
-  SSH_NAMES:                      'harvesterhci.io/sshNames',
-  NETWORK_IPS:                    'network.harvesterhci.io/ips',
-  TEMPLATE_VERSION_CUSTOM_NAME:   'template-version.harvesterhci.io/customName',
-  CREATOR:                        'harvesterhci.io/creator',
-  OS:                             'harvesterhci.io/os',
-  NETWORK_TYPE:                   'network.harvesterhci.io/type',
-  VM_NAME:                        'harvesterhci.io/vmName',
-  VM_NAME_PREFIX:                 'harvesterhci.io/vmNamePrefix',
-  VM_RESERVED_MEMORY:             'harvesterhci.io/reservedMemory',
-  MAINTENANCE_STATUS:             'harvesterhci.io/maintain-status',
-  HOST_CUSTOM_NAME:               'harvesterhci.io/host-custom-name',
-  HOST_CONSOLE_URL:               'harvesterhci.io/host-console-url',
-  RESTORE_NAME:                   'restore.harvesterhci.io/name',
-  NODE_ROLE_MASTER:               'node-role.kubernetes.io/master',
-  NODE_ROLE_CONTROL_PLANE:        'node-role.kubernetes.io/control-plane',
-  NODE_ROLE_ETCD:                 'node-role.harvesterhci.io/witness',
-  PROMOTE_STATUS:                 'harvesterhci.io/promote-status',
-  MIGRATION_STATE:                'harvesterhci.io/migrationState',
-  VOLUME_CLAIM_TEMPLATE:          'harvesterhci.io/volumeClaimTemplates',
-  IMAGE_NAME:                     'harvesterhci.io/image-name',
-  INIT_IP:                        'etcd.rke2.cattle.io/node-address',
-  NODE_SCHEDULABLE:               'kubevirt.io/schedulable',
-  NETWORK_ROUTE:                  'network.harvesterhci.io/route',
-  MATCHED_NODES:                  'network.harvesterhci.io/matched-nodes',
-  OS_UPGRADE_IMAGE:               'harvesterhci.io/os-upgrade-image',
-  LATEST_UPGRADE:                 'harvesterhci.io/latestUpgrade',
-  UPGRADE_STATE:                  'harvesterhci.io/upgradeState',
-  REAY_MESSAGE:                   'harvesterhci.io/read-message',
-  DYNAMIC_SSHKEYS_NAMES:          'harvesterhci.io/dynamic-ssh-key-names',
-  DYNAMIC_SSHKEYS_USERS:          'harvesterhci.io/dynamic-ssh-key-users',
-  IMAGE_SUFFIX:                   'harvesterhci.io/image-type',
-  OS_TYPE:                        'harvesterhci.io/os-type',
-  STORAGE_PROVISIONER:            'harvesterhci.io/storageProvisioner',
-  HOST_REQUEST:                   'management.cattle.io/pod-requests',
-  STORAGE_CLASS:                  'harvesterhci.io/storageClassName',
-  STORAGE_NETWORK:                'storage-network.settings.harvesterhci.io',
-  ADDON_EXPERIMENTAL:             'addon.harvesterhci.io/experimental',
-  VOLUME_ERROR:                   'longhorn.io/volume-scheduling-error',
-  KVM_AMD_CPU:                    'cpu-feature.node.kubevirt.io/svm',
-  KVM_INTEL_CPU:                  'cpu-feature.node.kubevirt.io/vmx',
-  NODE_MANUFACTURER:              'manufacturer',
-  NODE_MODEL:                     'model',
-  NODE_SERIAL_NUMBER:             'serialNumber',
-  VM_INSUFFICIENT:                'harvesterhci.io/insufficient-resource-quota',
-  NODE_NTP_SYNC_STATUS:           'node.harvesterhci.io/ntp-service',
-  PARENT_SRIOV:                   'harvesterhci.io/parent-sriov-network-device',
-  PARENT_SRIOV_GPU:               'harvesterhci.io/parentSRIOVGPUDevice',
-  VM_MAINTENANCE_MODE_STRATEGY:   'harvesterhci.io/maintain-mode-strategy',
-  NODE_CPU_MANAGER_UPDATE_STATUS: 'harvesterhci.io/cpu-manager-update-status',
-  CPU_MANAGER:                    'cpumanager',
-  VM_DEVICE_ALLOCATION_DETAILS:   'harvesterhci.io/deviceAllocationDetails',
-  SVM_BACKUP_ID:                  'harvesterhci.io/svmbackupId',
-  DISABLE_LONGHORN_V2_ENGINE:     'node.longhorn.io/disable-v2-data-engine',
+  CLOUD_INIT:                       'harvesterhci.io/cloud-init-template',
+  CURRENT_IP:                       'rke2.io/internal-ip',
+  IMAGE_ID:                         'harvesterhci.io/imageId',
+  SSH_NAMES:                        'harvesterhci.io/sshNames',
+  NETWORK_IPS:                      'network.harvesterhci.io/ips',
+  TEMPLATE_VERSION_CUSTOM_NAME:     'template-version.harvesterhci.io/customName',
+  CREATOR:                          'harvesterhci.io/creator',
+  OS:                               'harvesterhci.io/os',
+  NETWORK_TYPE:                     'network.harvesterhci.io/type',
+  VM_NAME:                          'harvesterhci.io/vmName',
+  VM_NAME_PREFIX:                   'harvesterhci.io/vmNamePrefix',
+  VM_RESERVED_MEMORY:               'harvesterhci.io/reservedMemory',
+  MAINTENANCE_STATUS:               'harvesterhci.io/maintain-status',
+  HOST_CUSTOM_NAME:                 'harvesterhci.io/host-custom-name',
+  HOST_CONSOLE_URL:                 'harvesterhci.io/host-console-url',
+  RESTORE_NAME:                     'restore.harvesterhci.io/name',
+  NODE_ROLE_MASTER:                 'node-role.kubernetes.io/master',
+  NODE_ROLE_CONTROL_PLANE:          'node-role.kubernetes.io/control-plane',
+  NODE_ROLE_ETCD:                   'node-role.harvesterhci.io/witness',
+  PROMOTE_STATUS:                   'harvesterhci.io/promote-status',
+  MIGRATION_STATE:                  'harvesterhci.io/migrationState',
+  VOLUME_CLAIM_TEMPLATE:            'harvesterhci.io/volumeClaimTemplates',
+  IMAGE_NAME:                       'harvesterhci.io/image-name',
+  INIT_IP:                          'etcd.rke2.cattle.io/node-address',
+  NODE_SCHEDULABLE:                 'kubevirt.io/schedulable',
+  NETWORK_ROUTE:                    'network.harvesterhci.io/route',
+  MATCHED_NODES:                    'network.harvesterhci.io/matched-nodes',
+  OS_UPGRADE_IMAGE:                 'harvesterhci.io/os-upgrade-image',
+  LATEST_UPGRADE:                   'harvesterhci.io/latestUpgrade',
+  UPGRADE_STATE:                    'harvesterhci.io/upgradeState',
+  REAY_MESSAGE:                     'harvesterhci.io/read-message',
+  DYNAMIC_SSHKEYS_NAMES:            'harvesterhci.io/dynamic-ssh-key-names',
+  DYNAMIC_SSHKEYS_USERS:            'harvesterhci.io/dynamic-ssh-key-users',
+  IMAGE_SUFFIX:                     'harvesterhci.io/image-type',
+  OS_TYPE:                          'harvesterhci.io/os-type',
+  STORAGE_PROVISIONER:              'harvesterhci.io/storageProvisioner',
+  SKIP_SINGLE_REPLICA_DETACHED_VOL: 'harvesterhci.io/skipSingleReplicaDetachedVol',
+  HOST_REQUEST:                     'management.cattle.io/pod-requests',
+  STORAGE_CLASS:                    'harvesterhci.io/storageClassName',
+  STORAGE_NETWORK:                  'storage-network.settings.harvesterhci.io',
+  ADDON_EXPERIMENTAL:               'addon.harvesterhci.io/experimental',
+  VOLUME_ERROR:                     'longhorn.io/volume-scheduling-error',
+  KVM_AMD_CPU:                      'cpu-feature.node.kubevirt.io/svm',
+  KVM_INTEL_CPU:                    'cpu-feature.node.kubevirt.io/vmx',
+  NODE_MANUFACTURER:                'manufacturer',
+  NODE_MODEL:                       'model',
+  NODE_SERIAL_NUMBER:               'serialNumber',
+  VM_INSUFFICIENT:                  'harvesterhci.io/insufficient-resource-quota',
+  NODE_NTP_SYNC_STATUS:             'node.harvesterhci.io/ntp-service',
+  PARENT_SRIOV:                     'harvesterhci.io/parent-sriov-network-device',
+  PARENT_SRIOV_GPU:                 'harvesterhci.io/parentSRIOVGPUDevice',
+  VM_MAINTENANCE_MODE_STRATEGY:     'harvesterhci.io/maintain-mode-strategy',
+  NODE_CPU_MANAGER_UPDATE_STATUS:   'harvesterhci.io/cpu-manager-update-status',
+  CPU_MANAGER:                      'cpumanager',
+  VM_DEVICE_ALLOCATION_DETAILS:     'harvesterhci.io/deviceAllocationDetails',
+  SVM_BACKUP_ID:                    'harvesterhci.io/svmbackupId',
+  DISABLE_LONGHORN_V2_ENGINE:       'node.longhorn.io/disable-v2-data-engine',
 };
diff --git a/pkg/harvester/l10n/en-us.yaml b/pkg/harvester/l10n/en-us.yaml
index 965373e5..b35c8b5b 100644
--- a/pkg/harvester/l10n/en-us.yaml
+++ b/pkg/harvester/l10n/en-us.yaml
@@ -854,6 +854,7 @@ harvester:
     currentVersion: CURRENT VERSION
     versionLabel: AVAILABLE COMPATIBLE VERSIONS
     enableLogging: Enable Logging
+    skipSingleReplicaDetachedVol: Skip checking single-replica detached volumes
     upgradeNode: Upgrading Node
     upgradeSysService: Upgrading System Service
     upgradeImage: Download Upgrade Image

From 72c6741af1a3e5d3488dfd30872297ff970e30cd Mon Sep 17 00:00:00 2001
From: Yi-Ya Chen <yiya.chen@suse.com>
Date: Tue, 11 Feb 2025 15:38:41 +0800
Subject: [PATCH 2/4] feat: add feature flag

Signed-off-by: Yi-Ya Chen <yiya.chen@suse.com>
---
 pkg/harvester/components/HarvesterUpgrade.vue | 11 +++++++++--
 pkg/harvester/config/feature-flags.js         |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkg/harvester/components/HarvesterUpgrade.vue b/pkg/harvester/components/HarvesterUpgrade.vue
index 41e1a4c7..11dc51f8 100644
--- a/pkg/harvester/components/HarvesterUpgrade.vue
+++ b/pkg/harvester/components/HarvesterUpgrade.vue
@@ -71,6 +71,10 @@ export default {
       return this.$store.getters['harvester/schemaFor'](HCI.UPGRADE_LOG);
     },
 
+    skipSingleReplicaDetachedVolFeatureEnabled() {
+      return this.$store.getters['harvester-common/getFeatureEnabled']('skipSingleReplicaDetachedVol');
+    },
+
     releaseLink() {
       return `https://github.com/harvester/harvester/releases/tag/${ this.version }`;
     }
@@ -107,7 +111,7 @@ export default {
         spec: { version: this.version }
       };
 
-      if (this.skipSingleReplicaDetachedVol) {
+      if (this.skipSingleReplicaDetachedVolFeatureEnabled && this.skipSingleReplicaDetachedVol) {
         upgradeValue.metadata.annotations =
           { [HCI_ANNOTATIONS.SKIP_SINGLE_REPLICA_DETACHED_VOL]: JSON.stringify(this.skipSingleReplicaDetachedVol) };
       }
@@ -198,7 +202,10 @@ export default {
             />
           </div>
 
-          <div class="mb-5">
+          <div
+            v-if="skipSingleReplicaDetachedVolFeatureEnabled"
+            class="mb-5"
+          >
             <Checkbox
               v-model:value="skipSingleReplicaDetachedVol"
               class="check"
diff --git a/pkg/harvester/config/feature-flags.js b/pkg/harvester/config/feature-flags.js
index 5ece95f0..3aea8f33 100644
--- a/pkg/harvester/config/feature-flags.js
+++ b/pkg/harvester/config/feature-flags.js
@@ -48,7 +48,8 @@ const featuresV142 = [
 // TODO: add v1.5.0 official release note
 const featuresV150 = [
   ...featuresV142,
-  'tpmPersistentState'
+  'tpmPersistentState',
+  'skipSingleReplicaDetachedVol'
 ];
 
 export const RELEASE_FEATURES = {

From fd3f5ec1e69e4bacc2d161d8964a9c883c988974 Mon Sep 17 00:00:00 2001
From: Yi-Ya Chen <yiya.chen@suse.com>
Date: Tue, 11 Feb 2025 15:41:11 +0800
Subject: [PATCH 3/4] refactor: align key spacing

Signed-off-by: Yi-Ya Chen <yiya.chen@suse.com>
---
 pkg/harvester/components/HarvesterUpgrade.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/harvester/components/HarvesterUpgrade.vue b/pkg/harvester/components/HarvesterUpgrade.vue
index 11dc51f8..80ab0cf0 100644
--- a/pkg/harvester/components/HarvesterUpgrade.vue
+++ b/pkg/harvester/components/HarvesterUpgrade.vue
@@ -30,7 +30,7 @@ export default {
 
   data() {
     return {
-      upgrade:                       [],
+      upgrade:                      [],
       upgradeMessage:               [],
       errors:                       '',
       selectMode:                   true,
@@ -106,7 +106,7 @@ export default {
         type:     HCI.UPGRADE,
         metadata: {
           generateName: 'hvst-upgrade-',
-          namespace:    'harvester-system',
+          namespace:    'harvester-system'
         },
         spec: { version: this.version }
       };

From 3b054b35c667b72ecb9e01a00a404e2646810842 Mon Sep 17 00:00:00 2001
From: Yi-Ya Chen <yiya.chen@suse.com>
Date: Tue, 11 Feb 2025 17:57:36 +0800
Subject: [PATCH 4/4] feat: add divider

Signed-off-by: Yi-Ya Chen <yiya.chen@suse.com>
---
 pkg/harvester/components/HarvesterUpgrade.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg/harvester/components/HarvesterUpgrade.vue b/pkg/harvester/components/HarvesterUpgrade.vue
index 80ab0cf0..efe84f3e 100644
--- a/pkg/harvester/components/HarvesterUpgrade.vue
+++ b/pkg/harvester/components/HarvesterUpgrade.vue
@@ -213,7 +213,10 @@ export default {
               :label="t('harvester.upgradePage.skipSingleReplicaDetachedVol')"
             />
           </div>
-
+          <hr
+            v-if="version"
+            class="divider"
+          />
           <div v-if="version">
             <p
               v-clean-html="t('harvester.upgradePage.releaseTip', {url: releaseLink}, true)"