From 8ac059b2d6a4ae393707571a548e9323c7ee9b7e Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 20 Nov 2026 20:01:31 +0800 Subject: [PATCH] ui: add Upgrade Storage Class selector for v1.10+ upgrade flows (#1249) (#1266) Add a StorageClass selector to online and air-gapped upgrade pages when the repositoryStorageClass feature is enabled (v1.10+). - Online: stores selection in harvesterhci.io/upgrade-storage-class annotation - Air-gapped: stores selection in image spec.targetStorageClassName - Selector locked while uploaded image exists; unlocked on switch to URL - Hidden on pre-v1.10 clusters (cherry picked from commit aa5a501c29037dedc89b7c537d28b7d8067736f7) Signed-off-by: pohanhuang Co-authored-by: Po Han Huang --- pkg/harvester/components/HarvesterUpgrade.vue | 43 ++++- .../UpgradeRepositoryStorageClass.vue | 83 +++++++++ .../__tests__/HarvesterUpgrade.test.js | 86 +++++++++ .../UpgradeRepositoryStorageClass.test.js | 40 ++++ pkg/harvester/config/feature-flags.js | 1 + pkg/harvester/config/labels-annotations.js | 1 + pkg/harvester/l10n/en-us.yaml | 4 + .../airgapupgrade/__tests__/index.test.js | 175 ++++++++++++++++++ .../pages/c/_cluster/airgapupgrade/index.vue | 49 ++++- .../utils/__tests__/feature-flags.test.js | 5 + 10 files changed, 475 insertions(+), 12 deletions(-) create mode 100644 pkg/harvester/components/UpgradeRepositoryStorageClass.vue create mode 100644 pkg/harvester/components/__tests__/HarvesterUpgrade.test.js create mode 100644 pkg/harvester/components/__tests__/UpgradeRepositoryStorageClass.test.js create mode 100644 pkg/harvester/pages/c/_cluster/airgapupgrade/__tests__/index.test.js diff --git a/pkg/harvester/components/HarvesterUpgrade.vue b/pkg/harvester/components/HarvesterUpgrade.vue index c0aabbdb..7c9ff3fb 100644 --- a/pkg/harvester/components/HarvesterUpgrade.vue +++ b/pkg/harvester/components/HarvesterUpgrade.vue @@ -6,26 +6,30 @@ 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 { STORAGE_CLASS } from '@shell/config/types'; import { HCI } from '../types'; import UpgradeInfo from './UpgradeInfo'; +import UpgradeRepositoryStorageClass, { getUpgradeRepositoryStorageClassDefault } from './UpgradeRepositoryStorageClass'; export default { name: 'HarvesterUpgrade', components: { - Checkbox, ModalWithCard, LabeledSelect, Banner, UpgradeInfo + Checkbox, ModalWithCard, LabeledSelect, Banner, UpgradeInfo, UpgradeRepositoryStorageClass }, async fetch() { const inStore = this.$store.getters['currentProduct'].inStore; const res = await allHash({ - upgradeVersion: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.SETTING }), - versions: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VERSION }), - upgrade: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.UPGRADE }), + upgradeVersion: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.SETTING }), + versions: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VERSION }), + upgrade: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.UPGRADE }), + storageClasses: this.$store.dispatch(`${ inStore }/findAll`, { type: STORAGE_CLASS }), }); this.upgrade = res.upgrade; + this.storageClassName = getUpgradeRepositoryStorageClassDefault(res.storageClasses); }, data() { @@ -35,6 +39,7 @@ export default { errors: '', selectMode: true, version: '', + storageClassName: '', enableLogging: true, skipSingleReplicaDetachedVol: false, readyReleaseNote: false, @@ -59,6 +64,10 @@ export default { return this.versionOptions.length > 0 && !this.isUpgradeInProgress; }, + canSubmitUpgrade() { + return this.readyReleaseNote && (!this.repositoryStorageClassEnabled || !!this.storageClassName); + }, + versionOptions() { const versions = this.$store.getters['harvester/all'](HCI.VERSION) || []; @@ -75,6 +84,16 @@ export default { return this.$store.getters['harvester/schemaFor'](HCI.UPGRADE_LOG); }, + storageClasses() { + const inStore = this.$store.getters['currentProduct'].inStore; + + return this.$store.getters[`${ inStore }/all`](STORAGE_CLASS) || []; + }, + + repositoryStorageClassEnabled() { + return this.$store.getters['harvester-common/getFeatureEnabled']('repositoryStorageClass'); + }, + skipSingleReplicaDetachedVolFeatureEnabled() { return this.$store.getters['harvester-common/getFeatureEnabled']('skipSingleReplicaDetachedVol'); }, @@ -124,6 +143,13 @@ export default { upgradeValue.spec.logEnabled = this.enableLogging; } + if (this.repositoryStorageClassEnabled && this.storageClassName) { + upgradeValue.metadata.annotations = { + ...upgradeValue.metadata.annotations, + [HCI_ANNOTATIONS.UPGRADE_STORAGE_CLASS]: this.storageClassName + }; + } + const proxyResource = await this.$store.dispatch('harvester/create', upgradeValue); try { @@ -204,6 +230,13 @@ export default { :clearable="true" /> + +