mirror of
https://github.com/harvester/harvester-ui-extension.git
synced 2025-12-13 21:21:44 +00:00
* add volume mode option for non-longhorn volume Signed-off-by: Andy Lee <andy.lee@suse.com> * fix default storage class in create VM page Signed-off-by: Andy Lee <andy.lee@suse.com> --------- Signed-off-by: Andy Lee <andy.lee@suse.com> (cherry picked from commit 9343813ace09bc3ba409c300745fa307ebf31cbd) Co-authored-by: Andy Lee <andy.lee@suse.com>
This commit is contained in:
parent
de755a662a
commit
10d159e2c7
@ -7,8 +7,7 @@ import UnitInput from '@shell/components/form/UnitInput';
|
||||
import { LabeledInput } from '@components/Form/LabeledInput';
|
||||
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
||||
import ModalWithCard from '@shell/components/ModalWithCard';
|
||||
|
||||
import { PVC } from '@shell/config/types';
|
||||
import { PVC, STORAGE_CLASS } from '@shell/config/types';
|
||||
import { clone } from '@shell/utils/object';
|
||||
import { ucFirst, randomStr } from '@shell/utils/string';
|
||||
import { removeObject } from '@shell/utils/array';
|
||||
@ -117,6 +116,12 @@ export default {
|
||||
return this.mode === _CREATE;
|
||||
},
|
||||
|
||||
defaultStorageClass() {
|
||||
const defaultStorage = this.$store.getters['harvester/all'](STORAGE_CLASS).find((sc) => sc.isDefault);
|
||||
|
||||
return defaultStorage;
|
||||
},
|
||||
|
||||
showVolumeTip() {
|
||||
const imageName = this.getImageDisplayName(this.rows[0]?.image);
|
||||
|
||||
|
||||
@ -13,6 +13,7 @@ import { ucFirst } from '@shell/utils/string';
|
||||
import { LVM_DRIVER } from '../../../../models/harvester/storage.k8s.io.storageclass';
|
||||
import { DATA_ENGINE_V2 } from '../../../../models/harvester/persistentvolumeclaim';
|
||||
import { GIBIBYTE } from '../../../../utils/unit';
|
||||
import { VOLUME_MODE } from '@pkg/harvester/config/types';
|
||||
|
||||
export default {
|
||||
name: 'HarvesterEditVolume',
|
||||
@ -71,6 +72,10 @@ export default {
|
||||
return this.$store.getters['harvester-common/getFeatureEnabled']('longhornV2LVMSupport');
|
||||
},
|
||||
|
||||
thirdPartyStorageClassEnabled() {
|
||||
return this.$store.getters['harvester-common/getFeatureEnabled']('thirdPartyStorage');
|
||||
},
|
||||
|
||||
encryptionValue() {
|
||||
return ucFirst(String(this.value.isEncrypted));
|
||||
},
|
||||
@ -91,6 +96,18 @@ export default {
|
||||
return allPVCs.find((P) => P.id === `${ this.namespace }/${ this.value.volumeName }`);
|
||||
},
|
||||
|
||||
showVolumeMode() {
|
||||
if (!this.thirdPartyStorageClassEnabled || !!this.value?.storageClassName === false) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (this.isLonghornStorageClass) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
},
|
||||
|
||||
isDisabled() {
|
||||
return !this.value.newCreateId && this.isEdit && this.isVirtualType;
|
||||
},
|
||||
@ -112,7 +129,17 @@ export default {
|
||||
|
||||
isLonghornV2() {
|
||||
return this.value.pvc?.isLonghornV2 || this.value.pvc?.storageClass?.isLonghornV2;
|
||||
}
|
||||
},
|
||||
|
||||
isLonghornStorageClass() {
|
||||
const selectedSC = this.storageClasses.find((sc) => sc.name === this.value?.storageClassName) || {};
|
||||
|
||||
return selectedSC && selectedSC.isLonghorn;
|
||||
},
|
||||
|
||||
volumeModeOptions() {
|
||||
return Object.values(VOLUME_MODE);
|
||||
},
|
||||
},
|
||||
|
||||
watch: {
|
||||
@ -120,6 +147,8 @@ export default {
|
||||
immediate: true,
|
||||
handler(neu) {
|
||||
this.value.accessMode = this.getAccessMode(neu);
|
||||
this.value.volumeMode = this.getVolumeMode(neu, this.value.volumeMode);
|
||||
this.update();
|
||||
}
|
||||
},
|
||||
|
||||
@ -151,6 +180,20 @@ export default {
|
||||
},
|
||||
|
||||
methods: {
|
||||
getVolumeMode(storageClassName, originalVolumeMode) {
|
||||
if (!this.thirdPartyStorageClassEnabled) {
|
||||
return VOLUME_MODE.BLOCK;
|
||||
}
|
||||
const storageClass = this.storageClasses.find((sc) => sc.name === storageClassName);
|
||||
|
||||
// longhorn v1, v2 use block volumeMode
|
||||
if (storageClass && storageClass.isLonghorn) {
|
||||
return VOLUME_MODE.BLOCK;
|
||||
}
|
||||
|
||||
return originalVolumeMode;
|
||||
},
|
||||
|
||||
getAccessMode(storageClassName) {
|
||||
if (!this.longhornV2LVMSupport) {
|
||||
return 'ReadWriteMany';
|
||||
@ -286,6 +329,29 @@ export default {
|
||||
/>
|
||||
</InputOrDisplay>
|
||||
</div>
|
||||
<div
|
||||
v-if="showVolumeMode"
|
||||
data-testid="input-volume-mode"
|
||||
class="col span-6"
|
||||
>
|
||||
<InputOrDisplay
|
||||
:name="t('harvester.volume.volumeMode')"
|
||||
:value="value.volumeMode"
|
||||
:mode="mode"
|
||||
>
|
||||
<LabeledSelect
|
||||
v-model:value="value.volumeMode"
|
||||
:label="t('harvester.volume.volumeMode')"
|
||||
:mode="mode"
|
||||
:options="volumeModeOptions"
|
||||
:disabled="isEdit"
|
||||
required
|
||||
@update:value="update"
|
||||
/>
|
||||
</InputOrDisplay>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-20">
|
||||
<div
|
||||
v-if="value.volumeEncryptionFeatureEnabled && isView"
|
||||
class="col span-6"
|
||||
@ -295,11 +361,9 @@ export default {
|
||||
:value="encryptionValue"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-20">
|
||||
<div
|
||||
v-if="value.volumeBackups && isView"
|
||||
class="col span-3"
|
||||
class="col span-6"
|
||||
>
|
||||
<LabelValue
|
||||
:name="t('harvester.virtualMachine.volume.readyToUse')"
|
||||
|
||||
@ -245,12 +245,6 @@ export default {
|
||||
});
|
||||
},
|
||||
|
||||
defaultStorageClass() {
|
||||
const defaultStorage = this.$store.getters[`${ this.inStore }/all`](STORAGE_CLASS).find( (O) => O.isDefault);
|
||||
|
||||
return defaultStorage;
|
||||
},
|
||||
|
||||
storageClassSetting() {
|
||||
try {
|
||||
const storageClassValue = this.$store.getters[`${ this.inStore }/all`](HCI.SETTING).find( (O) => O.id === HCI_SETTING.DEFAULT_STORAGE_CLASS)?.value;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user