Compare commits

..
Author SHA1 Message Date
renovate[bot] 1d6cfad739 deps: update minor dependencies 2026-11-17 00:17:59 +00:00
18 changed files with 157 additions and 1347 deletions
@@ -53,7 +53,7 @@ jobs:
- name: Setup Helm
uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3
with:
version: v3.8.0
version: v3.22.1
- name: Setup Nodejs with yarn install
uses: ./.github/actions/setup
@@ -78,7 +78,7 @@ jobs:
- name: Setup Helm
uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3
with:
version: v3.8.0
version: v3.22.1
- name: Build Helm charts
run: |
@@ -138,7 +138,7 @@ jobs:
git push origin ${{ needs.setup-target-branch.outputs.target_branch }}
- name: Run Helm chart releaser
uses: helm/chart-releaser-action@cae68fefc6b5f367a0275617c9f83181ba54714f # v1.7.0
uses: helm/chart-releaser-action@92c6b97fa9f664492a2592e0d1d80bc6bf378957 # v1.9.0
with:
charts_dir: ./charts
env:
+6 -6
View File
@@ -23,7 +23,7 @@
"@xterm/addon-webgl": "0.19.0",
"@xterm/addon-canvas": "0.7.0",
"node-polyfill-webpack-plugin": "^3.0.0",
"elkjs": "^0.11.0",
"elkjs": "^0.12.0",
"vue-draggable-next": "^2.2.1",
"yaml": "^2.5.1"
},
@@ -31,7 +31,7 @@
"@novnc/novnc": "1.7.0",
"@tootallnate/once": "^2.0.1",
"@types/lodash": "4.17.25",
"@types/node": "25.3.3",
"@types/node": "25.9.9",
"cookie": "0.7.2",
"cronstrue": "2.59.0",
"d3-color": "3.1.0",
@@ -49,11 +49,11 @@
"postcss-selector-parser": "7.1.6",
"qs": "6.16.0",
"roarr": "7.21.7",
"semver": "7.5.4",
"semver": "7.8.6",
"serialize-javascript": "7.0.5",
"uuid": "11.1.1",
"webpack-dev-server": "5.2.6",
"ws": "8.21.0",
"ws": "8.22.2",
"@vue/cli-service/html-webpack-plugin": "^5.0.0"
},
"scripts": {
@@ -82,10 +82,10 @@
"eslint-plugin-promise": "^7.1.0",
"husky": "^9.1.7",
"@types/jest": "29.5.12",
"@vue/test-utils": "2.4.6",
"@vue/test-utils": "2.5.1",
"@vue/vue3-jest": "29.2.6",
"babel-jest": "29.7.0",
"babel-plugin-transform-require-context": "0.1.1",
"babel-plugin-transform-require-context": "0.2.0",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"ts-jest": "29.4.12"
+5 -38
View File
@@ -6,30 +6,26 @@ 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, UpgradeRepositoryStorageClass
Checkbox, ModalWithCard, LabeledSelect, Banner, UpgradeInfo
},
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 }),
storageClasses: this.$store.dispatch(`${ inStore }/findAll`, { type: STORAGE_CLASS }),
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 }),
});
this.upgrade = res.upgrade;
this.storageClassName = getUpgradeRepositoryStorageClassDefault(res.storageClasses);
},
data() {
@@ -39,7 +35,6 @@ export default {
errors: '',
selectMode: true,
version: '',
storageClassName: '',
enableLogging: true,
skipSingleReplicaDetachedVol: false,
readyReleaseNote: false,
@@ -64,10 +59,6 @@ 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) || [];
@@ -84,16 +75,6 @@ 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');
},
@@ -143,13 +124,6 @@ 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 {
@@ -230,13 +204,6 @@ 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"
@@ -296,7 +263,7 @@ export default {
<t k="generic.close" />
</button>
<button
:disabled="!canSubmitUpgrade"
:disabled="!readyReleaseNote"
class="btn role-tertiary bg-primary"
@click.prevent="handleUpgrade"
>
@@ -1,83 +0,0 @@
<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>
@@ -1,86 +0,0 @@
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' }
});
});
});
@@ -1,40 +0,0 @@
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('');
});
});
@@ -1,79 +0,0 @@
import { shallowMount } from '@vue/test-utils';
import UpgradeConfig from '@pkg/harvester/components/settings/upgrade-config.vue';
const DEFAULT = JSON.stringify({
imagePreloadOption: { strategy: { type: 'sequential' } },
nodeUpgradeOption: { strategy: { mode: 'auto' } },
restoreVM: false,
});
const mountConfig = (config, featureEnabled) => shallowMount(UpgradeConfig, {
props: {
mode: 'edit',
value: { default: DEFAULT, value: config ? JSON.stringify(config) : '' },
},
global: {
mocks: {
$store: {
dispatch: jest.fn(),
getters: {
currentProduct: { inStore: 'harvester' },
'harvester/all': () => [],
'i18n/t': (key) => key,
'harvester-common/getFeatureEnabled': (name) => name === 'shutdownVMOnMigrationFailure' && featureEnabled,
},
},
},
},
});
const savedValue = (wrapper) => JSON.parse(wrapper.props('value').value);
describe('component: upgrade-config', () => {
it('should default shutdownVMOnMigrationFailure to false when the field is missing', () => {
const wrapper = mountConfig(undefined, true);
expect(savedValue(wrapper).shutdownVMOnMigrationFailure).toBe(false);
expect(wrapper.findComponent('[name="shutdownVMOnMigrationFailure"]').exists()).toBe(true);
});
it('should keep an enabled shutdownVMOnMigrationFailure', () => {
const wrapper = mountConfig({ shutdownVMOnMigrationFailure: true }, true);
expect(savedValue(wrapper).shutdownVMOnMigrationFailure).toBe(true);
});
it('should save the value selected in its radio group', async() => {
const wrapper = mountConfig(undefined, true);
await wrapper.findComponent('[name="shutdownVMOnMigrationFailure"]').vm.$emit('update:value', true);
expect(savedValue(wrapper).shutdownVMOnMigrationFailure).toBe(true);
expect(savedValue(wrapper).restoreVM).toBe(false);
await wrapper.findComponent('[name="restoreVM"]').vm.$emit('update:value', true);
expect(savedValue(wrapper).shutdownVMOnMigrationFailure).toBe(true);
expect(savedValue(wrapper).restoreVM).toBe(true);
});
it('should name the radio groups for screen readers', () => {
const wrapper = mountConfig(undefined, true);
expect(wrapper.findComponent('[name="restoreVM"]').attributes('aria-label')).toBe('harvester.setting.upgrade.restoreVM');
expect(wrapper.findComponent('[name="shutdownVMOnMigrationFailure"]').attributes('aria-label')).toBe('harvester.setting.upgrade.shutdownVMOnMigrationFailure');
});
it('should hide the control and not add the field on clusters without the feature', () => {
const wrapper = mountConfig(undefined, false);
expect(savedValue(wrapper)).not.toHaveProperty('shutdownVMOnMigrationFailure');
expect(wrapper.findComponent('[name="shutdownVMOnMigrationFailure"]').exists()).toBe(false);
});
it('should keep a field set outside the UI on clusters without the feature', () => {
const wrapper = mountConfig({ shutdownVMOnMigrationFailure: true }, false);
expect(savedValue(wrapper).shutdownVMOnMigrationFailure).toBe(true);
});
});
@@ -74,10 +74,6 @@ export default {
},
methods: {
// A method, as normalizeValue also runs in data(), before computed properties are available
shutdownVMOnMigrationFailureEnabled() {
return this.$store.getters['harvester-common/getFeatureEnabled']('shutdownVMOnMigrationFailure');
},
normalizeValue(obj) {
// handle nodeUpgradeOption.strategy
if (obj?.nodeUpgradeOption?.strategy?.mode === 'auto') {
@@ -111,9 +107,6 @@ export default {
if (typeof obj.restoreVM !== 'boolean') {
obj.restoreVM = false;
}
if (this.shutdownVMOnMigrationFailureEnabled() && typeof obj.shutdownVMOnMigrationFailure !== 'boolean') {
obj.shutdownVMOnMigrationFailure = false;
}
return obj;
},
@@ -186,24 +179,10 @@ export default {
v-model:value="parseDefaultValue.restoreVM"
class="mb-20"
name="restoreVM"
:aria-label="t('harvester.setting.upgrade.restoreVM')"
:options="[true, false]"
:labels="[t('generic.enabled'), t('generic.disabled')]"
@update:value="update"
/>
<div v-if="shutdownVMOnMigrationFailureEnabled()">
<label class="mb-5"><b>{{ t('harvester.setting.upgrade.shutdownVMOnMigrationFailure') }}</b></label>
<RadioGroup
v-model:value="parseDefaultValue.shutdownVMOnMigrationFailure"
class="mb-20"
name="shutdownVMOnMigrationFailure"
:aria-label="t('harvester.setting.upgrade.shutdownVMOnMigrationFailure')"
:mode="mode"
:options="[true, false]"
:labels="[t('generic.enabled'), t('generic.disabled')]"
@update:value="update"
/>
</div>
<div v-if="resumeUpgradePausedNodeEnabled">
<label class="mb-5"><b>{{ t('harvester.setting.upgrade.nodeUpgradeOption') }}</b></label>
<LabeledSelect
-2
View File
@@ -86,8 +86,6 @@ const FEATURE_FLAGS = {
'maintenanceModeConditions',
'maintenanceModeDrainTimeoutSetting',
'componentHealth',
'repositoryStorageClass',
'shutdownVMOnMigrationFailure',
],
};
@@ -47,7 +47,6 @@ export const HCI = {
OS_UPGRADE_IMAGE: 'harvesterhci.io/os-upgrade-image',
LATEST_UPGRADE: 'harvesterhci.io/latestUpgrade',
UPGRADE_STATE: 'harvesterhci.io/upgradeState',
UPGRADE_STORAGE_CLASS: 'harvesterhci.io/upgrade-storage-class',
REAY_MESSAGE: 'harvesterhci.io/read-message',
DYNAMIC_SSHKEYS_NAMES: 'harvesterhci.io/dynamic-ssh-key-names',
DYNAMIC_SSHKEYS_USERS: 'harvesterhci.io/dynamic-ssh-key-users',
@@ -1,12 +1,6 @@
import { readFileSync } from 'fs';
import { resolve } from 'path';
import { STORAGE_CLASS } from '@shell/config/types';
import VM_MIXIN from '@pkg/harvester/mixins/harvester-vm';
import HarvesterEditVM from '../index.vue';
const vmFormSource = readFileSync(resolve(__dirname, '../index.vue'), 'utf8');
const translations = readFileSync(resolve(__dirname, '../../../l10n/en-us.yaml'), 'utf8');
function saveWith(userScript) {
const buttonCb = jest.fn();
const form = {
@@ -26,106 +20,6 @@ function saveWith(userScript) {
}
describe('page: kubevirt.io.virtualmachine edit', () => {
it('shows the persistent state storage hint only when vmstate-persistence is missing', () => {
const hasVMStateStorageClass = HarvesterEditVM.computed.hasVMStateStorageClass;
const storageClasses = (storageClassNames) => ({
inStore: 'harvester',
$store: { getters: { 'harvester/all': (type) => type === STORAGE_CLASS ? storageClassNames.map((name) => ({ metadata: { name } })) : [] } },
});
expect(hasVMStateStorageClass.call(storageClasses([]))).toBe(false);
expect(hasVMStateStorageClass.call(storageClasses(['vmstate-persistence']))).toBe(true);
});
it('waits for StorageClasses before treating vmstate-persistence as unavailable', () => {
const vmStateStorageClassUnavailable = HarvesterEditVM.computed.vmStateStorageClassUnavailable;
expect(vmStateStorageClassUnavailable.call({ hasVMStateStorageClass: false, storageClassesLoaded: false })).toBe(false);
expect(vmStateStorageClassUnavailable.call({ hasVMStateStorageClass: false, storageClassesLoaded: true })).toBe(true);
expect(vmStateStorageClassUnavailable.call({ hasVMStateStorageClass: true, storageClassesLoaded: true })).toBe(false);
});
it('shows the persistent state storage banner outside view mode when vmstate-persistence is unavailable', () => {
const showPersistentStateStorageBanner = HarvesterEditVM.computed.showPersistentStateStorageBanner;
expect(showPersistentStateStorageBanner.call({ mode: 'create', vmStateStorageClassUnavailable: true })).toBe(true);
expect(showPersistentStateStorageBanner.call({ mode: 'edit', vmStateStorageClassUnavailable: true })).toBe(true);
expect(showPersistentStateStorageBanner.call({ mode: 'create', vmStateStorageClassUnavailable: false })).toBe(false);
expect(showPersistentStateStorageBanner.call({ mode: 'view', vmStateStorageClassUnavailable: true })).toBe(false);
});
it('blocks new persistent state without vmstate-persistence while allowing it to be turned off', () => {
const isPersistentStateControlDisabled = HarvesterEditVM.methods.isPersistentStateControlDisabled;
expect(isPersistentStateControlDisabled.call({ vmStateStorageClassUnavailable: false }, false)).toBe(false);
expect(isPersistentStateControlDisabled.call({ vmStateStorageClassUnavailable: true }, false)).toBe(true);
expect(isPersistentStateControlDisabled.call({ vmStateStorageClassUnavailable: true }, true)).toBe(false);
});
it('marks StorageClasses as loaded after the VM data fetch completes', async() => {
const form = { storageClassesLoaded: false };
const fetch = jest.spyOn(VM_MIXIN, 'fetch').mockImplementation().mockResolvedValue();
await HarvesterEditVM.fetch.call(form);
fetch.mockRestore();
expect(form.storageClassesLoaded).toBe(true);
});
it('links persistent state guidance to Storage Classes', () => {
const toStorageClass = HarvesterEditVM.computed.toStorageClass;
expect(toStorageClass.call({ $store: { getters: { clusterId: 'c-1' } } })).toStrictEqual({
name: 'harvester-c-cluster-resource',
params: { cluster: 'c-1', resource: 'harvesterhci.io.storage' },
});
});
it('describes creating the StorageClass without non-breaking spaces around guidance links', () => {
expect(translations).toContain('middle: or create the class on the');
expect(vmFormSource).not.toContain('&nbsp;');
});
it('clears persistent state selections only for create mode without vmstate-persistence', () => {
const clearPersistentState = HarvesterEditVM.methods.clearPersistentStateWithoutStorageClass;
const createForm = {
efiPersistentStateEnabled: true,
mode: 'create',
tpmPersistentStateEnabled: true,
vmStateStorageClassUnavailable: true,
};
clearPersistentState.call(createForm);
expect(createForm.tpmPersistentStateEnabled).toBe(false);
expect(createForm.efiPersistentStateEnabled).toBe(false);
const editForm = {
efiPersistentStateEnabled: true,
mode: 'edit',
tpmPersistentStateEnabled: true,
vmStateStorageClassUnavailable: true,
};
clearPersistentState.call(editForm);
expect(editForm.tpmPersistentStateEnabled).toBe(true);
expect(editForm.efiPersistentStateEnabled).toBe(true);
const storageClassForm = {
efiPersistentStateEnabled: true,
mode: 'create',
tpmPersistentStateEnabled: true,
vmStateStorageClassUnavailable: false,
};
clearPersistentState.call(storageClassForm);
expect(storageClassForm.tpmPersistentStateEnabled).toBe(true);
expect(storageClassForm.efiPersistentStateEnabled).toBe(true);
});
it('should stop the save when the cloud config is invalid', () => {
const { form, buttonCb } = saveWith('#cloud-config\nsome words\n');
@@ -20,7 +20,6 @@ import { clear } from '@shell/utils/array';
import { saferDump } from '@shell/utils/create-yaml';
import { exceptionToErrorsArray } from '@shell/utils/error';
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
import { INTERNAL_STORAGE_CLASS } from '../../config/types';
import { BEFORE_SAVE_HOOKS, AFTER_SAVE_HOOKS } from '@shell/mixins/child-hook';
import CreateEditView from '@shell/mixins/create-edit-view';
import { parseVolumeClaimTemplates } from '@pkg/utils/vm';
@@ -41,7 +40,6 @@ import Reserved from './VirtualMachineReserved';
import Filesystem from './VirtualMachineFilesystem';
import { Banner } from '@components/Banner';
import MessageLink from '@shell/components/MessageLink';
import { STORAGE_CLASS } from '@shell/config/types';
export default {
name: 'HarvesterEditVM',
@@ -91,11 +89,6 @@ export default {
},
},
async fetch() {
await VM_MIXIN.fetch.call(this);
this.storageClassesLoaded = true;
},
data() {
const cloneVM = clone(this.value);
const isRestartImmediately = this.value.actualState === 'Running';
@@ -118,27 +111,12 @@ export default {
hostname,
isRestartImmediately,
customizeDisplayName,
storageClassesLoaded: false,
};
},
computed: {
...mapGetters({ t: 'i18n/t' }),
hasVMStateStorageClass() {
const storageClasses = this.$store.getters[`${ this.inStore }/all`](STORAGE_CLASS) || [];
return storageClasses.some((storageClass) => storageClass.metadata?.name === INTERNAL_STORAGE_CLASS.VMSTATE_PERSISTENCE);
},
vmStateStorageClassUnavailable() {
return this.storageClassesLoaded && !this.hasVMStateStorageClass;
},
showPersistentStateStorageBanner() {
return this.mode !== 'view' && this.vmStateStorageClassUnavailable;
},
// VM display name is stored as an annotation; bind a dedicated input to it
// so we don't have to mutate metadata.name (which would break the k8s PUT).
displayName: {
@@ -157,13 +135,6 @@ export default {
};
},
toStorageClass() {
return {
name: 'harvester-c-cluster-resource',
params: { cluster: this.$store.getters['clusterId'], resource: HCI.STORAGE },
};
},
machineTypeOptions() {
return this.machineTypes.map((type) => {
if (!type) return { label: 'None', value: '' };
@@ -274,25 +245,6 @@ export default {
},
watch: {
hasVMStateStorageClass: {
handler() {
this.clearPersistentStateWithoutStorageClass();
},
immediate: true,
},
storageClassesLoaded() {
this.clearPersistentStateWithoutStorageClass();
},
tpmPersistentStateEnabled() {
this.clearPersistentStateWithoutStorageClass();
},
efiPersistentStateEnabled() {
this.clearPersistentStateWithoutStorageClass();
},
templateId: {
async handler(id, old) {
if (!id) {
@@ -415,17 +367,6 @@ export default {
},
methods: {
isPersistentStateControlDisabled(persistentStateEnabled) {
return this.vmStateStorageClassUnavailable && !persistentStateEnabled;
},
clearPersistentStateWithoutStorageClass() {
if (this.mode === 'create' && this.vmStateStorageClassUnavailable) {
this.tpmPersistentStateEnabled = false;
this.efiPersistentStateEnabled = false;
}
},
cancelAction() {
const { fromPage = HCI.VM } = this.$route?.query; // default back to VM list page
const cancelOverride = {
@@ -866,7 +807,6 @@ export default {
<Checkbox
v-if="value.tpmPersistentStateFeatureEnabled && tpmEnabled"
v-model:value="tpmPersistentStateEnabled"
:disabled="isPersistentStateControlDisabled(tpmPersistentStateEnabled)"
class="check"
type="checkbox"
:label="t('harvester.virtualMachine.systemOptions.tpmPersistentState')"
@@ -884,7 +824,6 @@ export default {
<Checkbox
v-if="value.efiPersistentStateFeatureEnabled && efiEnabled"
v-model:value="efiPersistentStateEnabled"
:disabled="isPersistentStateControlDisabled(efiPersistentStateEnabled)"
class="check"
type="checkbox"
:label="t('harvester.virtualMachine.systemOptions.efiPersistentState')"
@@ -901,22 +840,6 @@ export default {
/>
</div>
<Banner
v-if="showPersistentStateStorageBanner"
color="info"
>
<span>
{{ t('harvester.virtualMachine.systemOptions.persistentStateStorageClassUnavailable.prefix') }}
<router-link :to="to">
{{ t('harvester.virtualMachine.systemOptions.persistentStateStorageClassUnavailable.host') }}
</router-link>
{{ t('harvester.virtualMachine.systemOptions.persistentStateStorageClassUnavailable.middle') }}
<router-link :to="toStorageClass">
{{ t('harvester.virtualMachine.systemOptions.persistentStateStorageClassUnavailable.storageClass') }}
</router-link>{{ t('harvester.virtualMachine.systemOptions.persistentStateStorageClassUnavailable.suffix') }}
</span>
</Banner>
<Banner
v-if="showCpuPinningBanner"
:color="mode === 'create' ? 'info' : 'warning'"
-11
View File
@@ -829,12 +829,6 @@ harvester:
tpmPersistentState: TPM Persistent State
efiEnabled: Booting in EFI mode
efiPersistentState: EFI Persistent State
persistentStateStorageClassUnavailable:
prefix: Persistent TPM and EFI state require the vmstate-persistence StorageClass. Add a Longhorn disk on the
host: Hosts page
middle: or create the class on the
storageClass: Storage Classes page
suffix: .
secureBoot: Secure Boot
usbTip: Provides an absolute pointer device which often helps with getting a consistent mouse cursor position in VNC.
sshTitle: Add Public SSH Key
@@ -1279,10 +1273,6 @@ harvester:
currentVersion: CURRENT VERSION
versionLabel: AVAILABLE COMPATIBLE VERSIONS
enableLogging: Enable Logging
repositoryStorageClass: Upgrade Storage Class
repositoryStorageClassTooltip: Select the StorageClass for the temporary upgrade repository volume that stores the ISO during the upgrade.
repositoryStorageClassPlaceholder: Select a StorageClass
repositoryStorageClassNoOptions: No StorageClasses are available.
skipSingleReplicaDetachedVol: Skip checking single-replica detached volumes
upgradeNode: Upgrading Node
upgradeSysService: Upgrading System Service
@@ -1744,7 +1734,6 @@ harvester:
imagePreloadStrategy: Image Preload Strategy
nodeUpgradeOption: Node Upgrade Option
restoreVM: Restore VM
shutdownVMOnMigrationFailure: Shut Down VM on Migration Failure
strategy: Strategy
pauseNodes: Pause Nodes
strategyType: Strategy Type
@@ -1,175 +0,0 @@
import { shallowMount } from '@vue/test-utils';
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
import HarvesterAirgapUpgrade from '../index.vue';
function createForm(overrides = {}) {
const image = {
metadata: { annotations: {} },
spec: {
displayName: 'upgrade.iso',
url: 'https://example.com/upgrade.iso',
},
save: jest.fn(),
};
const imageResult = {
id: 'harvester-system/upgrade-image',
notifyGeneratedName: jest.fn(),
uploadImage: jest.fn().mockResolvedValue({}),
};
image.save.mockResolvedValue(imageResult);
return {
imageSource: 'new',
sourceType: 'upload',
storageClassName: 'fast',
repositoryStorageClassEnabled: true,
uploadImageId: '',
imageId: '',
imageValue: image,
value: {
metadata: { annotations: {} }, spec: {}, save: jest.fn().mockResolvedValue(), notifyGeneratedName: jest.fn()
},
canEnableLogging: false,
skipSingleReplicaDetachedVolFeatureEnabled: false,
skipSingleReplicaDetachedVol: false,
allOSImages: [],
errors: [],
file: {},
done: jest.fn(),
preprocessImageName: HarvesterAirgapUpgrade.methods.preprocessImageName,
$store: { getters: { 'i18n/t': (key) => key } },
...overrides,
};
}
describe('page: HarvesterAirgapUpgrade', () => {
it('uses the shared Upgrade Repository StorageClass selector', () => {
expect(HarvesterAirgapUpgrade.components.UpgradeRepositoryStorageClass).toBeDefined();
});
it('leaves the default empty when it is unavailable for upgrade repositories', async() => {
const form = {
storageClassName: 'previous',
initImageValue: jest.fn(),
$store: {
dispatch: jest.fn()
.mockResolvedValueOnce([])
.mockResolvedValueOnce([
{
name: 'lvm-local', isDefault: true, provisioner: 'lvm.driver.harvesterhci.io'
},
{ name: 'fast' }
])
.mockResolvedValueOnce({})
}
};
await HarvesterAirgapUpgrade.fetch.call(form);
expect(form.storageClassName).toBe('');
});
it('prevents file upload until an upgrade StorageClass is selected', () => {
const disableUploadButton = HarvesterAirgapUpgrade.computed.disableUploadButton;
expect(disableUploadButton.call({
sourceType: 'upload',
isUploading: false,
repositoryStorageClassEnabled: true,
storageClassName: ''
})).toBe(true);
});
it('unlocks the StorageClass selector after switching an uploaded image to URL', async() => {
const wrapper = shallowMount(HarvesterAirgapUpgrade, {
global: {
mocks: {
$store: {
getters: {
'harvester-common/getFeatureEnabled': (feature) => feature === 'repositoryStorageClass',
'harvester/all': () => [],
'harvester/schemaFor': () => false,
},
dispatch: jest.fn().mockResolvedValue({
metadata: { annotations: {} },
spec: {
checksum: '', displayName: '', sourceType: 'upload', url: ''
},
}),
},
t: (key) => key,
},
stubs: {
CruResource: { template: '<div><slot /></div>' },
UpgradeRepositoryStorageClass: {
props: ['disabled'],
template: '<div data-testid="storage-class" :data-disabled="disabled" />',
},
},
},
});
await wrapper.setData({
value: {},
imageValue: {
spec: {
checksum: '', displayName: '', sourceType: 'upload', url: ''
},
remove: jest.fn().mockResolvedValue(),
},
sourceType: 'upload',
uploadController: { abort: jest.fn() },
uploadImageId: 'harvester-system/upgrade-image',
});
expect(wrapper.find('[data-testid="storage-class"]').attributes('data-disabled')).toBe('true');
await wrapper.setData({ sourceType: 'download' });
expect(wrapper.find('[data-testid="storage-class"]').attributes('data-disabled')).toBe('false');
});
it('saves an uploaded upgrade image on the selected StorageClass', async() => {
const form = createForm();
await HarvesterAirgapUpgrade.methods.uploadFile.call(form, { name: 'upgrade.iso' });
expect(form.imageValue.spec.targetStorageClassName).toBe('fast');
expect(form.uploadImageId).toBe('harvester-system/upgrade-image');
});
it('saves a downloaded upgrade image on the selected StorageClass', async() => {
const form = createForm({ sourceType: 'download' });
await HarvesterAirgapUpgrade.methods.save.call(form, jest.fn());
expect(form.imageValue.spec.targetStorageClassName).toBe('fast');
});
it('keeps the legacy StorageClass when the feature is disabled', async() => {
const form = createForm({ repositoryStorageClassEnabled: false });
await HarvesterAirgapUpgrade.methods.uploadFile.call(form, { name: 'upgrade.iso' });
expect(form.imageValue.spec.targetStorageClassName).toBe('longhorn-static');
});
it('does not change the StorageClass of an existing image', async() => {
const form = createForm({
imageSource: 'exist',
imageId: 'harvester-system/existing-image',
});
form.imageValue.spec.targetStorageClassName = 'existing-class';
await HarvesterAirgapUpgrade.methods.save.call(form, jest.fn());
expect(form.imageValue.spec.targetStorageClassName).toBe('existing-class');
});
it('does not add an Upgrade StorageClass annotation when the image selects the class', async() => {
const form = createForm({ uploadImageId: 'harvester-system/upgrade-image' });
await HarvesterAirgapUpgrade.methods.save.call(form, jest.fn());
expect(form.value.metadata.annotations[HCI_ANNOTATIONS.UPGRADE_STORAGE_CLASS]).toBeUndefined();
});
});
@@ -11,8 +11,6 @@ import { HCI } from '../../../../types';
import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../../../../config/harvester';
import ImagePercentageBar from '@shell/components/formatter/ImagePercentageBar';
import { Banner } from '@components/Banner';
import { STORAGE_CLASS } from '@shell/config/types';
import UpgradeRepositoryStorageClass, { getUpgradeRepositoryStorageClassDefault } from '../../../../components/UpgradeRepositoryStorageClass';
import isEmpty from 'lodash/isEmpty';
const IMAGE_METHOD = {
@@ -27,18 +25,13 @@ const UPLOAD = 'upload';
export default {
name: 'HarvesterAirgapUpgrade',
components: {
Checkbox, CruResource, LabeledSelect, LabeledInput, RadioGroup, UpgradeInfo, UpgradeRepositoryStorageClass, ImagePercentageBar, Banner
Checkbox, CruResource, LabeledSelect, LabeledInput, RadioGroup, UpgradeInfo, ImagePercentageBar, Banner
},
inheritAttrs: false,
async fetch() {
const [, storageClasses] = await Promise.all([
this.$store.dispatch('harvester/findAll', { type: HCI.IMAGE }),
this.$store.dispatch('harvester/findAll', { type: STORAGE_CLASS })
]);
this.storageClassName = getUpgradeRepositoryStorageClassDefault(storageClasses);
await this.$store.dispatch('harvester/findAll', { type: HCI.IMAGE });
const value = await this.$store.dispatch('harvester/create', {
type: HCI.UPGRADE,
@@ -72,7 +65,6 @@ export default {
uploadResult: null,
imageValue: null,
enableLogging: true,
storageClassName: '',
IMAGE_METHOD,
skipSingleReplicaDetachedVol: false,
errors: [],
@@ -130,18 +122,6 @@ export default {
return this.$store.getters['harvester/schemaFor'](HCI.UPGRADE_LOG);
},
storageClasses() {
return this.$store.getters['harvester/all'](STORAGE_CLASS) || [];
},
canSubmitUpgrade() {
return this.enableUpgrade && (!this.repositoryStorageClassEnabled || !this.createNewImage || !!this.storageClassName);
},
repositoryStorageClassEnabled() {
return this.$store.getters['harvester-common/getFeatureEnabled']('repositoryStorageClass');
},
uploadProgress() {
const image = this.$store.getters['harvester/byId'](HCI.IMAGE, this.imageValue.id);
@@ -185,7 +165,7 @@ export default {
},
disableUploadButton() {
return this.sourceType === UPLOAD && (this.isUploading || (this.repositoryStorageClassEnabled && !this.storageClassName));
return this.sourceType === UPLOAD && this.isUploading;
},
},
@@ -249,7 +229,7 @@ export default {
}
this.imageValue.spec.sourceType = DOWNLOAD;
this.imageValue.spec.targetStorageClassName = this.repositoryStorageClassEnabled ? this.storageClassName : 'longhorn-static';
this.imageValue.spec.targetStorageClassName = 'longhorn-static';
res = await this.imageValue.save();
res.notifyGeneratedName?.();
@@ -271,10 +251,7 @@ export default {
this.value.spec.logEnabled = this.enableLogging;
}
if (this.skipSingleReplicaDetachedVolFeatureEnabled) {
this.value.metadata.annotations = {
...this.value.metadata.annotations,
[HCI_ANNOTATIONS.SKIP_SINGLE_REPLICA_DETACHED_VOL]: JSON.stringify(this.skipSingleReplicaDetachedVol)
};
this.value.metadata.annotations = { [HCI_ANNOTATIONS.SKIP_SINGLE_REPLICA_DETACHED_VOL]: JSON.stringify(this.skipSingleReplicaDetachedVol) };
}
await this.value.save();
this.value.notifyGeneratedName?.();
@@ -311,7 +288,7 @@ export default {
this.imageValue.spec.url = '';
try {
this.imageValue.spec.targetStorageClassName = this.repositoryStorageClassEnabled ? this.storageClassName : 'longhorn-static';
this.imageValue.spec.targetStorageClassName = 'longhorn-static';
const res = await this.imageValue.save();
@@ -377,10 +354,6 @@ export default {
watch: {
async sourceType(neu) {
if (neu === DOWNLOAD) {
this.uploadImageId = '';
}
if (neu === DOWNLOAD && this.imageValue && this.uploadController) {
if (this.uploadController) {
this.uploadController.abort();
@@ -439,7 +412,7 @@ export default {
:errors="errors"
:can-yaml="false"
finish-button-mode="upgrade"
:validation-passed="canSubmitUpgrade"
:validation-passed="enableUpgrade"
:cancel-event="true"
@finish="save"
@cancel="done"
@@ -508,14 +481,6 @@ export default {
required
/>
<UpgradeRepositoryStorageClass
v-if="repositoryStorageClassEnabled"
v-model:value="storageClassName"
class="mb-20"
:disabled="uploadImageId !== ''"
:storage-classes="storageClasses"
/>
<LabeledInput
v-model:value="imageValue.spec.checksum"
class="mb-10"
@@ -21,11 +21,6 @@ describe('featureEnabled', () => {
expect(featureEnabled('vncPreserveSession', 'v1.7.0')).toBe(true);
});
it('should enable repositoryStorageClass only from Harvester v1.10.0', () => {
expect(featureEnabled('repositoryStorageClass', 'v1.9.1')).toBe(false);
expect(featureEnabled('repositoryStorageClass', 'v1.10.0')).toBe(true);
});
it('should return false for unknown features', () => {
expect(featureEnabled('doesNotExist', 'v1.8.0')).toBe(false);
});
+136 -572
View File
File diff suppressed because it is too large Load Diff