Latest changes from Harvester master - e6796a6fc0cffe03f47f6081c09469d59b97faf9

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
This commit is contained in:
Francesco Torchia
2024-11-12 11:50:33 +01:00
parent 78ca1e2f49
commit 9a7ca75b74
10 changed files with 93 additions and 63 deletions
@@ -259,7 +259,7 @@ export default {
},
isLonghornV2(volume) {
return volume?.pvc?.storageClass?.isLonghornV2;
return volume?.pvc?.isLonghornV2 || volume?.pvc?.storageClass?.isLonghornV2;
}
},
};
@@ -117,7 +117,7 @@ export default {
},
isLonghornV2() {
return this.value.pvc?.storageClass?.isLonghornV2;
return this.value.pvc?.isLonghornV2 || this.value.pvc?.storageClass?.isLonghornV2;
}
},
@@ -11,7 +11,7 @@ import { _VIEW } from '@shell/config/query-params';
import LabelValue from '@shell/components/LabelValue';
import { ucFirst } from '@shell/utils/string';
import { LVM_DRIVER } from '../../../../models/harvester/storage.k8s.io.storageclass';
import { DATA_ENGINE_V2 } from '../../../../edit/harvesterhci.io.storage/index.vue';
import { DATA_ENGINE_V2 } from '../../../../models/harvester/persistentvolumeclaim';
export default {
name: 'HarvesterEditVolume',
@@ -105,7 +105,7 @@ export default {
},
isLonghornV2() {
return this.value.pvc?.storageClass?.isLonghornV2;
return this.value.pvc?.isLonghornV2 || this.value.pvc?.storageClass?.isLonghornV2;
}
},
@@ -113,11 +113,7 @@ export default {
'value.storageClassName': {
immediate: true,
handler(neu) {
const storageClass = this.storageClasses.find((sc) => sc.name === neu);
const provisioner = storageClass?.provisioner;
const engine = storageClass?.parameters?.dataEngine;
this.value.accessMode = provisioner === LVM_DRIVER || engine === DATA_ENGINE_V2 ? 'ReadWriteOnce' : 'ReadWriteMany';
this.value.accessMode = this.getAccessMode(neu);
}
},
@@ -149,6 +145,18 @@ export default {
},
methods: {
getAccessMode(storageClassName) {
const storageClass = this.storageClasses.find((sc) => sc.name === storageClassName);
let readWriteOnce = this.value.pvc?.isLvm || this.value.pvc?.isLonghornV2;
if (storageClass) {
readWriteOnce = storageClass.provisioner === LVM_DRIVER || storageClass.parameters?.dataEngine === DATA_ENGINE_V2;
}
return readWriteOnce ? 'ReadWriteOnce' : 'ReadWriteMany';
},
update() {
this.$emit('update');
},