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 aa5a501c29)

Signed-off-by: pohanhuang <pohan.huang@suse.com>
Co-authored-by: Po Han Huang <pohan.huang@suse.com>
This commit is contained in:
mergify[bot]andPo Han Huang authored and GitHub committed 2026-11-20 20:01:31 +08:00
1 parent ff0a6c8431
commit 8ac059b2d6
10 files changed
+475 -12

No files matched your search

+38 -5
View File
@@ -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"
/>
<UpgradeRepositoryStorageClass
v-if="repositoryStorageClassEnabled"
v-model:value="storageClassName"
class="mb-10"
:storage-classes="storageClasses"
/>
<div
v-if="canEnableLogging"
class="mb-5"
@@ -263,7 +296,7 @@ export default {
<t k="generic.close" />
</button>
<button
:disabled="!readyReleaseNote"
:disabled="!canSubmitUpgrade"
class="btn role-tertiary bg-primary"
@click.prevent="handleUpgrade"
>
@@ -0,0 +1,83 @@
<script>
import LabeledSelect from '@shell/components/form/LabeledSelect';
import { LVM_DRIVER } from '../models/harvester/storage.k8s.io.storageclass';
import { isInternalStorageClass } from '../utils/storage-class';
export function getUpgradeRepositoryStorageClassDefault(storageClasses) {
return storageClasses.find((storageClass) => storageClass.isDefault &&
!storageClass.parameters?.backingImage &&
storageClass.provisioner !== LVM_DRIVER &&
!isInternalStorageClass(storageClass.name))?.name || '';
}
export default {
name: 'UpgradeRepositoryStorageClass',
components: { LabeledSelect },
props: {
value: {
type: String,
default: '',
},
storageClasses: {
type: Array,
default: () => [],
},
disabled: {
type: Boolean,
default: false,
},
},
emits: ['update:value'],
computed: {
storageClassOptions() {
const t = this.$store.getters['i18n/t'];
return this.storageClasses
.filter((storageClass) => !storageClass.parameters?.backingImage && storageClass.provisioner !== LVM_DRIVER)
.map((storageClass) => {
let label = storageClass.isDefault ? `${ storageClass.name } (${ t('generic.default') })` : storageClass.name;
let disabled = false;
if (isInternalStorageClass(storageClass.name)) {
label += ` (${ t('harvester.storage.internal.label') })`;
disabled = true;
}
return {
label,
value: storageClass.name,
disabled
};
});
},
},
};
</script>
<template>
<LabeledSelect
:value="value"
:label="t('harvester.upgradePage.repositoryStorageClass')"
:tooltip="t('harvester.upgradePage.repositoryStorageClassTooltip')"
:placeholder="t('harvester.upgradePage.repositoryStorageClassPlaceholder')"
:options="storageClassOptions"
:disabled="disabled"
required
@update:value="$emit('update:value', $event)"
>
<template #no-options="{ searching }">
<span
v-if="!searching"
class="text-muted"
>
{{ t('harvester.upgradePage.repositoryStorageClassNoOptions', null, true) }}
</span>
</template>
</LabeledSelect>
</template>
@@ -0,0 +1,86 @@
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
import HarvesterUpgrade from '../HarvesterUpgrade.vue';
const save = jest.fn().mockResolvedValue();
const upgrade = { notifyGeneratedName: jest.fn(), save };
function createForm(storageClassName = '', repositoryStorageClassEnabled = true) {
return {
version: 'v1.10.0',
storageClassName,
repositoryStorageClassEnabled,
canEnableLogging: false,
enableLogging: true,
skipSingleReplicaDetachedVolFeatureEnabled: false,
skipSingleReplicaDetachedVol: false,
cancel: jest.fn(),
errors: '',
$store: { dispatch: jest.fn().mockResolvedValue(upgrade) }
};
}
describe('component: HarvesterUpgrade', () => {
it('uses the shared Upgrade Repository StorageClass selector', () => {
expect(HarvesterUpgrade.components.UpgradeRepositoryStorageClass).toBeDefined();
});
it('leaves the default empty when it is unavailable for upgrade repositories', async() => {
const form = {
upgrade: [],
storageClassName: 'previous',
$store: {
getters: { currentProduct: { inStore: 'harvester' } },
dispatch: jest.fn()
.mockResolvedValueOnce([])
.mockResolvedValueOnce([])
.mockResolvedValueOnce([])
.mockResolvedValueOnce([
{
name: 'lvm-local', isDefault: true, provisioner: 'lvm.driver.harvesterhci.io'
},
{ name: 'fast' }
])
}
};
await HarvesterUpgrade.fetch.call(form);
expect(form.storageClassName).toBe('');
});
it('blocks the upgrade when no StorageClass is selected', () => {
const canSubmitUpgrade = HarvesterUpgrade.computed.canSubmitUpgrade;
expect(canSubmitUpgrade.call({
readyReleaseNote: true,
repositoryStorageClassEnabled: true,
storageClassName: ''
})).toBe(false);
});
it('saves the selected StorageClass as an Upgrade annotation', async() => {
const form = createForm('fast');
await HarvesterUpgrade.methods.handleUpgrade.call(form);
expect(form.$store.dispatch).toHaveBeenCalledWith('harvester/create', expect.objectContaining({
metadata: expect.objectContaining({ annotations: { [HCI_ANNOTATIONS.UPGRADE_STORAGE_CLASS]: 'fast' } }),
spec: { version: 'v1.10.0' }
}));
});
it('omits the repository StorageClass when the feature is disabled', async() => {
const form = createForm('fast', false);
await HarvesterUpgrade.methods.handleUpgrade.call(form);
expect(form.$store.dispatch).toHaveBeenCalledWith('harvester/create', {
type: 'harvesterhci.io.upgrade',
metadata: {
generateName: 'hvst-upgrade-',
namespace: 'harvester-system'
},
spec: { version: 'v1.10.0' }
});
});
});
@@ -0,0 +1,40 @@
import UpgradeRepositoryStorageClass, { getUpgradeRepositoryStorageClassDefault } from '../UpgradeRepositoryStorageClass.vue';
const storageClasses = [
{ name: 'fast', isDefault: true },
{ name: 'image-cache', parameters: { backingImage: 'image' } },
{ name: 'lvm-local', provisioner: 'lvm.driver.harvesterhci.io' },
{ name: 'longhorn-static' },
{ name: 'slow' }
];
describe('component: UpgradeRepositoryStorageClass', () => {
it('omits backing-image and LVM StorageClasses while disabling internal classes', () => {
const form = {
storageClasses,
$store: { getters: { 'i18n/t': (key) => key } }
};
expect(UpgradeRepositoryStorageClass.computed.storageClassOptions.call(form)).toStrictEqual([
{
label: 'fast (generic.default)', value: 'fast', disabled: false
},
{
label: 'longhorn-static (harvester.storage.internal.label)', value: 'longhorn-static', disabled: true
},
{
label: 'slow', value: 'slow', disabled: false
},
]);
});
it('does not use an unavailable StorageClass as the default', () => {
expect(getUpgradeRepositoryStorageClassDefault([
{
name: 'lvm-local', isDefault: true, provisioner: 'lvm.driver.harvesterhci.io'
},
{ name: 'longhorn-static' },
{ name: 'fast' }
])).toBe('');
});
});