mirror of
https://github.com/harvester/harvester-ui-extension.git
synced 2026-10-06 22:26:05 +08:00
Compare commits
38
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5e3f12de35 | ||
|
|
f115261889 | ||
|
|
5985913f5e | ||
|
|
661ab995f6 | ||
|
|
d3f63df883 | ||
|
|
44ef9195eb | ||
|
|
b18aebbbd4 | ||
|
|
d2db23d69a | ||
|
|
55918232a6 | ||
|
|
ce2adbdc3b | ||
|
|
ae65037083 | ||
|
|
b4ea7c8f98 | ||
|
|
836b04f222 | ||
|
|
0908c7fc6b | ||
|
|
b34d618c7c | ||
|
|
8945b9f158 | ||
|
|
c5af2b576b | ||
|
|
45872cef3b | ||
|
|
3e5ee422ce | ||
|
|
75202a9e55 | ||
|
|
5f5ce291fb | ||
|
|
a27e38fc81 | ||
|
|
89e1484884 | ||
|
|
eacca055c7 | ||
|
|
56c1738055 | ||
|
|
8f4b335cae | ||
|
|
91232beffc | ||
|
|
09e8946cc3 | ||
|
|
e70c684382 | ||
|
|
1446aac168 | ||
|
|
8e65274b0c | ||
|
|
e5432210b9 | ||
|
|
af52df0ba0 | ||
|
|
e5a1929ac5 | ||
|
|
9de065a5c9 | ||
|
|
cd933bdbf8 | ||
|
|
5fe642a42d | ||
|
|
18c66083ab |
@@ -33,7 +33,7 @@ module.exports = {
|
|||||||
'subject-full-stop': [2, 'never', '.'],
|
'subject-full-stop': [2, 'never', '.'],
|
||||||
'subject-max-length': [0, 'never'],
|
'subject-max-length': [0, 'never'],
|
||||||
'body-leading-blank': [2, 'always'],
|
'body-leading-blank': [2, 'always'],
|
||||||
'body-max-line-length': [2, 'always', 100],
|
'body-max-line-length': [0, 'always', 100],
|
||||||
'footer-leading-blank': [2, 'always'],
|
'footer-leading-blank': [2, 'always'],
|
||||||
'footer-max-line-length': [2, 'always', 100],
|
'footer-max-line-length': [2, 'always', 100],
|
||||||
},
|
},
|
||||||
|
|||||||
+6
-6
@@ -6,8 +6,8 @@
|
|||||||
"node": ">=24.0.0"
|
"node": ">=24.0.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/plugin-transform-class-static-block": "7.28.6",
|
"@babel/plugin-transform-class-static-block": "7.29.7",
|
||||||
"@rancher/shell": "3.0.12-rc.1",
|
"@rancher/shell": "3.0.12-rc.3",
|
||||||
"@vue-flow/background": "^1.3.0",
|
"@vue-flow/background": "^1.3.0",
|
||||||
"@vue-flow/controls": "^1.1.1",
|
"@vue-flow/controls": "^1.1.1",
|
||||||
"@vue-flow/core": "^1.33.5",
|
"@vue-flow/core": "^1.33.5",
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
"yaml": "^2.5.1"
|
"yaml": "^2.5.1"
|
||||||
},
|
},
|
||||||
"resolutions": {
|
"resolutions": {
|
||||||
"@types/node": "25.6.0",
|
"@types/node": "25.9.2",
|
||||||
"cronstrue": "2.59.0",
|
"cronstrue": "2.59.0",
|
||||||
"d3-color": "3.1.0",
|
"d3-color": "3.1.0",
|
||||||
"ejs": "3.1.10",
|
"ejs": "3.1.10",
|
||||||
@@ -33,9 +33,9 @@
|
|||||||
"merge": "2.1.1",
|
"merge": "2.1.1",
|
||||||
"node-forge": "1.4.0",
|
"node-forge": "1.4.0",
|
||||||
"nth-check": "2.1.1",
|
"nth-check": "2.1.1",
|
||||||
"qs": "6.15.1",
|
"qs": "6.15.2",
|
||||||
"roarr": "7.21.4",
|
"roarr": "7.21.5",
|
||||||
"semver": "7.7.4",
|
"semver": "7.8.2",
|
||||||
"@vue/cli-service/html-webpack-plugin": "^5.0.0"
|
"@vue/cli-service/html-webpack-plugin": "^5.0.0"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -0,0 +1,186 @@
|
|||||||
|
<script>
|
||||||
|
import { Banner } from '@components/Banner';
|
||||||
|
import MatchExpressions from '@shell/components/form/MatchExpressions';
|
||||||
|
import ResourceTable from '@shell/components/ResourceTable';
|
||||||
|
import { _EDIT } from '@shell/config/query-params';
|
||||||
|
import { convert, simplify, matching as selectorMatching } from '@shell/utils/selector';
|
||||||
|
import throttle from 'lodash/throttle';
|
||||||
|
import { NODE } from '@shell/config/types';
|
||||||
|
import { NAME, AGE } from '@shell/config/table-headers';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'HarvesterNodeSelector',
|
||||||
|
|
||||||
|
components: {
|
||||||
|
Banner,
|
||||||
|
MatchExpressions,
|
||||||
|
ResourceTable,
|
||||||
|
},
|
||||||
|
|
||||||
|
props: {
|
||||||
|
mode: {
|
||||||
|
type: String,
|
||||||
|
default: _EDIT,
|
||||||
|
},
|
||||||
|
value: {
|
||||||
|
type: Object,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
async fetch() {
|
||||||
|
this.updateMatchingResources();
|
||||||
|
},
|
||||||
|
|
||||||
|
data() {
|
||||||
|
const inStore = this.$store.getters['currentProduct'].inStore;
|
||||||
|
|
||||||
|
return {
|
||||||
|
matchingResources: {
|
||||||
|
matched: 0,
|
||||||
|
matches: [],
|
||||||
|
none: true,
|
||||||
|
sample: null,
|
||||||
|
total: 0,
|
||||||
|
},
|
||||||
|
tableHeaders: [
|
||||||
|
NAME,
|
||||||
|
{
|
||||||
|
name: 'host-ip',
|
||||||
|
labelKey: 'tableHeaders.hostIp',
|
||||||
|
search: ['internalIp'],
|
||||||
|
value: 'internalIp',
|
||||||
|
sort: ['internalIp'],
|
||||||
|
align: 'center',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'cpuManager',
|
||||||
|
labelKey: 'harvester.tableHeaders.cpuManager',
|
||||||
|
value: 'id',
|
||||||
|
formatter: 'HarvesterCPUPinning',
|
||||||
|
width: 150,
|
||||||
|
align: 'center',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'diskState',
|
||||||
|
labelKey: 'tableHeaders.diskState',
|
||||||
|
value: 'diskState',
|
||||||
|
formatter: 'HarvesterDiskState',
|
||||||
|
width: 130,
|
||||||
|
},
|
||||||
|
AGE,
|
||||||
|
],
|
||||||
|
inStore,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
watch: {
|
||||||
|
value: {
|
||||||
|
handler: 'updateMatchingResources',
|
||||||
|
deep: true,
|
||||||
|
},
|
||||||
|
allResourcesInScope() {
|
||||||
|
this.updateMatchingResources();
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
computed: {
|
||||||
|
schema() {
|
||||||
|
return this.$store.getters[`${ this.inStore }/schemaFor`](NODE);
|
||||||
|
},
|
||||||
|
|
||||||
|
selectorExpressions: {
|
||||||
|
get() {
|
||||||
|
return convert(
|
||||||
|
this.value.matchLabels || {},
|
||||||
|
this.value.matchExpressions || []
|
||||||
|
);
|
||||||
|
},
|
||||||
|
set(selectorExpressions) {
|
||||||
|
const { matchLabels, matchExpressions } = simplify(selectorExpressions);
|
||||||
|
|
||||||
|
this.value['matchLabels'] = matchLabels;
|
||||||
|
this.value['matchExpressions'] = matchExpressions;
|
||||||
|
this.updateMatchingResources();
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
allNodes() {
|
||||||
|
return this.$store.getters[`${ this.inStore }/all`](NODE) || [];
|
||||||
|
},
|
||||||
|
|
||||||
|
allResourcesInScope() {
|
||||||
|
return this.allNodes.length;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
methods: {
|
||||||
|
updateMatchingResources: throttle(function() {
|
||||||
|
const expressions = this.selectorExpressions;
|
||||||
|
const allNodes = this.allNodes;
|
||||||
|
|
||||||
|
// Empty expressions with no key = no match
|
||||||
|
const hasValidExpression = expressions.length > 0 && expressions.every((e) => !!e.key);
|
||||||
|
|
||||||
|
if (!hasValidExpression) {
|
||||||
|
this.matchingResources = {
|
||||||
|
matched: 0,
|
||||||
|
matches: [],
|
||||||
|
none: true,
|
||||||
|
sample: null,
|
||||||
|
total: allNodes.length,
|
||||||
|
};
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const matches = selectorMatching(allNodes, expressions, 'metadata.labels');
|
||||||
|
|
||||||
|
this.matchingResources = {
|
||||||
|
matched: matches.length,
|
||||||
|
matches,
|
||||||
|
none: matches.length === 0,
|
||||||
|
sample: matches[0]?.nameDisplay || null,
|
||||||
|
total: allNodes.length,
|
||||||
|
};
|
||||||
|
}, 100, { trailing: true })
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col span-12">
|
||||||
|
<MatchExpressions
|
||||||
|
v-model:value="selectorExpressions"
|
||||||
|
:mode="mode"
|
||||||
|
:show-remove="false"
|
||||||
|
:type="'node'"
|
||||||
|
:target-resources="allResourcesInScope"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col span-12">
|
||||||
|
<Banner :color="(matchingResources.none ? 'warning' : 'success')">
|
||||||
|
<span v-clean-html="t('generic.selectors.matchingResources.matchesSome', matchingResources)" />
|
||||||
|
</Banner>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col span-12">
|
||||||
|
<ResourceTable
|
||||||
|
:rows="matchingResources.matches"
|
||||||
|
:headers="tableHeaders"
|
||||||
|
key-field="id"
|
||||||
|
:table-actions="false"
|
||||||
|
:row-actions="false"
|
||||||
|
:schema="schema"
|
||||||
|
:groupable="false"
|
||||||
|
:search="false"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -58,11 +58,14 @@ export default {
|
|||||||
|
|
||||||
const url = `https://${ host }${ prefix }/${ PRODUCT_NAME }/c/${ params.cluster }/console/${ uid }/${ type }`;
|
const url = `https://${ host }${ prefix }/${ PRODUCT_NAME }/c/${ params.cluster }/console/${ uid }/${ type }`;
|
||||||
|
|
||||||
|
// Defer so v-select can finish closing the dropdown before the popup steals focus
|
||||||
|
this.$nextTick(() => {
|
||||||
window.open(
|
window.open(
|
||||||
url,
|
url,
|
||||||
'_blank',
|
'_blank',
|
||||||
`toolbars=0,width=${ screen.width - 200 },height=${ screen.height - 200 },left=0,top=0,noreferrer`
|
`toolbars=0,width=${ screen.width - 200 },height=${ screen.height - 200 },left=0,top=0,noreferrer`
|
||||||
);
|
);
|
||||||
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
isEmpty(o) {
|
isEmpty(o) {
|
||||||
|
|||||||
@@ -64,6 +64,9 @@ export default {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
parsedDefaultValue = JSON.parse(this.value.value);
|
parsedDefaultValue = JSON.parse(this.value.value);
|
||||||
|
if (typeof parsedDefaultValue.exclusiveVlan !== 'boolean') {
|
||||||
|
parsedDefaultValue.exclusiveVlan = false;
|
||||||
|
}
|
||||||
networkType = 'vlan' in parsedDefaultValue ? L2VLAN : UNTAGGED; // backend doesn't provide networkType, so we check if vlan is provided instead
|
networkType = 'vlan' in parsedDefaultValue ? L2VLAN : UNTAGGED; // backend doesn't provide networkType, so we check if vlan is provided instead
|
||||||
openVlan = true;
|
openVlan = true;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -72,7 +75,8 @@ export default {
|
|||||||
vlan: '',
|
vlan: '',
|
||||||
clusterNetwork: '',
|
clusterNetwork: '',
|
||||||
range: '',
|
range: '',
|
||||||
exclude: []
|
exclude: [],
|
||||||
|
exclusiveVlan: false
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
const exclude = parsedDefaultValue?.exclude?.toString().split(',') || [];
|
const exclude = parsedDefaultValue?.exclude?.toString().split(',') || [];
|
||||||
@@ -94,6 +98,10 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
computed: {
|
computed: {
|
||||||
|
showExclusiveVlan() {
|
||||||
|
return this.networkType === L2VLAN &&
|
||||||
|
Number(this.parsedDefaultValue.vlan) !== 1;
|
||||||
|
},
|
||||||
showVlan() {
|
showVlan() {
|
||||||
return this.networkType === L2VLAN;
|
return this.networkType === L2VLAN;
|
||||||
},
|
},
|
||||||
@@ -132,6 +140,18 @@ export default {
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
exclusiveVlanOptions() {
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
label: this.t('generic.enabled'),
|
||||||
|
value: true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: this.t('generic.disabled'),
|
||||||
|
value: false
|
||||||
|
}
|
||||||
|
];
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
watch: {
|
watch: {
|
||||||
@@ -174,7 +194,8 @@ export default {
|
|||||||
vlan: '',
|
vlan: '',
|
||||||
clusterNetwork: '',
|
clusterNetwork: '',
|
||||||
range: '',
|
range: '',
|
||||||
exclude: []
|
exclude: [],
|
||||||
|
exclusiveVlan: false
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -280,7 +301,15 @@ export default {
|
|||||||
label-key="harvester.setting.storageNetwork.vlan"
|
label-key="harvester.setting.storageNetwork.vlan"
|
||||||
@update:value="inputVlan"
|
@update:value="inputVlan"
|
||||||
/>
|
/>
|
||||||
|
<LabeledSelect
|
||||||
|
v-if="showExclusiveVlan"
|
||||||
|
v-model:value="parsedDefaultValue.exclusiveVlan"
|
||||||
|
class="mb-20"
|
||||||
|
:options="exclusiveVlanOptions"
|
||||||
|
:mode="mode"
|
||||||
|
label-key="harvester.setting.storageNetwork.exclusiveVlan"
|
||||||
|
@update:value="update"
|
||||||
|
/>
|
||||||
<LabeledSelect
|
<LabeledSelect
|
||||||
v-model:value="parsedDefaultValue.clusterNetwork"
|
v-model:value="parsedDefaultValue.clusterNetwork"
|
||||||
label-key="harvester.setting.storageNetwork.clusterNetwork"
|
label-key="harvester.setting.storageNetwork.clusterNetwork"
|
||||||
|
|||||||
@@ -66,10 +66,14 @@ const FEATURE_FLAGS = {
|
|||||||
'instanceManagerResourcesSetting',
|
'instanceManagerResourcesSetting',
|
||||||
'rwxNetworkSetting',
|
'rwxNetworkSetting',
|
||||||
'createPVCWithDataVolume',
|
'createPVCWithDataVolume',
|
||||||
'clusterPodSecurityStandardSetting'
|
'clusterPodSecurityStandardSetting',
|
||||||
],
|
],
|
||||||
'v1.8.1': [],
|
'v1.8.1': [],
|
||||||
'v1.9.0': [],
|
'v1.9.0': [
|
||||||
|
'supportFilesystem',
|
||||||
|
'disableResourcePooling',
|
||||||
|
'expandOnlineEncryptedVolume'
|
||||||
|
],
|
||||||
};
|
};
|
||||||
|
|
||||||
const generateFeatureFlags = () => {
|
const generateFeatureFlags = () => {
|
||||||
|
|||||||
@@ -237,6 +237,7 @@ export function init($plugin, store) {
|
|||||||
labelKey: 'harvester.addons.vmImport.labels.vmimport',
|
labelKey: 'harvester.addons.vmImport.labels.vmimport',
|
||||||
group: 'vmimport',
|
group: 'vmimport',
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
|
ifHaveType: HCI.VMIMPORT,
|
||||||
route: {
|
route: {
|
||||||
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
||||||
params: { resource: HCI.VMIMPORT }
|
params: { resource: HCI.VMIMPORT }
|
||||||
@@ -266,6 +267,7 @@ export function init($plugin, store) {
|
|||||||
labelKey: 'harvester.addons.vmImport.labels.vmimportSourceVMWare',
|
labelKey: 'harvester.addons.vmImport.labels.vmimportSourceVMWare',
|
||||||
group: 'vmimport',
|
group: 'vmimport',
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
|
ifHaveType: HCI.VMIMPORT_SOURCE_V,
|
||||||
route: {
|
route: {
|
||||||
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
||||||
params: { resource: HCI.VMIMPORT_SOURCE_V }
|
params: { resource: HCI.VMIMPORT_SOURCE_V }
|
||||||
@@ -295,6 +297,7 @@ export function init($plugin, store) {
|
|||||||
labelKey: 'harvester.addons.vmImport.labels.vmimportSourceOpenStack',
|
labelKey: 'harvester.addons.vmImport.labels.vmimportSourceOpenStack',
|
||||||
group: 'vmimport',
|
group: 'vmimport',
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
|
ifHaveType: HCI.VMIMPORT_SOURCE_O,
|
||||||
route: {
|
route: {
|
||||||
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
||||||
params: { resource: HCI.VMIMPORT_SOURCE_O }
|
params: { resource: HCI.VMIMPORT_SOURCE_O }
|
||||||
@@ -323,6 +326,7 @@ export function init($plugin, store) {
|
|||||||
labelKey: 'harvester.addons.vmImport.labels.vmimportSourceOVA',
|
labelKey: 'harvester.addons.vmImport.labels.vmimportSourceOVA',
|
||||||
group: 'vmimport',
|
group: 'vmimport',
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
|
ifHaveType: HCI.VMIMPORT_SOURCE_OVA,
|
||||||
route: {
|
route: {
|
||||||
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
||||||
params: { resource: HCI.VMIMPORT_SOURCE_OVA }
|
params: { resource: HCI.VMIMPORT_SOURCE_OVA }
|
||||||
@@ -484,6 +488,7 @@ export function init($plugin, store) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
virtualType({
|
virtualType({
|
||||||
|
ifHaveType: LOGGING.CLUSTER_FLOW,
|
||||||
labelKey: 'harvester.logging.clusterFlow.label',
|
labelKey: 'harvester.logging.clusterFlow.label',
|
||||||
name: HCI.CLUSTER_FLOW,
|
name: HCI.CLUSTER_FLOW,
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
@@ -507,6 +512,7 @@ export function init($plugin, store) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
virtualType({
|
virtualType({
|
||||||
|
ifHaveType: LOGGING.CLUSTER_OUTPUT,
|
||||||
labelKey: 'harvester.logging.clusterOutput.label',
|
labelKey: 'harvester.logging.clusterOutput.label',
|
||||||
name: HCI.CLUSTER_OUTPUT,
|
name: HCI.CLUSTER_OUTPUT,
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
@@ -530,6 +536,7 @@ export function init($plugin, store) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
virtualType({
|
virtualType({
|
||||||
|
ifHaveType: LOGGING.FLOW,
|
||||||
labelKey: 'harvester.logging.flow.label',
|
labelKey: 'harvester.logging.flow.label',
|
||||||
name: HCI.FLOW,
|
name: HCI.FLOW,
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
@@ -553,6 +560,7 @@ export function init($plugin, store) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
virtualType({
|
virtualType({
|
||||||
|
ifHaveType: LOGGING.OUTPUT,
|
||||||
labelKey: 'harvester.logging.output.label',
|
labelKey: 'harvester.logging.output.label',
|
||||||
name: HCI.OUTPUT,
|
name: HCI.OUTPUT,
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
@@ -573,6 +581,7 @@ export function init($plugin, store) {
|
|||||||
[
|
[
|
||||||
HCI.CLUSTER_NETWORK,
|
HCI.CLUSTER_NETWORK,
|
||||||
HCI.NETWORK_ATTACHMENT,
|
HCI.NETWORK_ATTACHMENT,
|
||||||
|
HCI.HOST_NETWORK_CONFIG,
|
||||||
HCI.VPC,
|
HCI.VPC,
|
||||||
NETWORK_POLICY,
|
NETWORK_POLICY,
|
||||||
HCI.LB,
|
HCI.LB,
|
||||||
@@ -1133,4 +1142,24 @@ export function init($plugin, store) {
|
|||||||
ifHaveType: HCI.IP_POOL,
|
ifHaveType: HCI.IP_POOL,
|
||||||
});
|
});
|
||||||
headers(HCI.IP_POOL, IP_POOL_HEADERS);
|
headers(HCI.IP_POOL, IP_POOL_HEADERS);
|
||||||
|
|
||||||
|
configureType(HCI.HOST_NETWORK_CONFIG, {
|
||||||
|
location: {
|
||||||
|
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
||||||
|
params: { resource: HCI.HOST_NETWORK_CONFIG }
|
||||||
|
},
|
||||||
|
canYaml: false,
|
||||||
|
});
|
||||||
|
virtualType({
|
||||||
|
labelKey: 'harvester.hostNetworkConfig.label',
|
||||||
|
name: HCI.HOST_NETWORK_CONFIG,
|
||||||
|
namespaced: false,
|
||||||
|
weight: 183,
|
||||||
|
route: {
|
||||||
|
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
||||||
|
params: { resource: HCI.HOST_NETWORK_CONFIG }
|
||||||
|
},
|
||||||
|
exact: false,
|
||||||
|
ifHaveType: HCI.HOST_NETWORK_CONFIG,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -88,6 +88,8 @@ export const CSI_SECRETS = {
|
|||||||
CSI_NODE_PUBLISH_SECRET_NAMESPACE: 'csi.storage.k8s.io/node-publish-secret-namespace',
|
CSI_NODE_PUBLISH_SECRET_NAMESPACE: 'csi.storage.k8s.io/node-publish-secret-namespace',
|
||||||
CSI_NODE_STAGE_SECRET_NAME: 'csi.storage.k8s.io/node-stage-secret-name',
|
CSI_NODE_STAGE_SECRET_NAME: 'csi.storage.k8s.io/node-stage-secret-name',
|
||||||
CSI_NODE_STAGE_SECRET_NAMESPACE: 'csi.storage.k8s.io/node-stage-secret-namespace',
|
CSI_NODE_STAGE_SECRET_NAMESPACE: 'csi.storage.k8s.io/node-stage-secret-namespace',
|
||||||
|
CSI_NODE_EXPAND_SECRET_NAME: 'csi.storage.k8s.io/node-expand-secret-name',
|
||||||
|
CSI_NODE_EXPAND_SECRET_NAMESPACE: 'csi.storage.k8s.io/node-expand-secret-namespace'
|
||||||
};
|
};
|
||||||
|
|
||||||
// Some harvester CRD type is not equal to model file name, define the mapping here
|
// Some harvester CRD type is not equal to model file name, define the mapping here
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ export const HCI = {
|
|||||||
NETWORK_TYPE: 'network.harvesterhci.io/type',
|
NETWORK_TYPE: 'network.harvesterhci.io/type',
|
||||||
VM_NAME: 'harvesterhci.io/vmName',
|
VM_NAME: 'harvesterhci.io/vmName',
|
||||||
VM_NAME_PREFIX: 'harvesterhci.io/vmNamePrefix',
|
VM_NAME_PREFIX: 'harvesterhci.io/vmNamePrefix',
|
||||||
|
VM_DISPLAY_NAME: 'harvesterhci.io/vmDisplayName',
|
||||||
VM_RESERVED_MEMORY: 'harvesterhci.io/reservedMemory',
|
VM_RESERVED_MEMORY: 'harvesterhci.io/reservedMemory',
|
||||||
MAINTENANCE_STATUS: 'harvesterhci.io/maintain-status',
|
MAINTENANCE_STATUS: 'harvesterhci.io/maintain-status',
|
||||||
HOST_CUSTOM_NAME: 'harvesterhci.io/host-custom-name',
|
HOST_CUSTOM_NAME: 'harvesterhci.io/host-custom-name',
|
||||||
|
|||||||
@@ -46,3 +46,9 @@ export const CDI_POPULATOR_KIND = {
|
|||||||
VOLUME_IMPORT_SOURCE: 'VolumeImportSource',
|
VOLUME_IMPORT_SOURCE: 'VolumeImportSource',
|
||||||
VOLUME_CLONE_SOURCE: 'VolumeCloneSource',
|
VOLUME_CLONE_SOURCE: 'VolumeCloneSource',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const FILESYSTEM_SOURCE_TYPE = {
|
||||||
|
CONFIGMAP: 'configmap',
|
||||||
|
SECRET: 'secret',
|
||||||
|
SERVICEACCOUNT: 'serviceaccount',
|
||||||
|
};
|
||||||
|
|||||||
@@ -27,15 +27,11 @@ export default {
|
|||||||
await allHash({
|
await allHash({
|
||||||
vms: this.$store.dispatch('harvester/findAll', { type: HCI.VM }),
|
vms: this.$store.dispatch('harvester/findAll', { type: HCI.VM }),
|
||||||
vmis: this.$store.dispatch('harvester/findAll', { type: HCI.VMI }),
|
vmis: this.$store.dispatch('harvester/findAll', { type: HCI.VMI }),
|
||||||
allClusterNetwork: this.$store.dispatch('harvester/findAll', { type: HCI.CLUSTER_NETWORK }),
|
vmims: this.$store.dispatch('harvester/findAll', { type: HCI.VMIM }),
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
computed: {
|
computed: {
|
||||||
allClusterNetwork() {
|
|
||||||
return this.$store.getters['harvester/all'](HCI.CLUSTER_NETWORK);
|
|
||||||
},
|
|
||||||
|
|
||||||
rows() {
|
rows() {
|
||||||
const vms = this.$store.getters['harvester/all'](HCI.VM);
|
const vms = this.$store.getters['harvester/all'](HCI.VM);
|
||||||
|
|
||||||
@@ -108,7 +104,6 @@ export default {
|
|||||||
<HarvesterVmState
|
<HarvesterVmState
|
||||||
class="vmstate"
|
class="vmstate"
|
||||||
:row="scope.row"
|
:row="scope.row"
|
||||||
:all-cluster-network="allClusterNetwork"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -98,9 +98,9 @@ export default {
|
|||||||
methods: {
|
methods: {
|
||||||
escapeHtml,
|
escapeHtml,
|
||||||
|
|
||||||
close() {
|
close(data) {
|
||||||
this.errors = [];
|
this.errors = [];
|
||||||
this.$emit('close');
|
this.$emit('close', data);
|
||||||
},
|
},
|
||||||
|
|
||||||
async apply(buttonDone) {
|
async apply(buttonDone) {
|
||||||
@@ -109,7 +109,7 @@ export default {
|
|||||||
await resource.doActionGrowl(this.modalData.action, {});
|
await resource.doActionGrowl(this.modalData.action, {});
|
||||||
}
|
}
|
||||||
buttonDone(true);
|
buttonDone(true);
|
||||||
this.close();
|
this.close({ performCallback: true, clearTableSelection: true });
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
this.errors = exceptionToErrorsArray(e);
|
this.errors = exceptionToErrorsArray(e);
|
||||||
buttonDone(false);
|
buttonDone(false);
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
<script>
|
<script>
|
||||||
import { mapGetters } from 'vuex';
|
import { mapGetters } from 'vuex';
|
||||||
|
import { Banner } from '@components/Banner';
|
||||||
import { Card } from '@components/Card';
|
import { Card } from '@components/Card';
|
||||||
|
import { Checkbox } from '@components/Form/Checkbox';
|
||||||
import AsyncButton from '@shell/components/AsyncButton';
|
import AsyncButton from '@shell/components/AsyncButton';
|
||||||
import { escapeHtml } from '@shell/utils/string';
|
import { escapeHtml } from '@shell/utils/string';
|
||||||
import { HCI } from '../types';
|
import { HCI } from '../types';
|
||||||
@@ -13,7 +15,9 @@ export default {
|
|||||||
|
|
||||||
components: {
|
components: {
|
||||||
AsyncButton,
|
AsyncButton,
|
||||||
|
Banner,
|
||||||
Card,
|
Card,
|
||||||
|
Checkbox,
|
||||||
},
|
},
|
||||||
|
|
||||||
props: {
|
props: {
|
||||||
@@ -24,10 +28,16 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
return {};
|
return { disableResourcePooling: false };
|
||||||
},
|
},
|
||||||
|
|
||||||
computed: { ...mapGetters({ t: 'i18n/t' }) },
|
computed: {
|
||||||
|
...mapGetters({ t: 'i18n/t' }),
|
||||||
|
|
||||||
|
disableResourcePoolingEnabled() {
|
||||||
|
return this.$store.getters['harvester-common/getFeatureEnabled']('disableResourcePooling');
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
close() {
|
close() {
|
||||||
@@ -54,7 +64,8 @@ export default {
|
|||||||
spec: {
|
spec: {
|
||||||
address: actionResource.status.address,
|
address: actionResource.status.address,
|
||||||
nodeName: actionResource.status.nodeName,
|
nodeName: actionResource.status.nodeName,
|
||||||
userName
|
userName,
|
||||||
|
disableResourcePooling: this.disableResourcePooling,
|
||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
|
|
||||||
@@ -85,7 +96,19 @@ export default {
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template #body>
|
<template #body>
|
||||||
|
<p class="mb-20">
|
||||||
{{ t('harvester.pci.enablePassthroughWarning') }}
|
{{ t('harvester.pci.enablePassthroughWarning') }}
|
||||||
|
</p>
|
||||||
|
<template v-if="disableResourcePoolingEnabled">
|
||||||
|
<Checkbox
|
||||||
|
v-model:value="disableResourcePooling"
|
||||||
|
label-key="harvester.pci.disableResourcePooling"
|
||||||
|
/>
|
||||||
|
<Banner
|
||||||
|
color="info"
|
||||||
|
:label="t('harvester.pci.disableResourcePoolingDescription')"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template #actions>
|
<template #actions>
|
||||||
|
|||||||
@@ -1,15 +1,12 @@
|
|||||||
<script>
|
<script>
|
||||||
import { mapGetters } from 'vuex';
|
import { mapGetters } from 'vuex';
|
||||||
|
|
||||||
import { NODE } from '@shell/config/types';
|
import { NODE } from '@shell/config/types';
|
||||||
import { exceptionToErrorsArray } from '@shell/utils/error';
|
import { exceptionToErrorsArray } from '@shell/utils/error';
|
||||||
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
|
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
|
||||||
|
|
||||||
import { Card } from '@components/Card';
|
import { Card } from '@components/Card';
|
||||||
import { Banner } from '@components/Banner';
|
import { Banner } from '@components/Banner';
|
||||||
import AsyncButton from '@shell/components/AsyncButton';
|
import AsyncButton from '@shell/components/AsyncButton';
|
||||||
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
||||||
import { HCI } from '../types';
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
emits: ['close'],
|
emits: ['close'],
|
||||||
@@ -62,28 +59,46 @@ export default {
|
|||||||
return this.resources[0];
|
return this.resources[0];
|
||||||
},
|
},
|
||||||
|
|
||||||
vmi() {
|
anyCpuPinning() {
|
||||||
const inStore = this.$store.getters['currentProduct'].inStore;
|
return this.resources.some((r) => r.isCpuPinning);
|
||||||
const vmiResources = this.$store.getters[`${ inStore }/all`](HCI.VMI);
|
},
|
||||||
const resource = vmiResources.find((VMI) => VMI.id === this.actionResource?.id) || null;
|
|
||||||
|
|
||||||
return resource;
|
vmsByNode() {
|
||||||
|
const groups = {};
|
||||||
|
|
||||||
|
for (const r of this.resources) {
|
||||||
|
const node = r.nodeName || '';
|
||||||
|
const name = r.nameDisplay || r.name || r.id;
|
||||||
|
|
||||||
|
if (!groups[node]) {
|
||||||
|
groups[node] = [];
|
||||||
|
}
|
||||||
|
groups[node].push(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Object.entries(groups).map(([node, vms]) => ({ node, vms })).sort((a, b) => a.node.localeCompare(b.node));
|
||||||
},
|
},
|
||||||
|
|
||||||
cpuPinningAlertMessage() {
|
cpuPinningAlertMessage() {
|
||||||
return this.t('harvester.virtualMachine.cpuPinning.migrationMessage');
|
return this.t('harvester.virtualMachine.cpuPinning.migrationMessage');
|
||||||
},
|
},
|
||||||
|
|
||||||
|
allVmsOnTargetNode() {
|
||||||
|
if (!this.nodeName) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.resources.every((r) => r.nodeName === this.nodeName);
|
||||||
|
},
|
||||||
|
|
||||||
nodeNameList() {
|
nodeNameList() {
|
||||||
const nodes = this.$store.getters['harvester/all'](NODE);
|
const nodes = this.$store.getters['harvester/all'](NODE);
|
||||||
|
|
||||||
return nodes.filter((n) => {
|
return nodes.filter((n) => {
|
||||||
const isNotSelfNode = !!this.availableNodes.includes(n.id);
|
|
||||||
const isNotWitnessNode = n.isEtcd !== 'true'; // do not allow to migrate to self node and witness node
|
const isNotWitnessNode = n.isEtcd !== 'true'; // do not allow to migrate to self node and witness node
|
||||||
const isCpuPinning = this.actionResource?.isCpuPinning;
|
const matchingCpuManagerConfig = !this.anyCpuPinning || n.isCPUManagerEnabled; // If cpu-pinning is enabled, filter-out non-enabled CPU manager nodes.
|
||||||
const matchingCpuManagerConfig = !isCpuPinning || n.isCPUManagerEnabled; // If cpu-pinning is enabled, filter-out non-enabled CPU manager nodes.
|
|
||||||
|
|
||||||
return isNotSelfNode && isNotWitnessNode && matchingCpuManagerConfig;
|
return isNotWitnessNode && matchingCpuManagerConfig;
|
||||||
}).map((n) => {
|
}).map((n) => {
|
||||||
let label = n?.metadata?.name;
|
let label = n?.metadata?.name;
|
||||||
const value = n?.metadata?.name;
|
const value = n?.metadata?.name;
|
||||||
@@ -102,10 +117,10 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
close() {
|
close(data) {
|
||||||
this.nodeName = '';
|
this.nodeName = '';
|
||||||
this.errors = [];
|
this.errors = [];
|
||||||
this.$emit('close');
|
this.$emit('close', data);
|
||||||
},
|
},
|
||||||
|
|
||||||
async apply(buttonDone) {
|
async apply(buttonDone) {
|
||||||
@@ -126,10 +141,32 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await this.actionResource.doAction('migrate', { nodeName: this.nodeName }, {}, false);
|
// Filter out VMs already running on the selected node
|
||||||
|
const toMigrate = this.resources.filter((r) => r.nodeName !== this.nodeName);
|
||||||
|
|
||||||
|
// await Promise.allSettled(toMigrate.map((r) => r.doAction('migrate', { nodeName: this.nodeName }, {}, false)));
|
||||||
|
// We want to show all migration errors if there are multiple VMs, so we use allSettled here and handle the results accordingly.
|
||||||
|
const results = await Promise.allSettled(toMigrate.map((r) => r.doAction('migrate', { nodeName: this.nodeName }, {}, false)));
|
||||||
|
|
||||||
|
const failedMigrations = results
|
||||||
|
.map((result, index) => ({ resource: toMigrate[index], result }))
|
||||||
|
.filter(({ result }) => result.status === 'rejected');
|
||||||
|
|
||||||
|
if (failedMigrations.length) {
|
||||||
|
this['errors'] = failedMigrations.flatMap(({ resource, result }) => {
|
||||||
|
const vmName = resource?.nameDisplay || resource?.name || resource?.metadata?.name || this.$store.getters['i18n/t']('generic.unknown');
|
||||||
|
const error = result.reason?.data || result.reason;
|
||||||
|
const messages = exceptionToErrorsArray(error);
|
||||||
|
|
||||||
|
return messages.map((message) => `${ vmName }: ${ message }`);
|
||||||
|
});
|
||||||
|
buttonDone(false);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
buttonDone(true);
|
buttonDone(true);
|
||||||
this.close();
|
this.close({ performCallback: true, clearTableSelection: true });
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
const error = err?.data || err;
|
const error = err?.data || err;
|
||||||
const message = exceptionToErrorsArray(error);
|
const message = exceptionToErrorsArray(error);
|
||||||
@@ -146,17 +183,35 @@ export default {
|
|||||||
<template>
|
<template>
|
||||||
<Card :show-highlight-border="false">
|
<Card :show-highlight-border="false">
|
||||||
<template #title>
|
<template #title>
|
||||||
{{ t('harvester.modal.migration.title') }}
|
{{ t('harvester.modal.migration.vmMigrationTitle', { count: resources.length }) }}
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template #body>
|
<template #body>
|
||||||
<Banner
|
<Banner
|
||||||
v-if="actionResource?.isCpuPinning"
|
v-if="anyCpuPinning"
|
||||||
color="warning"
|
color="warning"
|
||||||
:label="cpuPinningAlertMessage"
|
:label="cpuPinningAlertMessage"
|
||||||
/>
|
/>
|
||||||
|
<p>
|
||||||
|
{{ t('harvester.modal.migration.selectedVMs') }}
|
||||||
|
</p>
|
||||||
|
<ul class="vm-list">
|
||||||
|
<li
|
||||||
|
v-for="group in vmsByNode"
|
||||||
|
:key="group.node"
|
||||||
|
>
|
||||||
|
{{ group.node || t('harvester.modal.migration.unknownNode') }}: {{ group.vms.join(', ') }}
|
||||||
|
<span
|
||||||
|
v-if="nodeName && group.node === nodeName"
|
||||||
|
class="already-on-target"
|
||||||
|
>
|
||||||
|
({{ t('harvester.modal.migration.alreadyOnTarget') }})
|
||||||
|
</span>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
<LabeledSelect
|
<LabeledSelect
|
||||||
v-model:value="nodeName"
|
v-model:value="nodeName"
|
||||||
|
class="mt-15"
|
||||||
:label="t('harvester.modal.migration.fields.nodeName.label')"
|
:label="t('harvester.modal.migration.fields.nodeName.label')"
|
||||||
:placeholder="t('harvester.modal.migration.fields.nodeName.placeholder')"
|
:placeholder="t('harvester.modal.migration.fields.nodeName.placeholder')"
|
||||||
:options="nodeNameList"
|
:options="nodeNameList"
|
||||||
@@ -183,7 +238,7 @@ export default {
|
|||||||
|
|
||||||
<AsyncButton
|
<AsyncButton
|
||||||
mode="apply"
|
mode="apply"
|
||||||
:disabled="!nodeName"
|
:disabled="!nodeName || allVmsOnTargetNode"
|
||||||
@click="apply"
|
@click="apply"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -201,4 +256,16 @@ export default {
|
|||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.already-on-target {
|
||||||
|
color: var(--warning);
|
||||||
|
font-style: italic;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vm-list {
|
||||||
|
list-style: disc;
|
||||||
|
padding-left: 1.5em;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -3,8 +3,9 @@ import KeyValue from '@shell/components/form/KeyValue';
|
|||||||
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
||||||
import { LabeledInput } from '@components/Form/LabeledInput';
|
import { LabeledInput } from '@components/Form/LabeledInput';
|
||||||
import RadioGroup from '@components/Form/Radio/RadioGroup';
|
import RadioGroup from '@components/Form/Radio/RadioGroup';
|
||||||
|
import Checkbox from '@components/Form/Checkbox/Checkbox';
|
||||||
import { SECRET, LONGHORN } from '@shell/config/types';
|
import { SECRET, LONGHORN } from '@shell/config/types';
|
||||||
import { _CREATE, _VIEW } from '@shell/config/query-params';
|
import { _CREATE, _VIEW, _EDIT } from '@shell/config/query-params';
|
||||||
import { CSI_SECRETS } from '@pkg/harvester/config/harvester-map';
|
import { CSI_SECRETS } from '@pkg/harvester/config/harvester-map';
|
||||||
import { clone } from '@shell/utils/object';
|
import { clone } from '@shell/utils/object';
|
||||||
import { uniq } from '@shell/utils/array';
|
import { uniq } from '@shell/utils/array';
|
||||||
@@ -16,7 +17,9 @@ const {
|
|||||||
CSI_NODE_PUBLISH_SECRET_NAME,
|
CSI_NODE_PUBLISH_SECRET_NAME,
|
||||||
CSI_NODE_PUBLISH_SECRET_NAMESPACE,
|
CSI_NODE_PUBLISH_SECRET_NAMESPACE,
|
||||||
CSI_NODE_STAGE_SECRET_NAME,
|
CSI_NODE_STAGE_SECRET_NAME,
|
||||||
CSI_NODE_STAGE_SECRET_NAMESPACE
|
CSI_NODE_STAGE_SECRET_NAMESPACE,
|
||||||
|
CSI_NODE_EXPAND_SECRET_NAME,
|
||||||
|
CSI_NODE_EXPAND_SECRET_NAMESPACE
|
||||||
} = CSI_SECRETS;
|
} = CSI_SECRETS;
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@@ -27,6 +30,7 @@ export default {
|
|||||||
LabeledSelect,
|
LabeledSelect,
|
||||||
LabeledInput,
|
LabeledInput,
|
||||||
RadioGroup,
|
RadioGroup,
|
||||||
|
Checkbox,
|
||||||
},
|
},
|
||||||
|
|
||||||
props: {
|
props: {
|
||||||
@@ -57,7 +61,10 @@ export default {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
return { };
|
const hasExpandSecret = !!(this.value.parameters?.[CSI_NODE_EXPAND_SECRET_NAME] && this.value.parameters?.[CSI_NODE_EXPAND_SECRET_NAMESPACE]);
|
||||||
|
const volumeExpansionCheckBoxEnabled = this.realMode === _CREATE ? true : hasExpandSecret;
|
||||||
|
|
||||||
|
return { volumeExpansionCheckBoxEnabled };
|
||||||
},
|
},
|
||||||
|
|
||||||
computed: {
|
computed: {
|
||||||
@@ -98,8 +105,11 @@ export default {
|
|||||||
}, []);
|
}, []);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
isEdit() {
|
||||||
|
return this.realMode === _EDIT;
|
||||||
|
},
|
||||||
isView() {
|
isView() {
|
||||||
return this.mode === _VIEW;
|
return this.realMode === _VIEW;
|
||||||
},
|
},
|
||||||
|
|
||||||
migratableOptions() {
|
migratableOptions() {
|
||||||
@@ -152,6 +162,10 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
enableOnlineExpansionVolumeEncryption() {
|
||||||
|
return this.value.expandOnlineEncryptedVolumeFeatureEnabled;
|
||||||
|
},
|
||||||
|
|
||||||
volumeEncryption: {
|
volumeEncryption: {
|
||||||
set(neu) {
|
set(neu) {
|
||||||
this.value['parameters'] = {
|
this.value['parameters'] = {
|
||||||
@@ -180,6 +194,11 @@ export default {
|
|||||||
set(selectedSecret) {
|
set(selectedSecret) {
|
||||||
const [namespace, name] = selectedSecret.split('/');
|
const [namespace, name] = selectedSecret.split('/');
|
||||||
|
|
||||||
|
const expandSecretParams = (this.enableOnlineExpansionVolumeEncryption && this.volumeExpansionCheckBoxEnabled) ? {
|
||||||
|
[CSI_NODE_EXPAND_SECRET_NAME]: name,
|
||||||
|
[CSI_NODE_EXPAND_SECRET_NAMESPACE]: namespace,
|
||||||
|
} : {};
|
||||||
|
|
||||||
this.value['parameters'] = {
|
this.value['parameters'] = {
|
||||||
...this.value.parameters,
|
...this.value.parameters,
|
||||||
[CSI_PROVISIONER_SECRET_NAME]: name,
|
[CSI_PROVISIONER_SECRET_NAME]: name,
|
||||||
@@ -187,7 +206,8 @@ export default {
|
|||||||
[CSI_NODE_STAGE_SECRET_NAME]: name,
|
[CSI_NODE_STAGE_SECRET_NAME]: name,
|
||||||
[CSI_PROVISIONER_SECRET_NAMESPACE]: namespace,
|
[CSI_PROVISIONER_SECRET_NAMESPACE]: namespace,
|
||||||
[CSI_NODE_PUBLISH_SECRET_NAMESPACE]: namespace,
|
[CSI_NODE_PUBLISH_SECRET_NAMESPACE]: namespace,
|
||||||
[CSI_NODE_STAGE_SECRET_NAMESPACE]: namespace
|
[CSI_NODE_STAGE_SECRET_NAMESPACE]: namespace,
|
||||||
|
...expandSecretParams,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -240,6 +260,32 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
watch: {
|
||||||
|
volumeExpansionCheckBoxEnabled(enabled) {
|
||||||
|
const currentSecret = this.secret;
|
||||||
|
|
||||||
|
if (!currentSecret) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const [namespace, name] = currentSecret.split('/');
|
||||||
|
|
||||||
|
if (enabled && this.enableOnlineExpansionVolumeEncryption) {
|
||||||
|
this.value['parameters'] = {
|
||||||
|
...this.value.parameters,
|
||||||
|
[CSI_NODE_EXPAND_SECRET_NAME]: name,
|
||||||
|
[CSI_NODE_EXPAND_SECRET_NAMESPACE]: namespace,
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
const params = { ...this.value.parameters };
|
||||||
|
|
||||||
|
delete params[CSI_NODE_EXPAND_SECRET_NAME];
|
||||||
|
delete params[CSI_NODE_EXPAND_SECRET_NAMESPACE];
|
||||||
|
this.value['parameters'] = params;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
@@ -337,6 +383,16 @@ export default {
|
|||||||
:mode="mode"
|
:mode="mode"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
<div
|
||||||
|
v-if="enableOnlineExpansionVolumeEncryption"
|
||||||
|
class="col span-6 flex items-center mt-20"
|
||||||
|
>
|
||||||
|
<Checkbox
|
||||||
|
v-model:value="volumeExpansionCheckBoxEnabled"
|
||||||
|
:label="t('harvester.storage.volumeExpansionCheckbox')"
|
||||||
|
:disabled="isEdit || isView"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<KeyValue
|
<KeyValue
|
||||||
|
|||||||
@@ -254,15 +254,24 @@ export default {
|
|||||||
v-if="restoreNewVm"
|
v-if="restoreNewVm"
|
||||||
v-model:value="restoreResource.spec.keepMacAddress"
|
v-model:value="restoreResource.spec.keepMacAddress"
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
|
class="check mb-20"
|
||||||
:label="t('harvester.backup.restore.keepMacAddress')"
|
:label="t('harvester.backup.restore.keepMacAddress')"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<LabeledSelect
|
<LabeledSelect
|
||||||
v-if="!restoreNewVm"
|
v-if="!restoreNewVm"
|
||||||
v-model:value="deletionPolicy"
|
v-model:value="deletionPolicy"
|
||||||
|
class="mb-20"
|
||||||
:label="t('harvester.backup.restore.deletePreviousVolumes')"
|
:label="t('harvester.backup.restore.deletePreviousVolumes')"
|
||||||
:options="deletionPolicyOption"
|
:options="deletionPolicyOption"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<Checkbox
|
||||||
|
v-model:value="restoreResource.spec.haltAfterRestore"
|
||||||
|
type="checkbox"
|
||||||
|
class="check mb-20"
|
||||||
|
:label="t('harvester.backup.restore.haltAfterRestore')"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Footer
|
<Footer
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import CpuMemory from './kubevirt.io.virtualmachine/VirtualMachineCpuMemory';
|
|||||||
import CpuModel from './kubevirt.io.virtualmachine/VirtualMachineCpuModel';
|
import CpuModel from './kubevirt.io.virtualmachine/VirtualMachineCpuModel';
|
||||||
import CloudConfig from './kubevirt.io.virtualmachine/VirtualMachineCloudConfig';
|
import CloudConfig from './kubevirt.io.virtualmachine/VirtualMachineCloudConfig';
|
||||||
import SSHKey from './kubevirt.io.virtualmachine/VirtualMachineSSHKey';
|
import SSHKey from './kubevirt.io.virtualmachine/VirtualMachineSSHKey';
|
||||||
|
import Filesystem from './kubevirt.io.virtualmachine/VirtualMachineFilesystem';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'HarvesterEditVMTemplate',
|
name: 'HarvesterEditVMTemplate',
|
||||||
@@ -51,6 +52,7 @@ export default {
|
|||||||
UnitInput,
|
UnitInput,
|
||||||
Banner,
|
Banner,
|
||||||
KeyValue,
|
KeyValue,
|
||||||
|
Filesystem,
|
||||||
},
|
},
|
||||||
|
|
||||||
mixins: [CreateEditView, VM_MIXIN],
|
mixins: [CreateEditView, VM_MIXIN],
|
||||||
@@ -95,6 +97,10 @@ export default {
|
|||||||
secretNamePrefix() {
|
secretNamePrefix() {
|
||||||
return this.templateValue?.metadata?.name;
|
return this.templateValue?.metadata?.name;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
filesystemEnabled() {
|
||||||
|
return this.$store.getters['harvester-common/getFeatureEnabled']('supportFilesystem');
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
watch: {
|
watch: {
|
||||||
@@ -154,6 +160,7 @@ export default {
|
|||||||
|
|
||||||
mounted() {
|
mounted() {
|
||||||
this.imageId = this.diskRows[0]?.image || '';
|
this.imageId = this.diskRows[0]?.image || '';
|
||||||
|
this['filesystemRows'] = this.getFilesystemRows(this.value.spec.vm);
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
@@ -349,6 +356,19 @@ export default {
|
|||||||
</template>
|
</template>
|
||||||
</Tab>
|
</Tab>
|
||||||
|
|
||||||
|
<Tab
|
||||||
|
v-if="filesystemEnabled"
|
||||||
|
name="filesystem"
|
||||||
|
:label="t('harvester.tab.filesystem')"
|
||||||
|
:weight="-8"
|
||||||
|
>
|
||||||
|
<Filesystem
|
||||||
|
v-model:value="filesystemRows"
|
||||||
|
:mode="mode"
|
||||||
|
:namespace="templateValue.metadata.namespace"
|
||||||
|
/>
|
||||||
|
</Tab>
|
||||||
|
|
||||||
<Tab
|
<Tab
|
||||||
name="labels"
|
name="labels"
|
||||||
:label="t('generic.labels')"
|
:label="t('generic.labels')"
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
import Footer from '@shell/components/form/Footer';
|
import Footer from '@shell/components/form/Footer';
|
||||||
import { RadioGroup } from '@components/Form/Radio';
|
import { RadioGroup } from '@components/Form/Radio';
|
||||||
import { LabeledInput } from '@components/Form/LabeledInput';
|
import { LabeledInput } from '@components/Form/LabeledInput';
|
||||||
|
import Checkbox from '@components/Form/Checkbox/Checkbox';
|
||||||
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
||||||
import CreateEditView from '@shell/mixins/create-edit-view';
|
import CreateEditView from '@shell/mixins/create-edit-view';
|
||||||
import { allHash } from '@shell/utils/promise';
|
import { allHash } from '@shell/utils/promise';
|
||||||
@@ -32,6 +33,7 @@ const createObject = {
|
|||||||
export default {
|
export default {
|
||||||
name: 'CreateRestore',
|
name: 'CreateRestore',
|
||||||
components: {
|
components: {
|
||||||
|
Checkbox,
|
||||||
Footer,
|
Footer,
|
||||||
RadioGroup,
|
RadioGroup,
|
||||||
LabeledInput,
|
LabeledInput,
|
||||||
@@ -249,9 +251,17 @@ export default {
|
|||||||
<LabeledSelect
|
<LabeledSelect
|
||||||
v-if="!restoreNewVm"
|
v-if="!restoreNewVm"
|
||||||
v-model:value="deletionPolicy"
|
v-model:value="deletionPolicy"
|
||||||
|
class="mb-20"
|
||||||
:label="t('harvester.backup.restore.deletePreviousVolumes')"
|
:label="t('harvester.backup.restore.deletePreviousVolumes')"
|
||||||
:options="deletionPolicyOption"
|
:options="deletionPolicyOption"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<Checkbox
|
||||||
|
v-model:value="restoreResource.spec.haltAfterRestore"
|
||||||
|
type="checkbox"
|
||||||
|
class="check mb-20"
|
||||||
|
:label="t('harvester.backup.restore.haltAfterRestore')"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Footer
|
<Footer
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ export default {
|
|||||||
created() {
|
created() {
|
||||||
const vpc = this.$route.query.vpc || '';
|
const vpc = this.$route.query.vpc || '';
|
||||||
const enableDHCP = this.value?.spec?.enableDHCP || false;
|
const enableDHCP = this.value?.spec?.enableDHCP || false;
|
||||||
|
const natOutgoing = this.value?.spec?.natOutgoing || false;
|
||||||
|
|
||||||
set(this.value.spec, 'enableDHCP', enableDHCP);
|
set(this.value.spec, 'enableDHCP', enableDHCP);
|
||||||
set(this.value, 'spec', this.value.spec || {
|
set(this.value, 'spec', this.value.spec || {
|
||||||
@@ -50,10 +51,11 @@ export default {
|
|||||||
protocol: NETWORK_PROTOCOL.IPv4,
|
protocol: NETWORK_PROTOCOL.IPv4,
|
||||||
provider: '',
|
provider: '',
|
||||||
vpc,
|
vpc,
|
||||||
gatewayIP: '',
|
gateway: '',
|
||||||
excludeIps: [],
|
excludeIps: [],
|
||||||
private: false,
|
private: false,
|
||||||
enableDHCP,
|
enableDHCP,
|
||||||
|
natOutgoing,
|
||||||
acls: []
|
acls: []
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@@ -129,6 +131,10 @@ export default {
|
|||||||
label: n.id,
|
label: n.id,
|
||||||
value: n.id,
|
value: n.id,
|
||||||
}));
|
}));
|
||||||
|
},
|
||||||
|
natOutgoingDisabled() {
|
||||||
|
// Disable the NAT Outgoing option when the subnet belongs to the ovn-cluster VPC and its name is join or ovn-default.
|
||||||
|
return this.value?.spec?.vpc === 'ovn-cluster' && ['join', 'ovn-default'].includes(this.value?.metadata?.name);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -304,6 +310,20 @@ export default {
|
|||||||
</Banner>
|
</Banner>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="row mt-20">
|
||||||
|
<div class="col span-6">
|
||||||
|
<RadioGroup
|
||||||
|
v-model:value="value.spec.natOutgoing"
|
||||||
|
name="enableExternalConnectivity"
|
||||||
|
:disabled="natOutgoingDisabled"
|
||||||
|
:options="[true, false]"
|
||||||
|
:label="t('harvester.subnet.externalConnectivity.label')"
|
||||||
|
:labels="[t('generic.enabled'), t('generic.disabled')]"
|
||||||
|
:mode="mode"
|
||||||
|
:tooltip="t('harvester.subnet.externalConnectivity.tooltip')"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="row mt-20">
|
<div class="row mt-20">
|
||||||
<div class="col span-6">
|
<div class="col span-6">
|
||||||
<RadioGroup
|
<RadioGroup
|
||||||
|
|||||||
@@ -0,0 +1,310 @@
|
|||||||
|
<script>
|
||||||
|
import { mapGetters } from 'vuex';
|
||||||
|
import { Banner } from '@components/Banner';
|
||||||
|
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
||||||
|
import { LabeledInput } from '@components/Form/LabeledInput';
|
||||||
|
import { CONFIG_MAP, SECRET, SERVICE_ACCOUNT } from '@shell/config/types';
|
||||||
|
import { _VIEW } from '@shell/config/query-params';
|
||||||
|
import CopyToClipboard from '@shell/components/CopyToClipboard';
|
||||||
|
import MessageLink from '@shell/components/MessageLink';
|
||||||
|
import { FILESYSTEM_SOURCE_TYPE } from '@pkg/harvester/config/types';
|
||||||
|
|
||||||
|
const MAX_FILESYSTEMS = 3;
|
||||||
|
|
||||||
|
const { CONFIGMAP: FS_TYPE_CONFIGMAP, SECRET: FS_TYPE_SECRET, SERVICEACCOUNT: FS_TYPE_SERVICEACCOUNT } = FILESYSTEM_SOURCE_TYPE;
|
||||||
|
|
||||||
|
const DEFAULT_VOLUME_NAMES = {
|
||||||
|
[FS_TYPE_CONFIGMAP]: 'appconfigfs',
|
||||||
|
[FS_TYPE_SECRET]: 'appsecretfs',
|
||||||
|
[FS_TYPE_SERVICEACCOUNT]: 'appserviceaccountfs',
|
||||||
|
};
|
||||||
|
|
||||||
|
const FS_TYPE_OPTIONS = [
|
||||||
|
{ label: 'ConfigMap', value: FS_TYPE_CONFIGMAP },
|
||||||
|
{ label: 'Secret', value: FS_TYPE_SECRET },
|
||||||
|
{ label: 'ServiceAccount', value: FS_TYPE_SERVICEACCOUNT },
|
||||||
|
];
|
||||||
|
|
||||||
|
function emptyRow() {
|
||||||
|
return {
|
||||||
|
fsType: FS_TYPE_CONFIGMAP,
|
||||||
|
volumeName: DEFAULT_VOLUME_NAMES[FS_TYPE_CONFIGMAP],
|
||||||
|
resourceName: '',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'VirtualMachineFilesystem',
|
||||||
|
|
||||||
|
emits: ['update:value'],
|
||||||
|
|
||||||
|
components: {
|
||||||
|
Banner,
|
||||||
|
LabeledSelect,
|
||||||
|
LabeledInput,
|
||||||
|
CopyToClipboard,
|
||||||
|
MessageLink,
|
||||||
|
},
|
||||||
|
|
||||||
|
props: {
|
||||||
|
mode: {
|
||||||
|
type: String,
|
||||||
|
default: 'create',
|
||||||
|
},
|
||||||
|
namespace: {
|
||||||
|
type: String,
|
||||||
|
default: '',
|
||||||
|
},
|
||||||
|
value: {
|
||||||
|
type: Array,
|
||||||
|
default: () => [],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
data() {
|
||||||
|
return { rows: this.value.length > 0 ? this.value.map((r) => ({ ...r })) : [emptyRow()] };
|
||||||
|
},
|
||||||
|
|
||||||
|
watch: {
|
||||||
|
value(newVal) {
|
||||||
|
if (newVal) {
|
||||||
|
const incoming = JSON.stringify(newVal);
|
||||||
|
const current = JSON.stringify(this.rows);
|
||||||
|
|
||||||
|
if (incoming !== current) {
|
||||||
|
this.rows = newVal.map((r) => ({ ...r }));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
rows: {
|
||||||
|
deep: true,
|
||||||
|
handler(val) {
|
||||||
|
this.$emit('update:value', val.map((r) => ({ ...r })));
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
computed: {
|
||||||
|
...mapGetters({ t: 'i18n/t' }),
|
||||||
|
|
||||||
|
inStore() {
|
||||||
|
return this.$store.getters['currentProduct'].inStore;
|
||||||
|
},
|
||||||
|
|
||||||
|
configMaps() {
|
||||||
|
return this.$store.getters[`${ this.inStore }/all`](CONFIG_MAP)
|
||||||
|
.filter((cm) => !this.namespace || cm.metadata.namespace === this.namespace)
|
||||||
|
.map((cm) => ({ label: cm.metadata.name, value: cm.metadata.name }));
|
||||||
|
},
|
||||||
|
|
||||||
|
secrets() {
|
||||||
|
return this.$store.getters[`${ this.inStore }/all`](SECRET)
|
||||||
|
.filter((s) => !this.namespace || s.metadata.namespace === this.namespace)
|
||||||
|
.map((s) => ({ label: s.metadata.name, value: s.metadata.name }));
|
||||||
|
},
|
||||||
|
|
||||||
|
serviceAccounts() {
|
||||||
|
return this.$store.getters[`${ this.inStore }/all`](SERVICE_ACCOUNT)
|
||||||
|
.filter((sa) => !this.namespace || sa.metadata.namespace === this.namespace)
|
||||||
|
.map((sa) => ({ label: sa.metadata.name, value: sa.metadata.name }));
|
||||||
|
},
|
||||||
|
|
||||||
|
canAddRow() {
|
||||||
|
return this.rows.length < MAX_FILESYSTEMS;
|
||||||
|
},
|
||||||
|
|
||||||
|
isView() {
|
||||||
|
return this.mode === _VIEW;
|
||||||
|
},
|
||||||
|
|
||||||
|
completedRows() {
|
||||||
|
return this.rows.filter((r) => r.fsType && r.volumeName && r.resourceName);
|
||||||
|
},
|
||||||
|
|
||||||
|
allMountCommands() {
|
||||||
|
return this.completedRows.map((r) => this.mountCommands(r)).join('\n');
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
methods: {
|
||||||
|
fsTypeOptions(currentIndex) {
|
||||||
|
const usedTypes = this.rows
|
||||||
|
.filter((_, i) => i !== currentIndex)
|
||||||
|
.map((r) => r.fsType);
|
||||||
|
|
||||||
|
return FS_TYPE_OPTIONS.filter((opt) => !usedTypes.includes(opt.value));
|
||||||
|
},
|
||||||
|
|
||||||
|
resourceOptions(fsType) {
|
||||||
|
if (fsType === FS_TYPE_CONFIGMAP) return this.configMaps;
|
||||||
|
if (fsType === FS_TYPE_SECRET) return this.secrets;
|
||||||
|
if (fsType === FS_TYPE_SERVICEACCOUNT) return this.serviceAccounts;
|
||||||
|
|
||||||
|
return [];
|
||||||
|
},
|
||||||
|
|
||||||
|
onFsTypeChange(row, newType) {
|
||||||
|
row.fsType = newType;
|
||||||
|
row.volumeName = DEFAULT_VOLUME_NAMES[newType] || '';
|
||||||
|
row.resourceName = '';
|
||||||
|
},
|
||||||
|
|
||||||
|
addRow() {
|
||||||
|
if (this.canAddRow) {
|
||||||
|
const usedTypes = this.rows.map((r) => r.fsType);
|
||||||
|
const nextType = FS_TYPE_OPTIONS.find((opt) => !usedTypes.includes(opt.value))?.value || FS_TYPE_CONFIGMAP;
|
||||||
|
|
||||||
|
this.rows.push({
|
||||||
|
fsType: nextType,
|
||||||
|
volumeName: DEFAULT_VOLUME_NAMES[nextType] || '',
|
||||||
|
resourceName: '',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
removeRow(index) {
|
||||||
|
this.rows.splice(index, 1);
|
||||||
|
},
|
||||||
|
|
||||||
|
mountCommands(row) {
|
||||||
|
const vol = row.volumeName || '<volume-name>';
|
||||||
|
|
||||||
|
return `- mkdir -p /mnt/${ vol }\n- mount -t virtiofs ${ vol } /mnt/${ vol }`;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="vm-filesystem">
|
||||||
|
<p class="mb-20">
|
||||||
|
{{ t('harvester.virtualMachine.filesystem.description') }}
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-for="(row, index) in rows"
|
||||||
|
:key="index"
|
||||||
|
class="filesystem-row mb-15"
|
||||||
|
>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col span-3">
|
||||||
|
<LabeledSelect
|
||||||
|
:value="row.fsType"
|
||||||
|
:label="t('harvester.virtualMachine.filesystem.type')"
|
||||||
|
:options="fsTypeOptions(index)"
|
||||||
|
:mode="mode"
|
||||||
|
required
|
||||||
|
@update:value="onFsTypeChange(row, $event)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="col span-3">
|
||||||
|
<LabeledInput
|
||||||
|
v-model:value="row.volumeName"
|
||||||
|
:label="t('harvester.virtualMachine.filesystem.volume')"
|
||||||
|
:mode="mode"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="col span-5">
|
||||||
|
<LabeledSelect
|
||||||
|
v-model:value="row.resourceName"
|
||||||
|
:label="t('harvester.virtualMachine.filesystem.resource')"
|
||||||
|
:options="resourceOptions(row.fsType)"
|
||||||
|
:mode="mode"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="!isView"
|
||||||
|
class="col span-1 remove-col"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="btn role-link remove-btn"
|
||||||
|
@click="removeRow(index)"
|
||||||
|
>
|
||||||
|
{{ t('generic.remove') }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Banner
|
||||||
|
v-if="completedRows.length > 0 && mode === 'create'"
|
||||||
|
color="warning"
|
||||||
|
class="mt-10"
|
||||||
|
>
|
||||||
|
<div>
|
||||||
|
<MessageLink
|
||||||
|
:to="{ hash: '#advanced' }"
|
||||||
|
prefix-label="harvester.virtualMachine.filesystem.mountBannerHint"
|
||||||
|
middle-label="harvester.virtualMachine.filesystem.mountBannerHintLink"
|
||||||
|
suffix-label="harvester.virtualMachine.filesystem.mountBannerHintSuffix"
|
||||||
|
/>
|
||||||
|
<div class="pre-wrapper mt-10">
|
||||||
|
<pre class="mt-5 mb-0">{{ allMountCommands }}</pre>
|
||||||
|
<CopyToClipboard
|
||||||
|
:text="allMountCommands"
|
||||||
|
:show-label="false"
|
||||||
|
class="icon-btn"
|
||||||
|
action-color="bg-transparent"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</Banner>
|
||||||
|
|
||||||
|
<button
|
||||||
|
v-if="!isView && canAddRow"
|
||||||
|
type="button"
|
||||||
|
class="btn role-tertiary add"
|
||||||
|
@click="addRow"
|
||||||
|
>
|
||||||
|
{{ t('harvester.virtualMachine.filesystem.add') }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.vm-filesystem {
|
||||||
|
padding: 10px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.filesystem-row {
|
||||||
|
border-bottom: 1px solid var(--border);
|
||||||
|
padding-bottom: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.remove-col {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.remove-btn {
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pre-wrapper {
|
||||||
|
position: relative;
|
||||||
|
|
||||||
|
pre {
|
||||||
|
padding-right: 36px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon-btn {
|
||||||
|
position: absolute;
|
||||||
|
top: 0px;
|
||||||
|
right: 5px;
|
||||||
|
padding: 2px 4px;
|
||||||
|
line-height: 1;
|
||||||
|
|
||||||
|
&:active {
|
||||||
|
background-color: var(--success) !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -152,6 +152,10 @@ export default {
|
|||||||
return !rows.find((device) => !device.passthroughClaim);
|
return !rows.find((device) => !device.passthroughClaim);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
canManageGroup(rows = []) {
|
||||||
|
return rows.length > 0 && rows.every((row) => row.canUpdate === true);
|
||||||
|
},
|
||||||
|
|
||||||
changeRows(filterRows, parentSriov) {
|
changeRows(filterRows, parentSriov) {
|
||||||
this['filterRows'] = filterRows;
|
this['filterRows'] = filterRows;
|
||||||
this['parentSriov'] = parentSriov;
|
this['parentSriov'] = parentSriov;
|
||||||
@@ -184,6 +188,10 @@ export default {
|
|||||||
:ref="group.key"
|
:ref="group.key"
|
||||||
v-trim-whitespace
|
v-trim-whitespace
|
||||||
class="group-tab"
|
class="group-tab"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
v-if="canManageGroup(group.rows)"
|
||||||
|
class="group-actions"
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
v-if="groupIsAllEnabled(group.rows)"
|
v-if="groupIsAllEnabled(group.rows)"
|
||||||
@@ -201,6 +209,7 @@ export default {
|
|||||||
>
|
>
|
||||||
{{ t('harvester.pci.enableGroup') }}
|
{{ t('harvester.pci.enableGroup') }}
|
||||||
</button>
|
</button>
|
||||||
|
</div>
|
||||||
<span v-clean-html="group.key" />
|
<span v-clean-html="group.key" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -232,3 +241,9 @@ export default {
|
|||||||
</template>
|
</template>
|
||||||
</ResourceTable>
|
</ResourceTable>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.group-actions {
|
||||||
|
display: inline;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
@@ -52,31 +52,21 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const selectedDevices = [];
|
const selectedDevices = [];
|
||||||
const oldFormatDevices = [];
|
|
||||||
|
|
||||||
const vmDevices = this.value?.domain?.devices?.hostDevices || [];
|
const vmDevices = this.value?.domain?.devices?.hostDevices || [];
|
||||||
const otherDevices = this.otherDevices(vmDevices).map(({ name }) => name);
|
|
||||||
const vmDeviceNames = vmDevices.map(({ name }) => name);
|
const vmDeviceNames = vmDevices.map(({ name }) => name);
|
||||||
|
|
||||||
this.pciDevices.forEach((row) => {
|
this.pciDevices.forEach((row) => {
|
||||||
row.allowDisable = !vmDeviceNames.includes(row.metadata.name);
|
row.allowDisable = !vmDeviceNames.includes(row.metadata.name);
|
||||||
});
|
});
|
||||||
|
|
||||||
vmDevices.forEach(({ name, deviceName }) => {
|
vmDevices.forEach(({ name }) => {
|
||||||
const checkName = (deviceName || '').split('/')?.[1];
|
if (this.enabledDevices.find((device) => device?.metadata?.name === name)) {
|
||||||
|
|
||||||
if (checkName && name.includes(checkName) && !otherDevices.includes(name)) {
|
|
||||||
oldFormatDevices.push(name);
|
|
||||||
} else if (this.enabledDevices.find((device) => device?.metadata?.name === name)) {
|
|
||||||
selectedDevices.push(name);
|
selectedDevices.push(name);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if (oldFormatDevices.length > 0) {
|
|
||||||
this.oldFormatDevices = oldFormatDevices;
|
|
||||||
} else {
|
|
||||||
this.selectedDevices = selectedDevices;
|
this.selectedDevices = selectedDevices;
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
@@ -87,7 +77,6 @@ export default {
|
|||||||
selectedDevices: [],
|
selectedDevices: [],
|
||||||
pciDeviceSchema: this.$store.getters['harvester/schemaFor'](HCI.PCI_DEVICE),
|
pciDeviceSchema: this.$store.getters['harvester/schemaFor'](HCI.PCI_DEVICE),
|
||||||
showMatrix: false,
|
showMatrix: false,
|
||||||
oldFormatDevices: [],
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -199,11 +188,6 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
oldFormatDevicesHTML() {
|
|
||||||
return this.oldFormatDevices.map((device) => {
|
|
||||||
return `<li>${ device }</li>`;
|
|
||||||
}).join('');
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
@@ -227,17 +211,6 @@ export default {
|
|||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<div
|
|
||||||
v-if="oldFormatDevices.length > 0"
|
|
||||||
class="row"
|
|
||||||
>
|
|
||||||
<div class="col span-12">
|
|
||||||
<Banner color="warning">
|
|
||||||
<p v-clean-html="t('harvester.pci.oldFormatDevices.help', {oldFormatDevicesHTML}, true)" />
|
|
||||||
</Banner>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div v-else>
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col span-12">
|
<div class="col span-12">
|
||||||
<Banner color="info">
|
<Banner color="info">
|
||||||
@@ -323,5 +296,4 @@ export default {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -113,6 +113,11 @@ export default {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
canManageGroup(rows = []) {
|
||||||
|
return rows.every((row) => row.canUpdate === true);
|
||||||
|
},
|
||||||
|
|
||||||
groupIsAllEnabled(rows = []) {
|
groupIsAllEnabled(rows = []) {
|
||||||
return !rows.find((device) => !device.passthroughClaim);
|
return !rows.find((device) => !device.passthroughClaim);
|
||||||
},
|
},
|
||||||
@@ -152,6 +157,10 @@ export default {
|
|||||||
:ref="group.key"
|
:ref="group.key"
|
||||||
v-trim-whitespace
|
v-trim-whitespace
|
||||||
class="group-tab"
|
class="group-tab"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
v-if="canManageGroup(group.rows)"
|
||||||
|
class="group-actions"
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
v-if="groupIsAllEnabled(group.rows)"
|
v-if="groupIsAllEnabled(group.rows)"
|
||||||
@@ -169,6 +178,7 @@ export default {
|
|||||||
>
|
>
|
||||||
{{ t('harvester.usb.enableGroup') }}
|
{{ t('harvester.usb.enableGroup') }}
|
||||||
</button>
|
</button>
|
||||||
|
</div>
|
||||||
<span v-clean-html="group.key" />
|
<span v-clean-html="group.key" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -181,3 +191,9 @@ export default {
|
|||||||
</template>
|
</template>
|
||||||
</ResourceTable>
|
</ResourceTable>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.group-actions {
|
||||||
|
display: inline;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
@@ -475,7 +475,6 @@ export default {
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="btn btn-sm bg-primary mr-15 mb-10"
|
class="btn btn-sm bg-primary mr-15 mb-10"
|
||||||
:disabled="rows.length === 0"
|
|
||||||
@click="addVolume(SOURCE_TYPE.NEW)"
|
@click="addVolume(SOURCE_TYPE.NEW)"
|
||||||
>
|
>
|
||||||
{{ t('harvester.virtualMachine.volume.addVolume') }}
|
{{ t('harvester.virtualMachine.volume.addVolume') }}
|
||||||
|
|||||||
@@ -21,9 +21,7 @@ import { saferDump } from '@shell/utils/create-yaml';
|
|||||||
import { exceptionToErrorsArray } from '@shell/utils/error';
|
import { exceptionToErrorsArray } from '@shell/utils/error';
|
||||||
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
|
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
|
||||||
import { BEFORE_SAVE_HOOKS, AFTER_SAVE_HOOKS } from '@shell/mixins/child-hook';
|
import { BEFORE_SAVE_HOOKS, AFTER_SAVE_HOOKS } from '@shell/mixins/child-hook';
|
||||||
|
|
||||||
import CreateEditView from '@shell/mixins/create-edit-view';
|
import CreateEditView from '@shell/mixins/create-edit-view';
|
||||||
|
|
||||||
import { parseVolumeClaimTemplates } from '@pkg/utils/vm';
|
import { parseVolumeClaimTemplates } from '@pkg/utils/vm';
|
||||||
import VM_MIXIN from '../../mixins/harvester-vm';
|
import VM_MIXIN from '../../mixins/harvester-vm';
|
||||||
import { HCI } from '../../types';
|
import { HCI } from '../../types';
|
||||||
@@ -37,6 +35,7 @@ import Network from './VirtualMachineNetwork';
|
|||||||
import Volume from './VirtualMachineVolume';
|
import Volume from './VirtualMachineVolume';
|
||||||
import SSHKey from './VirtualMachineSSHKey';
|
import SSHKey from './VirtualMachineSSHKey';
|
||||||
import Reserved from './VirtualMachineReserved';
|
import Reserved from './VirtualMachineReserved';
|
||||||
|
import Filesystem from './VirtualMachineFilesystem';
|
||||||
import { Banner } from '@components/Banner';
|
import { Banner } from '@components/Banner';
|
||||||
import MessageLink from '@shell/components/MessageLink';
|
import MessageLink from '@shell/components/MessageLink';
|
||||||
|
|
||||||
@@ -72,6 +71,7 @@ export default {
|
|||||||
Banner,
|
Banner,
|
||||||
MessageLink,
|
MessageLink,
|
||||||
UsbDevices,
|
UsbDevices,
|
||||||
|
Filesystem,
|
||||||
},
|
},
|
||||||
|
|
||||||
mixins: [CreateEditView, VM_MIXIN],
|
mixins: [CreateEditView, VM_MIXIN],
|
||||||
@@ -91,6 +91,8 @@ export default {
|
|||||||
|
|
||||||
const hostname = this.value.spec.template.spec.hostname || '';
|
const hostname = this.value.spec.template.spec.hostname || '';
|
||||||
|
|
||||||
|
const customizeDisplayName = !!(this.value.metadata?.annotations?.[HCI_ANNOTATIONS.VM_DISPLAY_NAME]);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
cloneVM,
|
cloneVM,
|
||||||
count: 2,
|
count: 2,
|
||||||
@@ -101,12 +103,24 @@ export default {
|
|||||||
isOpen: false,
|
isOpen: false,
|
||||||
hostname,
|
hostname,
|
||||||
isRestartImmediately,
|
isRestartImmediately,
|
||||||
|
customizeDisplayName,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
computed: {
|
computed: {
|
||||||
...mapGetters({ t: 'i18n/t' }),
|
...mapGetters({ t: 'i18n/t' }),
|
||||||
|
|
||||||
|
// 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: {
|
||||||
|
get() {
|
||||||
|
return this.value.metadata?.annotations?.[HCI_ANNOTATIONS.VM_DISPLAY_NAME] || '';
|
||||||
|
},
|
||||||
|
set(val) {
|
||||||
|
this.value.setAnnotation(HCI_ANNOTATIONS.VM_DISPLAY_NAME, val);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
to() {
|
to() {
|
||||||
return {
|
return {
|
||||||
name: 'harvester-c-cluster-resource',
|
name: 'harvester-c-cluster-resource',
|
||||||
@@ -218,6 +232,9 @@ export default {
|
|||||||
usbPassthroughEnabled() {
|
usbPassthroughEnabled() {
|
||||||
return this.$store.getters['harvester-common/getFeatureEnabled']('usbPassthrough');
|
return this.$store.getters['harvester-common/getFeatureEnabled']('usbPassthrough');
|
||||||
},
|
},
|
||||||
|
filesystemEnabled() {
|
||||||
|
return this.$store.getters['harvester-common/getFeatureEnabled']('supportFilesystem');
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
watch: {
|
watch: {
|
||||||
@@ -289,6 +306,12 @@ export default {
|
|||||||
this.getInitConfig({ value: this.value, init: this.isCreate });
|
this.getInitConfig({ value: this.value, init: this.isCreate });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
customizeDisplayName(neu) {
|
||||||
|
if (!neu) {
|
||||||
|
this.value.setAnnotation(HCI_ANNOTATIONS.VM_DISPLAY_NAME, '');
|
||||||
|
}
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
created() {
|
created() {
|
||||||
@@ -321,6 +344,7 @@ export default {
|
|||||||
const diskRows = this.getDiskRows(this.value);
|
const diskRows = this.getDiskRows(this.value);
|
||||||
|
|
||||||
this['diskRows'] = diskRows;
|
this['diskRows'] = diskRows;
|
||||||
|
this['filesystemRows'] = this.getFilesystemRows(this.value);
|
||||||
const templateId = this.$route.query.templateId;
|
const templateId = this.$route.query.templateId;
|
||||||
const templateVersionId = this.$route.query.versionId;
|
const templateVersionId = this.$route.query.versionId;
|
||||||
|
|
||||||
@@ -610,6 +634,33 @@ export default {
|
|||||||
</template>
|
</template>
|
||||||
</NameNsDescription>
|
</NameNsDescription>
|
||||||
|
|
||||||
|
<div v-if="isSingle">
|
||||||
|
<div class="row mb-20">
|
||||||
|
<div class="col span-12">
|
||||||
|
<Checkbox
|
||||||
|
v-model:value="customizeDisplayName"
|
||||||
|
class="check"
|
||||||
|
type="checkbox"
|
||||||
|
:label="t('harvester.virtualMachine.input.customizeDisplayName')"
|
||||||
|
:mode="mode"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
v-if="customizeDisplayName"
|
||||||
|
class="row mb-20"
|
||||||
|
>
|
||||||
|
<div class="col span-6">
|
||||||
|
<LabeledInput
|
||||||
|
v-model:value="displayName"
|
||||||
|
:mode="mode"
|
||||||
|
:label="t('harvester.virtualMachine.input.displayName')"
|
||||||
|
:placeholder="t('harvester.virtualMachine.input.displayNamePlaceholder')"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<Checkbox
|
<Checkbox
|
||||||
v-if="isCreate"
|
v-if="isCreate"
|
||||||
v-model:value="useTemplate"
|
v-model:value="useTemplate"
|
||||||
@@ -783,10 +834,23 @@ export default {
|
|||||||
/>
|
/>
|
||||||
</Tab>
|
</Tab>
|
||||||
|
|
||||||
|
<Tab
|
||||||
|
v-if="filesystemEnabled"
|
||||||
|
name="filesystem"
|
||||||
|
:label="t('harvester.tab.filesystem')"
|
||||||
|
:weight="-9"
|
||||||
|
>
|
||||||
|
<Filesystem
|
||||||
|
v-model:value="filesystemRows"
|
||||||
|
:mode="isCreate ? mode : 'view'"
|
||||||
|
:namespace="value.metadata.namespace"
|
||||||
|
/>
|
||||||
|
</Tab>
|
||||||
|
|
||||||
<Tab
|
<Tab
|
||||||
name="labels"
|
name="labels"
|
||||||
:label="t('generic.labels')"
|
:label="t('generic.labels')"
|
||||||
:weight="-9"
|
:weight="-10"
|
||||||
>
|
>
|
||||||
<Banner color="info">
|
<Banner color="info">
|
||||||
<t k="harvester.virtualMachine.labels.banner" />
|
<t k="harvester.virtualMachine.labels.banner" />
|
||||||
@@ -805,7 +869,7 @@ export default {
|
|||||||
<Tab
|
<Tab
|
||||||
name="instanceLabel"
|
name="instanceLabel"
|
||||||
:label="t('harvester.tab.instanceLabel')"
|
:label="t('harvester.tab.instanceLabel')"
|
||||||
:weight="-10"
|
:weight="-11"
|
||||||
>
|
>
|
||||||
<Banner color="info">
|
<Banner color="info">
|
||||||
<t k="harvester.virtualMachine.instanceLabels.banner" />
|
<t k="harvester.virtualMachine.instanceLabels.banner" />
|
||||||
@@ -826,7 +890,7 @@ export default {
|
|||||||
<Tab
|
<Tab
|
||||||
name="annotations"
|
name="annotations"
|
||||||
:label="t('harvester.tab.annotations')"
|
:label="t('harvester.tab.annotations')"
|
||||||
:weight="-11"
|
:weight="-12"
|
||||||
>
|
>
|
||||||
<Banner color="info">
|
<Banner color="info">
|
||||||
<t k="harvester.virtualMachine.annotations.banner" />
|
<t k="harvester.virtualMachine.annotations.banner" />
|
||||||
@@ -847,7 +911,7 @@ export default {
|
|||||||
<Tab
|
<Tab
|
||||||
name="advanced"
|
name="advanced"
|
||||||
:label="t('harvester.tab.advanced')"
|
:label="t('harvester.tab.advanced')"
|
||||||
:weight="-12"
|
:weight="-13"
|
||||||
>
|
>
|
||||||
<div class="row mb-20">
|
<div class="row mb-20">
|
||||||
<div class="col span-6">
|
<div class="col span-6">
|
||||||
|
|||||||
@@ -0,0 +1,419 @@
|
|||||||
|
<script>
|
||||||
|
import CruResource from '@shell/components/CruResource';
|
||||||
|
import NameNsDescription from '@shell/components/form/NameNsDescription';
|
||||||
|
import ResourceTabs from '@shell/components/form/ResourceTabs';
|
||||||
|
import Tab from '@shell/components/Tabbed/Tab';
|
||||||
|
import InfoBox from '@shell/components/InfoBox';
|
||||||
|
import MessageLink from '@shell/components/MessageLink';
|
||||||
|
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
||||||
|
import { LabeledInput } from '@components/Form/LabeledInput';
|
||||||
|
import { RadioGroup } from '@components/Form/Radio';
|
||||||
|
import { Checkbox } from '@components/Form/Checkbox';
|
||||||
|
import HarvesterNodeSelector from '../components/HarvesterNodeSelector';
|
||||||
|
import CreateEditView from '@shell/mixins/create-edit-view';
|
||||||
|
import { allHash } from '@shell/utils/promise';
|
||||||
|
import { set } from '@shell/utils/object';
|
||||||
|
import { NODE } from '@shell/config/types';
|
||||||
|
import { HCI } from '../types';
|
||||||
|
import { ADD_ONS } from '../config/harvester-map';
|
||||||
|
|
||||||
|
const MODE_DHCP = 'dhcp';
|
||||||
|
const MODE_STATIC = 'static';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'HarvesterHostNetworkConfigEditPage',
|
||||||
|
|
||||||
|
emits: ['update:value'],
|
||||||
|
|
||||||
|
components: {
|
||||||
|
CruResource,
|
||||||
|
NameNsDescription,
|
||||||
|
ResourceTabs,
|
||||||
|
Tab,
|
||||||
|
InfoBox,
|
||||||
|
MessageLink,
|
||||||
|
LabeledSelect,
|
||||||
|
LabeledInput,
|
||||||
|
RadioGroup,
|
||||||
|
Checkbox,
|
||||||
|
HarvesterNodeSelector,
|
||||||
|
},
|
||||||
|
|
||||||
|
mixins: [CreateEditView],
|
||||||
|
|
||||||
|
inheritAttrs: false,
|
||||||
|
|
||||||
|
props: {
|
||||||
|
value: {
|
||||||
|
type: Object,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
async fetch() {
|
||||||
|
const inStore = this.$store.getters['currentProduct'].inStore;
|
||||||
|
|
||||||
|
await allHash({
|
||||||
|
clusterNetworks: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.CLUSTER_NETWORK }),
|
||||||
|
nodes: this.$store.dispatch(`${ inStore }/findAll`, { type: NODE }),
|
||||||
|
hostNetworkConfigs: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.HOST_NETWORK_CONFIG }),
|
||||||
|
addons: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.ADD_ONS }),
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
data() {
|
||||||
|
const networkMode = this.value?.spec?.mode || MODE_DHCP;
|
||||||
|
const ips = { ...(this.value?.spec?.ips || {}) };
|
||||||
|
|
||||||
|
if (!this.value.spec) {
|
||||||
|
set(this.value, 'spec', {});
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
networkMode,
|
||||||
|
ips,
|
||||||
|
hasNodeSelector: !!this.value?.spec?.nodeSelector,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
computed: {
|
||||||
|
modeOptions() {
|
||||||
|
return [
|
||||||
|
{ label: 'DHCP', value: MODE_DHCP },
|
||||||
|
{ label: 'Static', value: MODE_STATIC },
|
||||||
|
];
|
||||||
|
},
|
||||||
|
|
||||||
|
clusterNetworkOptions() {
|
||||||
|
const inStore = this.$store.getters['currentProduct'].inStore;
|
||||||
|
const clusterNetworks = this.$store.getters[`${ inStore }/all`](HCI.CLUSTER_NETWORK) || [];
|
||||||
|
|
||||||
|
return clusterNetworks.map((n) => {
|
||||||
|
const disabled = !n.isReady;
|
||||||
|
|
||||||
|
return {
|
||||||
|
label: disabled ? `${ n.id } (${ this.t('generic.notReady') })` : n.id,
|
||||||
|
value: n.id,
|
||||||
|
disabled,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
nodes() {
|
||||||
|
const inStore = this.$store.getters['currentProduct'].inStore;
|
||||||
|
|
||||||
|
return this.$store.getters[`${ inStore }/all`](NODE) || [];
|
||||||
|
},
|
||||||
|
|
||||||
|
isStaticMode() {
|
||||||
|
return this.networkMode === MODE_STATIC;
|
||||||
|
},
|
||||||
|
|
||||||
|
underlay: {
|
||||||
|
get() {
|
||||||
|
return !!this.value?.spec?.underlay;
|
||||||
|
},
|
||||||
|
set(val) {
|
||||||
|
set(this.value, 'spec.underlay', val);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
vlanID: {
|
||||||
|
get() {
|
||||||
|
return this.value?.spec?.vlanID;
|
||||||
|
},
|
||||||
|
set(val) {
|
||||||
|
set(this.value, 'spec.vlanID', val);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
clusterNetwork: {
|
||||||
|
get() {
|
||||||
|
return this.value?.spec?.clusterNetwork;
|
||||||
|
},
|
||||||
|
set(val) {
|
||||||
|
set(this.value, 'spec.clusterNetwork', val);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
underlayConflict() {
|
||||||
|
const inStore = this.$store.getters['currentProduct'].inStore;
|
||||||
|
const all = this.$store.getters[`${ inStore }/all`](HCI.HOST_NETWORK_CONFIG) || [];
|
||||||
|
const currentId = this.value?.id;
|
||||||
|
|
||||||
|
return all.find((c) => c.id !== currentId && c.spec?.underlay === true) || null;
|
||||||
|
},
|
||||||
|
|
||||||
|
kubeovnEnabled() {
|
||||||
|
const inStore = this.$store.getters['currentProduct'].inStore;
|
||||||
|
const addons = this.$store.getters[`${ inStore }/all`](HCI.ADD_ONS) || [];
|
||||||
|
|
||||||
|
return addons.find((a) => a.name === ADD_ONS.KUBEOVN_OPERATOR)?.spec?.enabled === true;
|
||||||
|
},
|
||||||
|
|
||||||
|
underlayDisabled() {
|
||||||
|
return !this.kubeovnEnabled || !!this.underlayConflict;
|
||||||
|
},
|
||||||
|
|
||||||
|
kubeovnAddonTo() {
|
||||||
|
return {
|
||||||
|
name: 'c-cluster-product-resource-namespace-id',
|
||||||
|
params: {
|
||||||
|
cluster: this.$route.params.cluster,
|
||||||
|
product: this.$store.getters['productId'],
|
||||||
|
resource: HCI.ADD_ONS,
|
||||||
|
namespace: 'kube-system',
|
||||||
|
id: ADD_ONS.KUBEOVN_OPERATOR,
|
||||||
|
},
|
||||||
|
query: { mode: 'edit' },
|
||||||
|
hash: '#basic',
|
||||||
|
};
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
watch: {
|
||||||
|
networkMode(neu) {
|
||||||
|
set(this.value, 'spec.mode', neu);
|
||||||
|
|
||||||
|
if (neu !== MODE_STATIC) {
|
||||||
|
if (this.value?.spec?.ips !== undefined) {
|
||||||
|
delete this.value.spec.ips;
|
||||||
|
}
|
||||||
|
this.ips = {};
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
created() {
|
||||||
|
if (this.registerBeforeHook) {
|
||||||
|
this.registerBeforeHook(this.updateBeforeSave);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
methods: {
|
||||||
|
updateBeforeSave() {
|
||||||
|
set(this.value, 'spec.mode', this.networkMode);
|
||||||
|
|
||||||
|
if (this.isStaticMode) {
|
||||||
|
set(this.value, 'spec.ips', { ...this.ips });
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
updateIp(nodeName, val) {
|
||||||
|
this.ips = { ...this.ips, [nodeName]: val };
|
||||||
|
},
|
||||||
|
|
||||||
|
addNodeSelector() {
|
||||||
|
set(this.value.spec, 'nodeSelector', {
|
||||||
|
matchExpressions: [{
|
||||||
|
key: '', operator: 'In', values: []
|
||||||
|
}]
|
||||||
|
});
|
||||||
|
this.hasNodeSelector = true;
|
||||||
|
},
|
||||||
|
|
||||||
|
removeNodeSelector() {
|
||||||
|
delete this.value.spec.nodeSelector;
|
||||||
|
this.hasNodeSelector = false;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<CruResource
|
||||||
|
:done-route="doneRoute"
|
||||||
|
:mode="mode"
|
||||||
|
:resource="value"
|
||||||
|
:errors="errors"
|
||||||
|
:apply-hooks="applyHooks"
|
||||||
|
@finish="save"
|
||||||
|
@cancel="done"
|
||||||
|
@error="e => errors = e"
|
||||||
|
>
|
||||||
|
<NameNsDescription
|
||||||
|
:value="value"
|
||||||
|
:mode="mode"
|
||||||
|
:namespaced="false"
|
||||||
|
description-key="spec.description"
|
||||||
|
@update:value="$emit('update:value', $event)"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<ResourceTabs
|
||||||
|
class="mt-15"
|
||||||
|
:need-conditions="false"
|
||||||
|
:need-related="false"
|
||||||
|
:need-events="false"
|
||||||
|
:side-tabs="true"
|
||||||
|
:mode="mode"
|
||||||
|
>
|
||||||
|
<Tab
|
||||||
|
name="basic"
|
||||||
|
:label="t('harvester.hostNetworkConfig.tabs.mode')"
|
||||||
|
:weight="99"
|
||||||
|
class="bordered-table"
|
||||||
|
>
|
||||||
|
<div class="row mb-20">
|
||||||
|
<div class="col span-6">
|
||||||
|
<RadioGroup
|
||||||
|
v-model:value="networkMode"
|
||||||
|
name="hostNetworkConfigMode"
|
||||||
|
:options="modeOptions"
|
||||||
|
:mode="mode"
|
||||||
|
:row="true"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row mb-20">
|
||||||
|
<div class="col span-6">
|
||||||
|
<LabeledSelect
|
||||||
|
v-model:value="clusterNetwork"
|
||||||
|
:label="t('harvester.network.clusterNetwork.label')"
|
||||||
|
:options="clusterNetworkOptions"
|
||||||
|
:mode="mode"
|
||||||
|
required
|
||||||
|
:placeholder="t('harvester.network.clusterNetwork.selectPlaceholder')"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row mb-20">
|
||||||
|
<div class="col span-6">
|
||||||
|
<LabeledInput
|
||||||
|
v-model:value.number="vlanID"
|
||||||
|
type="number"
|
||||||
|
required
|
||||||
|
:min="2"
|
||||||
|
:max="4094"
|
||||||
|
placeholder="e.g. 2 ~ 4094"
|
||||||
|
:label="t('harvester.hostNetworkConfig.vlanID.label')"
|
||||||
|
:mode="mode"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row mb-20">
|
||||||
|
<div class="col span-6">
|
||||||
|
<Checkbox
|
||||||
|
v-model:value="underlay"
|
||||||
|
:label="t('harvester.hostNetworkConfig.underlay.label')"
|
||||||
|
:tooltip="t('harvester.hostNetworkConfig.underlay.tooltip')"
|
||||||
|
:mode="mode"
|
||||||
|
:disabled="underlayDisabled"
|
||||||
|
/>
|
||||||
|
<span
|
||||||
|
v-if="!kubeovnEnabled"
|
||||||
|
class="underlay-conflict-warning"
|
||||||
|
>
|
||||||
|
<i class="icon icon-warning" />
|
||||||
|
<MessageLink
|
||||||
|
:to="kubeovnAddonTo"
|
||||||
|
prefix-label="harvester.hostNetworkConfig.underlay.noKubeovn.prefix"
|
||||||
|
middle-label="harvester.hostNetworkConfig.underlay.noKubeovn.middle"
|
||||||
|
suffix-label="harvester.hostNetworkConfig.underlay.noKubeovn.suffix"
|
||||||
|
/>
|
||||||
|
</span>
|
||||||
|
<span
|
||||||
|
v-else-if="underlayConflict"
|
||||||
|
class="underlay-conflict-warning"
|
||||||
|
>
|
||||||
|
<i class="icon icon-warning" />
|
||||||
|
{{ t('harvester.hostNetworkConfig.underlay.conflict', { name: underlayConflict.nameDisplay || underlayConflict.id }) }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<template v-if="isStaticMode">
|
||||||
|
<hr class="section-divider" />
|
||||||
|
<div
|
||||||
|
v-for="node in nodes"
|
||||||
|
:key="node.id"
|
||||||
|
class="row mb-10 ips-row"
|
||||||
|
>
|
||||||
|
<div class="col span-3">
|
||||||
|
<LabeledInput
|
||||||
|
:value="node.nameDisplay || node.id"
|
||||||
|
:label="t('harvester.hostNetworkConfig.ips.nodeLabel')"
|
||||||
|
mode="view"
|
||||||
|
:disabled="true"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="col span-5">
|
||||||
|
<LabeledInput
|
||||||
|
:value="ips[node.id]"
|
||||||
|
:label="t('harvester.hostNetworkConfig.ips.label')"
|
||||||
|
:placeholder="t('harvester.hostNetworkConfig.ips.placeholder')"
|
||||||
|
:mode="mode"
|
||||||
|
required
|
||||||
|
@update:value="updateIp(node.id, $event)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</Tab>
|
||||||
|
<Tab
|
||||||
|
name="nodeSelector"
|
||||||
|
:label="t('harvester.hostNetworkConfig.tabs.nodeSelector')"
|
||||||
|
:weight="98"
|
||||||
|
>
|
||||||
|
<template v-if="hasNodeSelector">
|
||||||
|
<InfoBox class="node-selector-box">
|
||||||
|
<button
|
||||||
|
v-if="!isView"
|
||||||
|
type="button"
|
||||||
|
class="role-link btn btn-sm remove"
|
||||||
|
:aria-label="t('generic.remove')"
|
||||||
|
@click="removeNodeSelector"
|
||||||
|
>
|
||||||
|
<i class="icon icon-x" />
|
||||||
|
</button>
|
||||||
|
<HarvesterNodeSelector
|
||||||
|
class="mt-20"
|
||||||
|
:value="value.spec.nodeSelector"
|
||||||
|
:mode="mode"
|
||||||
|
/>
|
||||||
|
</InfoBox>
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="btn role-secondary"
|
||||||
|
:disabled="isView"
|
||||||
|
@click="addNodeSelector"
|
||||||
|
>
|
||||||
|
{{ t('harvester.hostNetworkConfig.nodeSelector.addButton') }}
|
||||||
|
</button>
|
||||||
|
</template>
|
||||||
|
</Tab>
|
||||||
|
</ResourceTabs>
|
||||||
|
</CruResource>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.section-divider {
|
||||||
|
border: none;
|
||||||
|
border-top: 1px solid var(--border);
|
||||||
|
margin: 10px 0 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.node-selector-box {
|
||||||
|
position: relative;
|
||||||
|
|
||||||
|
.remove {
|
||||||
|
position: absolute;
|
||||||
|
top: 10px;
|
||||||
|
right: 10px;
|
||||||
|
z-index: 1;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.underlay-conflict-warning {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 4px;
|
||||||
|
margin-top: 4px;
|
||||||
|
color: var(--warning);
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -31,6 +31,10 @@ export default {
|
|||||||
to() {
|
to() {
|
||||||
return this.vm?.detailLocation;
|
return this.vm?.detailLocation;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
attachVMName() {
|
||||||
|
return this.vm?.nameDisplay || this.vm?.metadata?.name || this.value;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
@@ -40,10 +44,10 @@ export default {
|
|||||||
v-if="to"
|
v-if="to"
|
||||||
:to="to"
|
:to="to"
|
||||||
>
|
>
|
||||||
{{ value }}
|
{{ attachVMName }}
|
||||||
</router-link>
|
</router-link>
|
||||||
|
|
||||||
<span v-else>
|
<span v-else>
|
||||||
{{ value }}
|
{{ attachVMName }}
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
<script>
|
||||||
|
export default {
|
||||||
|
name: 'HarvesterBooleanFormatter',
|
||||||
|
props: {
|
||||||
|
value: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<span v-if="value">
|
||||||
|
<i class="icon icon-checkmark" />
|
||||||
|
</span>
|
||||||
|
<span
|
||||||
|
v-else
|
||||||
|
class="text-muted"
|
||||||
|
>
|
||||||
|
—
|
||||||
|
</span>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
<script>
|
||||||
|
export default {
|
||||||
|
name: 'HarvesterHostNetworkConfigModeFormatter',
|
||||||
|
props: {
|
||||||
|
value: {
|
||||||
|
type: String,
|
||||||
|
default: '',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
computed: {
|
||||||
|
displayMode() {
|
||||||
|
if (this.value?.toLowerCase() === 'dhcp') {
|
||||||
|
return 'DHCP';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.value?.toLowerCase() === 'static') {
|
||||||
|
return 'Static';
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.value;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<span>{{ displayMode }}</span>
|
||||||
|
</template>
|
||||||
@@ -20,12 +20,7 @@ export default {
|
|||||||
|
|
||||||
computed: {
|
computed: {
|
||||||
vmiResource() {
|
vmiResource() {
|
||||||
const vmiList = this.$store.getters['harvester/all'](HCI.VMI) || [];
|
return this.$store.getters['harvester/byId'](HCI.VMI, this.vmResource?.id) || null;
|
||||||
const vmi = vmiList.find( (VMI) => {
|
|
||||||
return VMI?.metadata?.ownerReferences?.[0]?.uid === this.vmResource?.metadata?.uid;
|
|
||||||
});
|
|
||||||
|
|
||||||
return vmi;
|
|
||||||
},
|
},
|
||||||
migrationState() {
|
migrationState() {
|
||||||
return this.vmiResource?.migrationState?.status || '';
|
return this.vmiResource?.migrationState?.status || '';
|
||||||
|
|||||||
@@ -14,20 +14,6 @@ export default {
|
|||||||
type: Object,
|
type: Object,
|
||||||
required: true
|
required: true
|
||||||
},
|
},
|
||||||
|
|
||||||
allNodeNetwork: {
|
|
||||||
type: Array,
|
|
||||||
default: () => {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
allClusterNetwork: {
|
|
||||||
type: Array,
|
|
||||||
default: () => {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
|
|||||||
@@ -144,6 +144,10 @@ harvester:
|
|||||||
migration:
|
migration:
|
||||||
failedMessage: Latest migration failed!
|
failedMessage: Latest migration failed!
|
||||||
title: Migration
|
title: Migration
|
||||||
|
vmMigrationTitle: '{count, plural, one {Migrating # VM} other {Migrating # VMs}}'
|
||||||
|
selectedVMs: "The following virtual machine(s) will be migrated to the target node"
|
||||||
|
unknownNode: (unknown node)
|
||||||
|
alreadyOnTarget: Already on Target
|
||||||
fields:
|
fields:
|
||||||
nodeName:
|
nodeName:
|
||||||
label: Target Node
|
label: Target Node
|
||||||
@@ -248,6 +252,7 @@ harvester:
|
|||||||
suspendSchedule: Suspend
|
suspendSchedule: Suspend
|
||||||
restoreExistingVM: Replace Existing
|
restoreExistingVM: Replace Existing
|
||||||
migrate: Migrate
|
migrate: Migrate
|
||||||
|
vmMigrate: Virtual Machine Migration
|
||||||
cpuAndMemoryHotplug: Edit CPU and Memory
|
cpuAndMemoryHotplug: Edit CPU and Memory
|
||||||
abortMigration: Abort Migration
|
abortMigration: Abort Migration
|
||||||
storageMigration: Storage Migration
|
storageMigration: Storage Migration
|
||||||
@@ -290,6 +295,12 @@ harvester:
|
|||||||
harvesterIpAddress:
|
harvesterIpAddress:
|
||||||
customIpTooltip: "Custom IP (set via annotation)"
|
customIpTooltip: "Custom IP (set via annotation)"
|
||||||
tableHeaders:
|
tableHeaders:
|
||||||
|
hostNetworkConfig:
|
||||||
|
underlay: Underlay
|
||||||
|
underlayTooltip: Allow this interface to act as the underlay for VM overlay networks.
|
||||||
|
vlanID: VLAN ID
|
||||||
|
mode: Mode
|
||||||
|
clusterNetwork: Cluster Network
|
||||||
imageEncryption: Encryption
|
imageEncryption: Encryption
|
||||||
size: Size
|
size: Size
|
||||||
virtualSize: Virtual Size
|
virtualSize: Virtual Size
|
||||||
@@ -298,6 +309,7 @@ harvester:
|
|||||||
phase: Phase
|
phase: Phase
|
||||||
attachedVM: Attached Virtual Machine
|
attachedVM: Attached Virtual Machine
|
||||||
cpuManager: CPU Manager
|
cpuManager: CPU Manager
|
||||||
|
routeConnectivityTooltip: Connectivity between the VM network and the management network, which the Harvester nodes are connected to.
|
||||||
fingerprint: Fingerprint
|
fingerprint: Fingerprint
|
||||||
value: Value
|
value: Value
|
||||||
actions: Actions
|
actions: Actions
|
||||||
@@ -349,6 +361,7 @@ harvester:
|
|||||||
snapshots: Snapshots
|
snapshots: Snapshots
|
||||||
instanceLabel: Instance Labels
|
instanceLabel: Instance Labels
|
||||||
annotations: Annotations
|
annotations: Annotations
|
||||||
|
filesystem: Filesystem Volume
|
||||||
fields:
|
fields:
|
||||||
version: Version
|
version: Version
|
||||||
name: Name
|
name: Name
|
||||||
@@ -385,21 +398,6 @@ harvester:
|
|||||||
middle: vGPU Devices
|
middle: vGPU Devices
|
||||||
suffix: page.
|
suffix: page.
|
||||||
deviceInTheSameHost: 'You can only select devices on the same host.'
|
deviceInTheSameHost: 'You can only select devices on the same host.'
|
||||||
oldFormatDevices:
|
|
||||||
help: |-
|
|
||||||
<p>
|
|
||||||
The following PCI devices are using the old naming convention and need to be updated in the YAML file:
|
|
||||||
</p>
|
|
||||||
<ul>
|
|
||||||
{oldFormatDevicesHTML}
|
|
||||||
</ul>
|
|
||||||
<p>
|
|
||||||
Please use the following instructions to update the virtual machine:
|
|
||||||
</p>
|
|
||||||
<ol>
|
|
||||||
<li>Stop the virtual machine, edit the virtual machine YAML, and remove the <Code>hostDevices</Code> section, and save virtual machine the changes to the YAML file.</li>
|
|
||||||
<li>Edit the virtual machine, and add the already enabled PCI Device from the list of available PCIDevices, and save and start VM.</li>
|
|
||||||
</ol>
|
|
||||||
showCompatibility: Show device compatibility matrix
|
showCompatibility: Show device compatibility matrix
|
||||||
hideCompatibility: Hide device compatibility matrix
|
hideCompatibility: Hide device compatibility matrix
|
||||||
claimError: Error enabling passthrough on {name}
|
claimError: Error enabling passthrough on {name}
|
||||||
@@ -417,6 +415,8 @@ harvester:
|
|||||||
suffix: to enable the add-on to successfully manage your PCI devices.
|
suffix: to enable the add-on to successfully manage your PCI devices.
|
||||||
noPCIPermission: Please contact your system administrator to enable the PCI devices first.
|
noPCIPermission: Please contact your system administrator to enable the PCI devices first.
|
||||||
enablePassthroughWarning: Please be careful not to use host-owned PCI devices (e.g., management and VLAN NICs). Incorrect device allocation may cause damage to your cluster, including node failure.
|
enablePassthroughWarning: Please be careful not to use host-owned PCI devices (e.g., management and VLAN NICs). Incorrect device allocation may cause damage to your cluster, including node failure.
|
||||||
|
disableResourcePooling: Disable Resource Pooling
|
||||||
|
disableResourcePoolingDescription: Assigns this device a unique resource name so it can be pinned to a specific VM, instead of sharing the pool with other identical devices.
|
||||||
|
|
||||||
devices:
|
devices:
|
||||||
matrixHostName: Host Name
|
matrixHostName: Host Name
|
||||||
@@ -824,6 +824,18 @@ harvester:
|
|||||||
username: Username
|
username: Username
|
||||||
password: Password
|
password: Password
|
||||||
reservedMemory: Reserved Memory
|
reservedMemory: Reserved Memory
|
||||||
|
customizeDisplayName: Customize virtual machine display name
|
||||||
|
displayNamePlaceholder: Virtual machine alias name
|
||||||
|
displayName: Display Name
|
||||||
|
filesystem:
|
||||||
|
description: Harvester supports filesystem volumes for VM via virtiofs.
|
||||||
|
type: Filesystem Type
|
||||||
|
volume: Volume
|
||||||
|
resource: Resource
|
||||||
|
add: Add
|
||||||
|
mountBannerHint: "Please update the mount path (e.g. /mnt/appconfigfs) to your preferred location, then add the corresponding commands to the"
|
||||||
|
mountBannerHintLink: "runcmd"
|
||||||
|
mountBannerHintSuffix: "in Advanced tab User Data."
|
||||||
machineTypeTip: 'Specify a processor architecture to emulate. To see a list of supported architectures, run: qemu-system-x86_64 -cpu ?'
|
machineTypeTip: 'Specify a processor architecture to emulate. To see a list of supported architectures, run: qemu-system-x86_64 -cpu ?'
|
||||||
detail:
|
detail:
|
||||||
tabs:
|
tabs:
|
||||||
@@ -1112,6 +1124,7 @@ harvester:
|
|||||||
replaceExisting: Replace existing
|
replaceExisting: Replace existing
|
||||||
virtualMachineName: Virtual Machine Name
|
virtualMachineName: Virtual Machine Name
|
||||||
keepMacAddress: Keep MAC Address
|
keepMacAddress: Keep MAC Address
|
||||||
|
haltAfterRestore: Keep powered off after restore
|
||||||
matchTarget: The current backup target does not match the existing one.
|
matchTarget: The current backup target does not match the existing one.
|
||||||
progress:
|
progress:
|
||||||
details: Volume details
|
details: Volume details
|
||||||
@@ -1149,6 +1162,9 @@ harvester:
|
|||||||
placeholder: key1=value1, key2=value2
|
placeholder: key1=value1, key2=value2
|
||||||
dhcpOptionBanner: DHCP options is a key/value string concatenate with comma. For more detail, please refer to <a href="https://kubeovn.github.io/docs/v1.13.x/en/kubevirt/dhcp/" target="_blank">KubOVN document</a>
|
dhcpOptionBanner: DHCP options is a key/value string concatenate with comma. For more detail, please refer to <a href="https://kubeovn.github.io/docs/v1.13.x/en/kubevirt/dhcp/" target="_blank">KubOVN document</a>
|
||||||
tooltip: Enable DHCP server for this subnet. When enabled, VMs can automatically obtain IP addresses from this subnet.
|
tooltip: Enable DHCP server for this subnet. When enabled, VMs can automatically obtain IP addresses from this subnet.
|
||||||
|
externalConnectivity:
|
||||||
|
label: NAT Outgoing
|
||||||
|
tooltip: Enable NAT for VMs using this subnet to access external networks.
|
||||||
private:
|
private:
|
||||||
label: Private Subnet
|
label: Private Subnet
|
||||||
tooltip: Enable network isolation for this Subnet. When enabled, VMs can only communicate within this subnet, even if other subnets exist under the same VPC.
|
tooltip: Enable network isolation for this Subnet. When enabled, VMs can only communicate within this subnet, even if other subnets exist under the same VPC.
|
||||||
@@ -1300,6 +1316,7 @@ harvester:
|
|||||||
invalid: '"Range" is invalid.'
|
invalid: '"Range" is invalid.'
|
||||||
clusterNetwork: Cluster Network
|
clusterNetwork: Cluster Network
|
||||||
vlan: VLAN ID
|
vlan: VLAN ID
|
||||||
|
exclusiveVlan: Exclusive VLAN
|
||||||
exclude:
|
exclude:
|
||||||
label: Exclude IPs
|
label: Exclude IPs
|
||||||
placeholder: CIDR format, e.g. 172.16.0.10/32
|
placeholder: CIDR format, e.g. 172.16.0.10/32
|
||||||
@@ -1516,6 +1533,7 @@ harvester:
|
|||||||
vmSnapshot:
|
vmSnapshot:
|
||||||
label: Virtual Machine Snapshots
|
label: Virtual Machine Snapshots
|
||||||
createText: Restore Snapshot
|
createText: Restore Snapshot
|
||||||
|
title: Restore Virtual Machine
|
||||||
snapshot: Snapshot
|
snapshot: Snapshot
|
||||||
|
|
||||||
storage:
|
storage:
|
||||||
@@ -1523,6 +1541,7 @@ harvester:
|
|||||||
useDefault: Use the default storage
|
useDefault: Use the default storage
|
||||||
volumeEncryption: Volume Encryption
|
volumeEncryption: Volume Encryption
|
||||||
secret: Secret
|
secret: Secret
|
||||||
|
volumeExpansionCheckbox: Enable Expansion
|
||||||
migratable:
|
migratable:
|
||||||
label: Migratable
|
label: Migratable
|
||||||
numberOfReplicas:
|
numberOfReplicas:
|
||||||
@@ -1858,6 +1877,32 @@ harvester:
|
|||||||
addLabel: Add CIDR
|
addLabel: Add CIDR
|
||||||
range:
|
range:
|
||||||
addLabel: Add Range
|
addLabel: Add Range
|
||||||
|
hostNetworkConfig:
|
||||||
|
label: Host Networks
|
||||||
|
mode:
|
||||||
|
label: Mode
|
||||||
|
tabs:
|
||||||
|
mode: Mode
|
||||||
|
nodeSelector: Node Selector
|
||||||
|
nodeSelector:
|
||||||
|
addButton: Add Node Selector
|
||||||
|
underlay:
|
||||||
|
label: Underlay
|
||||||
|
tooltip: Allow this interface to act as the underlay for VM overlay networks.
|
||||||
|
conflict: '`{name}` host network config already has underlay enabled. Only one underlay is allowed in the cluster.'
|
||||||
|
noKubeovn:
|
||||||
|
prefix: The kubeovn-operator add-on is not enabled. Click
|
||||||
|
middle: here
|
||||||
|
suffix: to enable the add-on for overlay networking.
|
||||||
|
vlanID:
|
||||||
|
label: VLAN ID
|
||||||
|
ipRange:
|
||||||
|
label: IP Range ({node})
|
||||||
|
placeholder: e.g. 192.168.1.10/24
|
||||||
|
ips:
|
||||||
|
nodeLabel: Node
|
||||||
|
label: IP
|
||||||
|
placeholder: 'e.g. 192.168.1.10/24'
|
||||||
|
|
||||||
service:
|
service:
|
||||||
healthCheckPort:
|
healthCheckPort:
|
||||||
@@ -1903,6 +1948,8 @@ harvester:
|
|||||||
|
|
||||||
migconfiguration:
|
migconfiguration:
|
||||||
label: vGPU MIG Configurations
|
label: vGPU MIG Configurations
|
||||||
|
status:
|
||||||
|
outOfSync: Out of Sync
|
||||||
infoBanner: To configure the MIG configuration, please disable it first and re-enable after editing the configuration.
|
infoBanner: To configure the MIG configuration, please disable it first and re-enable after editing the configuration.
|
||||||
profileSpec: Profile Specs
|
profileSpec: Profile Specs
|
||||||
profileStatus: Profile Status
|
profileStatus: Profile Status
|
||||||
@@ -2174,17 +2221,16 @@ typeLabel:
|
|||||||
other { PCI Devices }
|
other { PCI Devices }
|
||||||
}
|
}
|
||||||
|
|
||||||
persistentvolumeclaim: |-
|
|
||||||
{count, plural,
|
|
||||||
one { Volume }
|
|
||||||
other { Volumes }
|
|
||||||
}
|
|
||||||
|
|
||||||
network.harvesterhci.io.clusternetwork: |-
|
network.harvesterhci.io.clusternetwork: |-
|
||||||
{count, plural,
|
{count, plural,
|
||||||
one { Cluster Network }
|
one { Cluster Network }
|
||||||
other { Cluster Networks }
|
other { Cluster Networks }
|
||||||
}
|
}
|
||||||
|
network.harvesterhci.io.hostnetworkconfig: |-
|
||||||
|
{count, plural,
|
||||||
|
one { Host Network }
|
||||||
|
other { Host Networks }
|
||||||
|
}
|
||||||
harvesterhci.io.addon: |-
|
harvesterhci.io.addon: |-
|
||||||
{count, plural,
|
{count, plural,
|
||||||
one { Add-on }
|
one { Add-on }
|
||||||
|
|||||||
@@ -112,6 +112,7 @@ export default {
|
|||||||
value: 'connectivity',
|
value: 'connectivity',
|
||||||
labelKey: 'tableHeaders.routeConnectivity',
|
labelKey: 'tableHeaders.routeConnectivity',
|
||||||
formatter: 'NetworkRouteConnectivity',
|
formatter: 'NetworkRouteConnectivity',
|
||||||
|
tooltip: 'harvester.tableHeaders.routeConnectivityTooltip',
|
||||||
formatterOpts: { arbitrary: true },
|
formatterOpts: { arbitrary: true },
|
||||||
width: 130,
|
width: 130,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -106,8 +106,8 @@ export default {
|
|||||||
name: 'AttachedVM',
|
name: 'AttachedVM',
|
||||||
labelKey: 'tableHeaders.attachedVM',
|
labelKey: 'tableHeaders.attachedVM',
|
||||||
type: 'attached',
|
type: 'attached',
|
||||||
value: 'spec.claimRef',
|
value: 'attachVMName',
|
||||||
sort: 'name',
|
sort: 'attachVMName',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'VolumeSnapshotCounts',
|
name: 'VolumeSnapshotCounts',
|
||||||
@@ -134,8 +134,8 @@ export default {
|
|||||||
return row?.attachVM?.detailLocation;
|
return row?.attachVM?.detailLocation;
|
||||||
},
|
},
|
||||||
|
|
||||||
getVMName(row) {
|
getAttachedVMName(row) {
|
||||||
return row.attachVM?.metadata?.name || '';
|
return row.attachVMName || '';
|
||||||
},
|
},
|
||||||
|
|
||||||
isInternalStorageClass(storageClassName) {
|
isInternalStorageClass(storageClassName) {
|
||||||
@@ -173,10 +173,10 @@ export default {
|
|||||||
<template #cell:AttachedVM="{row}">
|
<template #cell:AttachedVM="{row}">
|
||||||
<div>
|
<div>
|
||||||
<router-link
|
<router-link
|
||||||
v-if="getVMName(row)"
|
v-if="getAttachedVMName(row)"
|
||||||
:to="goTo(row)"
|
:to="goTo(row)"
|
||||||
>
|
>
|
||||||
{{ getVMName(row) }}
|
{{ getAttachedVMName(row) }}
|
||||||
</router-link>
|
</router-link>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
<script>
|
<script>
|
||||||
|
import { mapGetters } from 'vuex';
|
||||||
import ResourceTable from '@shell/components/ResourceTable';
|
import ResourceTable from '@shell/components/ResourceTable';
|
||||||
import { STATE, AGE, NAME, NAMESPACE } from '@shell/config/table-headers';
|
import { STATE, AGE, NAME, NAMESPACE } from '@shell/config/table-headers';
|
||||||
import {
|
import {
|
||||||
@@ -22,6 +23,8 @@ export const VM_HEADERS = [
|
|||||||
{
|
{
|
||||||
...NAME,
|
...NAME,
|
||||||
width: 350,
|
width: 350,
|
||||||
|
value: 'nameDisplay',
|
||||||
|
sort: ['nameDisplay'],
|
||||||
},
|
},
|
||||||
NAMESPACE,
|
NAMESPACE,
|
||||||
{
|
{
|
||||||
@@ -98,19 +101,9 @@ export default {
|
|||||||
this.hasNode = true;
|
this.hasNode = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.$store.getters[`${ inStore }/schemaFor`](HCI.NODE_NETWORK)) {
|
|
||||||
_hash.nodeNetworks = this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.NODE_NETWORK });
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.$store.getters[`${ inStore }/schemaFor`](HCI.CLUSTER_NETWORK)) {
|
|
||||||
_hash.clusterNetworks = this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.CLUSTER_NETWORK });
|
|
||||||
}
|
|
||||||
|
|
||||||
const hash = await allHash(_hash);
|
const hash = await allHash(_hash);
|
||||||
|
|
||||||
this.allVMs = hash.vms;
|
this.allVMs = hash.vms;
|
||||||
this.allNodeNetworks = hash.nodeNetworks || [];
|
|
||||||
this.allClusterNetworks = hash.clusterNetworks || [];
|
|
||||||
},
|
},
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
@@ -118,14 +111,14 @@ export default {
|
|||||||
hasNode: false,
|
hasNode: false,
|
||||||
allVMs: [],
|
allVMs: [],
|
||||||
allVMIs: [],
|
allVMIs: [],
|
||||||
allNodeNetworks: [],
|
|
||||||
allClusterNetworks: [],
|
|
||||||
restartNotificationDisplayed: false,
|
restartNotificationDisplayed: false,
|
||||||
HCI
|
HCI
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
computed: {
|
computed: {
|
||||||
|
...mapGetters({ actionCb: 'action-menu/performCallbackData' }),
|
||||||
|
|
||||||
headers() {
|
headers() {
|
||||||
const restoreCol = {
|
const restoreCol = {
|
||||||
name: 'restoreProgress',
|
name: 'restoreProgress',
|
||||||
@@ -192,6 +185,13 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
watch: {
|
watch: {
|
||||||
|
actionCb(neu) {
|
||||||
|
if (neu?.clearTableSelection) {
|
||||||
|
this.$refs.resourceTable.clearSelection();
|
||||||
|
this.$store.dispatch('action-menu/clearCallbackData');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
vmRestartRequiredNames(vmNames) {
|
vmRestartRequiredNames(vmNames) {
|
||||||
const count = vmNames.length;
|
const count = vmNames.length;
|
||||||
|
|
||||||
@@ -230,6 +230,7 @@ export default {
|
|||||||
<Loading v-if="$fetchState.pending" />
|
<Loading v-if="$fetchState.pending" />
|
||||||
<div v-else>
|
<div v-else>
|
||||||
<ResourceTable
|
<ResourceTable
|
||||||
|
ref="resourceTable"
|
||||||
v-bind="$attrs"
|
v-bind="$attrs"
|
||||||
:headers="headers"
|
:headers="headers"
|
||||||
default-sort-by="age"
|
default-sort-by="age"
|
||||||
@@ -246,8 +247,6 @@ export default {
|
|||||||
<HarvesterVmState
|
<HarvesterVmState
|
||||||
class="vmstate"
|
class="vmstate"
|
||||||
:row="scope.row"
|
:row="scope.row"
|
||||||
:all-node-network="allNodeNetworks"
|
|
||||||
:all-cluster-network="allClusterNetworks"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -258,7 +257,7 @@ export default {
|
|||||||
v-if="scope.row.type !== HCI.VMI"
|
v-if="scope.row.type !== HCI.VMI"
|
||||||
:to="scope.row.detailLocation"
|
:to="scope.row.detailLocation"
|
||||||
>
|
>
|
||||||
{{ scope.row.metadata.name }}
|
{{ scope.row.nameDisplay }}
|
||||||
<i
|
<i
|
||||||
v-if="scope.row.encryptedVolumeType !== 'none'"
|
v-if="scope.row.encryptedVolumeType !== 'none'"
|
||||||
v-tooltip="lockIconTooltipMessage(scope.row)"
|
v-tooltip="lockIconTooltipMessage(scope.row)"
|
||||||
@@ -267,7 +266,7 @@ export default {
|
|||||||
/>
|
/>
|
||||||
</router-link>
|
</router-link>
|
||||||
<span v-else>
|
<span v-else>
|
||||||
{{ scope.row.metadata.name }}
|
{{ scope.row.nameDisplay }}
|
||||||
</span>
|
</span>
|
||||||
<ConsoleBar
|
<ConsoleBar
|
||||||
:resource-type="scope.row"
|
:resource-type="scope.row"
|
||||||
|
|||||||
@@ -0,0 +1,86 @@
|
|||||||
|
<script>
|
||||||
|
import ResourceTable from '@shell/components/ResourceTable';
|
||||||
|
import Loading from '@shell/components/Loading';
|
||||||
|
import { STATE, NAME as NAME_COL, AGE } from '@shell/config/table-headers';
|
||||||
|
import { HCI } from '../types';
|
||||||
|
|
||||||
|
const UNDERLAY = {
|
||||||
|
name: 'underlay',
|
||||||
|
labelKey: 'harvester.tableHeaders.hostNetworkConfig.underlay',
|
||||||
|
tooltip: 'harvester.tableHeaders.hostNetworkConfig.underlayTooltip',
|
||||||
|
value: 'spec.underlay',
|
||||||
|
sort: 'spec.underlay',
|
||||||
|
formatter: 'HarvesterBoolean',
|
||||||
|
};
|
||||||
|
|
||||||
|
const VLAN_ID = {
|
||||||
|
name: 'vlanID',
|
||||||
|
labelKey: 'harvester.tableHeaders.hostNetworkConfig.vlanID',
|
||||||
|
value: 'spec.vlanID',
|
||||||
|
sort: 'spec.vlanID',
|
||||||
|
};
|
||||||
|
|
||||||
|
const MODE = {
|
||||||
|
name: 'mode',
|
||||||
|
labelKey: 'harvester.tableHeaders.hostNetworkConfig.mode',
|
||||||
|
value: 'spec.mode',
|
||||||
|
sort: 'spec.mode',
|
||||||
|
formatter: 'HarvesterHostNetworkConfigMode',
|
||||||
|
};
|
||||||
|
|
||||||
|
const CLUSTER_NETWORK = {
|
||||||
|
name: 'clusterNetwork',
|
||||||
|
labelKey: 'harvester.tableHeaders.hostNetworkConfig.clusterNetwork',
|
||||||
|
value: 'spec.clusterNetwork',
|
||||||
|
sort: 'spec.clusterNetwork',
|
||||||
|
align: 'center',
|
||||||
|
};
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'HarvesterListHostNetworkConfig',
|
||||||
|
components: { ResourceTable, Loading },
|
||||||
|
|
||||||
|
inheritAttrs: false,
|
||||||
|
|
||||||
|
async fetch() {
|
||||||
|
const inStore = this.$store.getters['currentProduct'].inStore;
|
||||||
|
|
||||||
|
this.rows = await this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.HOST_NETWORK_CONFIG });
|
||||||
|
},
|
||||||
|
|
||||||
|
data() {
|
||||||
|
return { rows: [] };
|
||||||
|
},
|
||||||
|
|
||||||
|
computed: {
|
||||||
|
schema() {
|
||||||
|
const inStore = this.$store.getters['currentProduct'].inStore;
|
||||||
|
|
||||||
|
return this.$store.getters[`${ inStore }/schemaFor`](HCI.HOST_NETWORK_CONFIG);
|
||||||
|
},
|
||||||
|
headers() {
|
||||||
|
return [
|
||||||
|
STATE,
|
||||||
|
NAME_COL,
|
||||||
|
UNDERLAY,
|
||||||
|
VLAN_ID,
|
||||||
|
MODE,
|
||||||
|
CLUSTER_NETWORK,
|
||||||
|
AGE,
|
||||||
|
];
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<Loading v-if="$fetchState.pending" />
|
||||||
|
<ResourceTable
|
||||||
|
v-else
|
||||||
|
v-bind="$attrs"
|
||||||
|
:headers="headers"
|
||||||
|
:rows="rows"
|
||||||
|
:schema="schema"
|
||||||
|
key-field="_key"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
@@ -12,7 +12,7 @@ import { base64Decode } from '@shell/utils/crypto';
|
|||||||
import { formatSi, parseSi } from '@shell/utils/units';
|
import { formatSi, parseSi } from '@shell/utils/units';
|
||||||
import { _CLONE, _CREATE, _VIEW } from '@shell/config/query-params';
|
import { _CLONE, _CREATE, _VIEW } from '@shell/config/query-params';
|
||||||
import {
|
import {
|
||||||
PV, PVC, STORAGE_CLASS, NODE, SECRET, CONFIG_MAP, NETWORK_ATTACHMENT, NAMESPACE, LONGHORN
|
PV, PVC, STORAGE_CLASS, NODE, SECRET, CONFIG_MAP, SERVICE_ACCOUNT, NETWORK_ATTACHMENT, NAMESPACE, LONGHORN
|
||||||
} from '@shell/config/types';
|
} from '@shell/config/types';
|
||||||
import { HOSTNAME } from '@shell/config/labels-annotations';
|
import { HOSTNAME } from '@shell/config/labels-annotations';
|
||||||
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
|
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
|
||||||
@@ -25,7 +25,7 @@ import { HCI } from '../../types';
|
|||||||
import { parseVolumeClaimTemplates, EMPTY_IMAGE } from '../../utils/vm';
|
import { parseVolumeClaimTemplates, EMPTY_IMAGE } from '../../utils/vm';
|
||||||
import impl, { QGA_JSON, USB_TABLET } from './impl';
|
import impl, { QGA_JSON, USB_TABLET } from './impl';
|
||||||
import { GIBIBYTE } from '../../utils/unit';
|
import { GIBIBYTE } from '../../utils/unit';
|
||||||
import { VOLUME_MODE } from '@pkg/harvester/config/types';
|
import { VOLUME_MODE, FILESYSTEM_SOURCE_TYPE } from '@pkg/harvester/config/types';
|
||||||
|
|
||||||
const LONGHORN_V2_DATA_ENGINE = 'longhorn-system/v2-data-engine';
|
const LONGHORN_V2_DATA_ENGINE = 'longhorn-system/v2-data-engine';
|
||||||
|
|
||||||
@@ -102,6 +102,8 @@ export default {
|
|||||||
vmims: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VMIM }),
|
vmims: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VMIM }),
|
||||||
vms: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VM }),
|
vms: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VM }),
|
||||||
secrets: this.$store.dispatch(`${ inStore }/findAll`, { type: SECRET }),
|
secrets: this.$store.dispatch(`${ inStore }/findAll`, { type: SECRET }),
|
||||||
|
configMaps: this.$store.dispatch(`${ inStore }/findAll`, { type: CONFIG_MAP }),
|
||||||
|
serviceAccounts: this.$store.dispatch(`${ inStore }/findAll`, { type: SERVICE_ACCOUNT }),
|
||||||
addons: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.ADD_ONS }),
|
addons: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.ADD_ONS }),
|
||||||
longhornV2Engine: this.$store.dispatch(`${ inStore }/find`, { type: LONGHORN.SETTINGS, id: LONGHORN_V2_DATA_ENGINE }),
|
longhornV2Engine: this.$store.dispatch(`${ inStore }/find`, { type: LONGHORN.SETTINGS, id: LONGHORN_V2_DATA_ENGINE }),
|
||||||
};
|
};
|
||||||
@@ -156,6 +158,7 @@ export default {
|
|||||||
imageId: '',
|
imageId: '',
|
||||||
diskRows: [],
|
diskRows: [],
|
||||||
networkRows: [],
|
networkRows: [],
|
||||||
|
filesystemRows: [],
|
||||||
machineType: '',
|
machineType: '',
|
||||||
machineTypes: [],
|
machineTypes: [],
|
||||||
secretName: '',
|
secretName: '',
|
||||||
@@ -440,6 +443,7 @@ export default {
|
|||||||
this['imageId'] = imageId;
|
this['imageId'] = imageId;
|
||||||
|
|
||||||
this['diskRows'] = diskRows;
|
this['diskRows'] = diskRows;
|
||||||
|
this['filesystemRows'] = this.getFilesystemRows(vm);
|
||||||
|
|
||||||
this.refreshYamlEditor();
|
this.refreshYamlEditor();
|
||||||
},
|
},
|
||||||
@@ -641,6 +645,80 @@ export default {
|
|||||||
this.parseAccessCredentials();
|
this.parseAccessCredentials();
|
||||||
this.parseNetworkRows(this.networkRows);
|
this.parseNetworkRows(this.networkRows);
|
||||||
this.parseDiskRows(this.diskRows);
|
this.parseDiskRows(this.diskRows);
|
||||||
|
this.parseFilesystemRows();
|
||||||
|
},
|
||||||
|
|
||||||
|
getFilesystemRows(vm) {
|
||||||
|
const _filesystems = vm.spec.template.spec.domain.devices?.filesystems || [];
|
||||||
|
const _volumes = vm.spec.template.spec.volumes || [];
|
||||||
|
|
||||||
|
return _filesystems.map((fs) => {
|
||||||
|
const volume = _volumes.find((v) => v.name === fs.name);
|
||||||
|
let fsType = FILESYSTEM_SOURCE_TYPE.CONFIGMAP;
|
||||||
|
let resourceName = '';
|
||||||
|
|
||||||
|
if (volume?.configMap) {
|
||||||
|
fsType = FILESYSTEM_SOURCE_TYPE.CONFIGMAP;
|
||||||
|
resourceName = volume.configMap.name;
|
||||||
|
} else if (volume?.secret) {
|
||||||
|
fsType = FILESYSTEM_SOURCE_TYPE.SECRET;
|
||||||
|
resourceName = volume.secret.secretName;
|
||||||
|
} else if (volume?.serviceAccount) {
|
||||||
|
fsType = FILESYSTEM_SOURCE_TYPE.SERVICEACCOUNT;
|
||||||
|
resourceName = volume.serviceAccount.serviceAccountName;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
fsType,
|
||||||
|
volumeName: fs.name,
|
||||||
|
resourceName,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
parseFilesystemRows() {
|
||||||
|
const completedRows = this.filesystemRows.filter(
|
||||||
|
(r) => r.fsType && r.volumeName && r.resourceName
|
||||||
|
);
|
||||||
|
|
||||||
|
const filesystems = completedRows.map((r) => ({
|
||||||
|
name: r.volumeName,
|
||||||
|
virtiofs: {},
|
||||||
|
}));
|
||||||
|
|
||||||
|
const fsVolumes = completedRows.map((r) => {
|
||||||
|
if (r.fsType === FILESYSTEM_SOURCE_TYPE.CONFIGMAP) {
|
||||||
|
return {
|
||||||
|
name: r.volumeName,
|
||||||
|
configMap: { name: r.resourceName },
|
||||||
|
};
|
||||||
|
} else if (r.fsType === FILESYSTEM_SOURCE_TYPE.SECRET) {
|
||||||
|
return {
|
||||||
|
name: r.volumeName,
|
||||||
|
secret: { secretName: r.resourceName },
|
||||||
|
};
|
||||||
|
} else if (r.fsType === FILESYSTEM_SOURCE_TYPE.SERVICEACCOUNT) {
|
||||||
|
return {
|
||||||
|
name: r.volumeName,
|
||||||
|
serviceAccount: { serviceAccountName: r.resourceName },
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}).filter(Boolean);
|
||||||
|
|
||||||
|
if (filesystems.length > 0) {
|
||||||
|
this.spec.template.spec.domain.devices['filesystems'] = filesystems;
|
||||||
|
} else {
|
||||||
|
delete this.spec.template.spec.domain.devices['filesystems'];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fsVolumes.length > 0) {
|
||||||
|
if (!this.spec.template.spec.volumes) {
|
||||||
|
this.spec.template.spec['volumes'] = [];
|
||||||
|
}
|
||||||
|
this.spec.template.spec.volumes.push(...fsVolumes);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
parseOther() {
|
parseOther() {
|
||||||
@@ -907,14 +985,22 @@ export default {
|
|||||||
const specInterfaces = this.spec?.template?.spec?.domain?.devices?.interfaces;
|
const specInterfaces = this.spec?.template?.spec?.domain?.devices?.interfaces;
|
||||||
const mergedInterfaces = this.mergeInterfaceList(specInterfaces, interfaces);
|
const mergedInterfaces = this.mergeInterfaceList(specInterfaces, interfaces);
|
||||||
|
|
||||||
|
const devices = {
|
||||||
|
...this.spec.template.spec.domain.devices,
|
||||||
|
interfaces: mergedInterfaces,
|
||||||
|
};
|
||||||
|
|
||||||
|
if (this.isEdit && networkRow.length === 0) {
|
||||||
|
devices.autoattachPodInterface = false;
|
||||||
|
} else {
|
||||||
|
delete devices.autoattachPodInterface;
|
||||||
|
}
|
||||||
|
|
||||||
const spec = {
|
const spec = {
|
||||||
...this.spec.template.spec,
|
...this.spec.template.spec,
|
||||||
domain: {
|
domain: {
|
||||||
...this.spec.template.spec.domain,
|
...this.spec.template.spec.domain,
|
||||||
devices: {
|
devices,
|
||||||
...this.spec.template.spec.domain.devices,
|
|
||||||
interfaces: mergedInterfaces,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
networks
|
networks
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import HarvesterResource from './harvester';
|
|||||||
export default class MIGCONFIGURATION extends HarvesterResource {
|
export default class MIGCONFIGURATION extends HarvesterResource {
|
||||||
get _availableActions() {
|
get _availableActions() {
|
||||||
let out = super._availableActions;
|
let out = super._availableActions;
|
||||||
|
const canUpdate = !!this.linkFor('update');
|
||||||
|
|
||||||
out = out.map((action) => {
|
out = out.map((action) => {
|
||||||
if (action.action === 'showConfiguration') {
|
if (action.action === 'showConfiguration') {
|
||||||
@@ -26,13 +27,13 @@ export default class MIGCONFIGURATION extends HarvesterResource {
|
|||||||
out.push(
|
out.push(
|
||||||
{
|
{
|
||||||
action: 'enableConfig',
|
action: 'enableConfig',
|
||||||
enabled: !this.isEnabled,
|
enabled: !this.isEnabled && canUpdate,
|
||||||
icon: 'icon icon-fw icon-dot',
|
icon: 'icon icon-fw icon-dot',
|
||||||
label: 'Enable',
|
label: 'Enable',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
action: 'disableConfig',
|
action: 'disableConfig',
|
||||||
enabled: this.isEnabled,
|
enabled: this.isEnabled && canUpdate,
|
||||||
icon: 'icon icon-fw icon-dot-open',
|
icon: 'icon icon-fw icon-dot-open',
|
||||||
label: 'Disable',
|
label: 'Disable',
|
||||||
},
|
},
|
||||||
@@ -62,13 +63,27 @@ export default class MIGCONFIGURATION extends HarvesterResource {
|
|||||||
}
|
}
|
||||||
|
|
||||||
get stateDisplay() {
|
get stateDisplay() {
|
||||||
|
if (this.configStatus === 'out-of-sync') {
|
||||||
|
return this.t('harvester.migconfiguration.status.outOfSync');
|
||||||
|
}
|
||||||
|
|
||||||
return this.actualState;
|
return this.actualState;
|
||||||
}
|
}
|
||||||
|
|
||||||
get stateColor() {
|
get stateDescription() {
|
||||||
const state = this.actualState;
|
if (this.status?.message) {
|
||||||
|
return this.status.message;
|
||||||
|
}
|
||||||
|
|
||||||
return colorForState(state);
|
return super.stateDescription;
|
||||||
|
}
|
||||||
|
|
||||||
|
get stateColor() {
|
||||||
|
if (this.configStatus === 'out-of-sync') {
|
||||||
|
return 'text-warning';
|
||||||
|
}
|
||||||
|
|
||||||
|
return colorForState(this.actualState);
|
||||||
}
|
}
|
||||||
|
|
||||||
get isEnabled() {
|
get isEnabled() {
|
||||||
|
|||||||
@@ -30,12 +30,11 @@ const STATUS_DISPLAY = {
|
|||||||
export default class PCIDevice extends SteveModel {
|
export default class PCIDevice extends SteveModel {
|
||||||
get _availableActions() {
|
get _availableActions() {
|
||||||
const out = super._availableActions;
|
const out = super._availableActions;
|
||||||
const canUpdate = !!this.linkFor('update');
|
|
||||||
|
|
||||||
out.push(
|
out.push(
|
||||||
{
|
{
|
||||||
action: 'enablePassthroughBulk',
|
action: 'enablePassthroughBulk',
|
||||||
enabled: !this.isEnabling && !this.isvGPUDevice && canUpdate,
|
enabled: !this.isEnabling && !this.isvGPUDevice && this.canUpdate,
|
||||||
icon: 'icon icon-fw icon-dot',
|
icon: 'icon icon-fw icon-dot',
|
||||||
label: 'Enable Passthrough',
|
label: 'Enable Passthrough',
|
||||||
bulkable: true,
|
bulkable: true,
|
||||||
@@ -44,7 +43,7 @@ export default class PCIDevice extends SteveModel {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
action: 'disablePassthrough',
|
action: 'disablePassthrough',
|
||||||
enabled: this.isEnabling && this.claimedByMe && !this.isvGPUDevice && canUpdate,
|
enabled: this.isEnabling && this.claimedByMe && !this.isvGPUDevice && this.canUpdate,
|
||||||
icon: 'icon icon-fw icon-dot-open',
|
icon: 'icon icon-fw icon-dot-open',
|
||||||
label: 'Disable Passthrough',
|
label: 'Disable Passthrough',
|
||||||
bulkable: true,
|
bulkable: true,
|
||||||
@@ -55,6 +54,10 @@ export default class PCIDevice extends SteveModel {
|
|||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get canUpdate() {
|
||||||
|
return !!this.linkFor('update');
|
||||||
|
}
|
||||||
|
|
||||||
get isvGPUDevice() {
|
get isvGPUDevice() {
|
||||||
if (!this.vGPUAsPCIDeviceFeatureEnabled) {
|
if (!this.vGPUAsPCIDeviceFeatureEnabled) {
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -16,13 +16,13 @@ export default class SRIOVDevice extends SteveModel {
|
|||||||
out.push(
|
out.push(
|
||||||
{
|
{
|
||||||
action: 'enableDevice',
|
action: 'enableDevice',
|
||||||
enabled: !this.isEnabled,
|
enabled: !this.isEnabled && this.canUpdate,
|
||||||
icon: 'icon icon-fw icon-dot',
|
icon: 'icon icon-fw icon-dot',
|
||||||
label: 'Enable',
|
label: 'Enable',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
action: 'disableDevice',
|
action: 'disableDevice',
|
||||||
enabled: this.isEnabled,
|
enabled: this.isEnabled && this.canUpdate,
|
||||||
icon: 'icon icon-fw icon-dot-open',
|
icon: 'icon icon-fw icon-dot-open',
|
||||||
label: 'Disable',
|
label: 'Disable',
|
||||||
},
|
},
|
||||||
@@ -31,6 +31,10 @@ export default class SRIOVDevice extends SteveModel {
|
|||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get canUpdate() {
|
||||||
|
return !!this.linkFor('update');
|
||||||
|
}
|
||||||
|
|
||||||
get canYaml() {
|
get canYaml() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ export default class USBDevice extends SteveModel {
|
|||||||
out.push(
|
out.push(
|
||||||
{
|
{
|
||||||
action: 'enablePassthroughBulk',
|
action: 'enablePassthroughBulk',
|
||||||
enabled: !this.passthroughClaim && !this.status.enabled,
|
enabled: !this.passthroughClaim && !this.status.enabled && this.canUpdate,
|
||||||
icon: 'icon icon-fw icon-dot',
|
icon: 'icon icon-fw icon-dot',
|
||||||
label: 'Enable Passthrough',
|
label: 'Enable Passthrough',
|
||||||
bulkable: true,
|
bulkable: true,
|
||||||
@@ -42,7 +42,7 @@ export default class USBDevice extends SteveModel {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
action: 'disablePassthrough',
|
action: 'disablePassthrough',
|
||||||
enabled: this.status.enabled,
|
enabled: this.status.enabled && this.canUpdate,
|
||||||
icon: 'icon icon-fw icon-dot-open',
|
icon: 'icon icon-fw icon-dot-open',
|
||||||
label: 'Disable Passthrough',
|
label: 'Disable Passthrough',
|
||||||
bulkable: true,
|
bulkable: true,
|
||||||
@@ -53,6 +53,10 @@ export default class USBDevice extends SteveModel {
|
|||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get canUpdate() {
|
||||||
|
return !!this.linkFor('update');
|
||||||
|
}
|
||||||
|
|
||||||
get canYaml() {
|
get canYaml() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,17 +27,18 @@ const STATUS_DISPLAY = {
|
|||||||
export default class VGpuDevice extends SteveModel {
|
export default class VGpuDevice extends SteveModel {
|
||||||
get _availableActions() {
|
get _availableActions() {
|
||||||
const out = super._availableActions;
|
const out = super._availableActions;
|
||||||
|
const canUpdate = !!this.linkFor('update');
|
||||||
|
|
||||||
out.push(
|
out.push(
|
||||||
{
|
{
|
||||||
action: 'enableVGpu',
|
action: 'enableVGpu',
|
||||||
enabled: !this.isEnabled,
|
enabled: !this.isEnabled && canUpdate,
|
||||||
icon: 'icon icon-fw icon-dot',
|
icon: 'icon icon-fw icon-dot',
|
||||||
label: 'Enable',
|
label: 'Enable',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
action: 'disableVGpu',
|
action: 'disableVGpu',
|
||||||
enabled: this.isEnabled,
|
enabled: this.isEnabled && canUpdate,
|
||||||
icon: 'icon icon-fw icon-dot-open',
|
icon: 'icon icon-fw icon-dot-open',
|
||||||
label: 'Disable',
|
label: 'Disable',
|
||||||
bulkable: true,
|
bulkable: true,
|
||||||
|
|||||||
@@ -235,6 +235,10 @@ export default class HciPv extends HarvesterResource {
|
|||||||
return allVMs.find(findAttachVM);
|
return allVMs.find(findAttachVM);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get attachVMName() {
|
||||||
|
return this.attachVM?.nameDisplay || this.attachVM?.metadata?.name || '';
|
||||||
|
}
|
||||||
|
|
||||||
get isAvailable() {
|
get isAvailable() {
|
||||||
const unAvailable = ['Resizing', 'Not Ready'];
|
const unAvailable = ['Resizing', 'Not Ready'];
|
||||||
|
|
||||||
|
|||||||
@@ -96,6 +96,10 @@ export default class HciStorageClass extends StorageClass {
|
|||||||
return this.$rootGetters['harvester-common/getFeatureEnabled']('volumeEncryption');
|
return this.$rootGetters['harvester-common/getFeatureEnabled']('volumeEncryption');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get expandOnlineEncryptedVolumeFeatureEnabled() {
|
||||||
|
return this.$rootGetters['harvester-common/getFeatureEnabled']('expandOnlineEncryptedVolume');
|
||||||
|
}
|
||||||
|
|
||||||
get thirdPartyStorageFeatureEnabled() {
|
get thirdPartyStorageFeatureEnabled() {
|
||||||
return this.$rootGetters['harvester-common/getFeatureEnabled']('thirdPartyStorage');
|
return this.$rootGetters['harvester-common/getFeatureEnabled']('thirdPartyStorage');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,17 +23,17 @@ export default class HciVmTemplateVersion extends HarvesterResource {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const schema = this.$getters['schemaFor'](HCI.VM);
|
const schema = this.$getters['schemaFor'](HCI.VM);
|
||||||
let canCreateVM = true;
|
let canCreateVM = false;
|
||||||
|
|
||||||
if ( schema && !schema?.collectionMethods.find((x) => ['post'].includes(x.toLowerCase())) ) {
|
if (schema?.collectionMethods.find((x) => ['post'].includes(x.toLowerCase())) ) {
|
||||||
canCreateVM = false;
|
canCreateVM = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
action: 'launchFromTemplate',
|
action: 'launchFromTemplate',
|
||||||
icon: 'icon icon-spinner',
|
icon: 'icon icon-spinner',
|
||||||
disabled: !canCreateVM || !this.isReady,
|
enabled: canCreateVM && this.isReady,
|
||||||
label: this.t('harvester.action.launchFormTemplate'),
|
label: this.t('harvester.action.launchFormTemplate'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -123,7 +123,12 @@ const IgnoreMessages = ['pod has unbound immediate PersistentVolumeClaims'];
|
|||||||
|
|
||||||
export default class VirtVm extends HarvesterResource {
|
export default class VirtVm extends HarvesterResource {
|
||||||
get availableActions() {
|
get availableActions() {
|
||||||
const out = super._availableActions;
|
let out = super._availableActions;
|
||||||
|
|
||||||
|
if (this.isCloneBackendStorageCloning || this.isCloneBackendStorageFailed) {
|
||||||
|
out = out.filter(({ action }) => action !== 'goToClone');
|
||||||
|
}
|
||||||
|
|
||||||
const clone = out.find((action) => action.action === 'goToClone');
|
const clone = out.find((action) => action.action === 'goToClone');
|
||||||
|
|
||||||
if (clone) {
|
if (clone) {
|
||||||
@@ -164,6 +169,7 @@ export default class VirtVm extends HarvesterResource {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
action: 'restartVM',
|
action: 'restartVM',
|
||||||
|
altAction: 'altRestartVM',
|
||||||
enabled: !!this.actions?.restart,
|
enabled: !!this.actions?.restart,
|
||||||
icon: 'icon icon-refresh',
|
icon: 'icon icon-refresh',
|
||||||
label: this.t('harvester.action.restart'),
|
label: this.t('harvester.action.restart'),
|
||||||
@@ -172,6 +178,7 @@ export default class VirtVm extends HarvesterResource {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
action: 'softrebootVM',
|
action: 'softrebootVM',
|
||||||
|
altAction: 'doSoftReboot',
|
||||||
enabled: !!this.actions?.softreboot,
|
enabled: !!this.actions?.softreboot,
|
||||||
icon: 'icon icon-pipeline',
|
icon: 'icon icon-pipeline',
|
||||||
label: this.t('harvester.action.softreboot')
|
label: this.t('harvester.action.softreboot')
|
||||||
@@ -181,7 +188,8 @@ export default class VirtVm extends HarvesterResource {
|
|||||||
enabled: !!this.actions?.start,
|
enabled: !!this.actions?.start,
|
||||||
icon: 'icon icon-play',
|
icon: 'icon icon-play',
|
||||||
label: this.t('harvester.action.start'),
|
label: this.t('harvester.action.start'),
|
||||||
bulkable: true
|
bulkable: true,
|
||||||
|
bulkAction: 'startVM'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
action: 'backupVM',
|
action: 'backupVM',
|
||||||
@@ -229,7 +237,9 @@ export default class VirtVm extends HarvesterResource {
|
|||||||
action: 'migrateVM',
|
action: 'migrateVM',
|
||||||
enabled: !!this.actions?.migrate,
|
enabled: !!this.actions?.migrate,
|
||||||
icon: 'icon icon-copy',
|
icon: 'icon icon-copy',
|
||||||
label: this.t('harvester.action.migrate')
|
label: this.t('harvester.action.vmMigrate'),
|
||||||
|
bulkable: true,
|
||||||
|
bulkAction: 'migrateVM'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
action: 'abortMigrationVM',
|
action: 'abortMigrationVM',
|
||||||
@@ -540,16 +550,38 @@ export default class VirtVm extends HarvesterResource {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
altStopVM() {
|
async altRestartVM() {
|
||||||
this.doActionGrowl('stop', {});
|
await this.doActionGrowl('restart', {});
|
||||||
|
this.$dispatch('promptModal', { performCallback: true, clearTableSelection: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
forceStop() {
|
async altStopVM() {
|
||||||
this.doActionGrowl('forceStop', {});
|
await this.doActionGrowl('stop', {});
|
||||||
|
this.$dispatch('promptModal', { performCallback: true, clearTableSelection: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
startVM() {
|
async forceStop() {
|
||||||
this.doActionGrowl('start', {});
|
await this.doActionGrowl('forceStop', {});
|
||||||
|
this.$dispatch('promptModal', { performCallback: true, clearTableSelection: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
async startVM(resources = this) {
|
||||||
|
const list = Array.isArray(resources) ? resources : [resources];
|
||||||
|
|
||||||
|
for (const r of list) {
|
||||||
|
await r.doActionGrowl('start', {});
|
||||||
|
}
|
||||||
|
this.$dispatch('promptModal', { performCallback: true, clearTableSelection: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
async download() {
|
||||||
|
await super.download();
|
||||||
|
this.$dispatch('promptModal', { performCallback: true, clearTableSelection: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
async downloadBulk(items) {
|
||||||
|
await super.downloadBulk(items);
|
||||||
|
this.$dispatch('promptModal', { performCallback: true, clearTableSelection: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
migrateVM(resources = this) {
|
migrateVM(resources = this) {
|
||||||
@@ -762,6 +794,18 @@ export default class VirtVm extends HarvesterResource {
|
|||||||
return this.volumes.filter((volume) => volume?.isLonghornV2);
|
return this.volumes.filter((volume) => volume?.isLonghornV2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get cloneBackendStorageStatus() {
|
||||||
|
return this.metadata?.annotations?.[HCI_ANNOTATIONS.CLONE_BACKEND_STORAGE_STATUS]?.toLowerCase() || '';
|
||||||
|
}
|
||||||
|
|
||||||
|
get isCloneBackendStorageCloning() {
|
||||||
|
return this.cloneBackendStorageStatus === 'cloning';
|
||||||
|
}
|
||||||
|
|
||||||
|
get isCloneBackendStorageFailed() {
|
||||||
|
return this.cloneBackendStorageStatus === 'failed';
|
||||||
|
}
|
||||||
|
|
||||||
get encryptedVolumeType() {
|
get encryptedVolumeType() {
|
||||||
if (!this.volumes || this.volumes.length === 0) {
|
if (!this.volumes || this.volumes.length === 0) {
|
||||||
return 'none';
|
return 'none';
|
||||||
@@ -817,13 +861,21 @@ export default class VirtVm extends HarvesterResource {
|
|||||||
!this.isVMExpectedRunning &&
|
!this.isVMExpectedRunning &&
|
||||||
this.isVMCreated &&
|
this.isVMCreated &&
|
||||||
this.vmi?.status?.phase === VMIPhase.Pending
|
this.vmi?.status?.phase === VMIPhase.Pending
|
||||||
) || (this.metadata?.annotations?.[HCI_ANNOTATIONS.CLONE_BACKEND_STORAGE_STATUS] === 'cloning')) {
|
) || this.isCloneBackendStorageCloning) {
|
||||||
return { status: VMIPhase.Pending };
|
return { status: VMIPhase.Pending };
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get isCloneFailed() {
|
||||||
|
if (this.isCloneBackendStorageFailed) {
|
||||||
|
return { status: VMIPhase.Failed };
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
get isStopping() {
|
get isStopping() {
|
||||||
if (this &&
|
if (this &&
|
||||||
!this.isVMExpectedRunning &&
|
!this.isVMExpectedRunning &&
|
||||||
@@ -980,6 +1032,7 @@ export default class VirtVm extends HarvesterResource {
|
|||||||
this.isUnschedulable?.status ||
|
this.isUnschedulable?.status ||
|
||||||
this.isPaused?.status ||
|
this.isPaused?.status ||
|
||||||
this.isVMError?.status ||
|
this.isVMError?.status ||
|
||||||
|
this.isCloneFailed?.status ||
|
||||||
this.isPending?.status ||
|
this.isPending?.status ||
|
||||||
this.isStopping?.status ||
|
this.isStopping?.status ||
|
||||||
this.isOff?.status ||
|
this.isOff?.status ||
|
||||||
@@ -987,7 +1040,7 @@ export default class VirtVm extends HarvesterResource {
|
|||||||
this.isRunning?.status ||
|
this.isRunning?.status ||
|
||||||
this.isNotReady?.status ||
|
this.isNotReady?.status ||
|
||||||
this.isStarting?.status ||
|
this.isStarting?.status ||
|
||||||
this.isWaitingForVMI?.state ||
|
this.isWaitingForVMI?.status ||
|
||||||
this.otherState?.status;
|
this.otherState?.status;
|
||||||
|
|
||||||
return state;
|
return state;
|
||||||
@@ -1266,6 +1319,10 @@ export default class VirtVm extends HarvesterResource {
|
|||||||
return this.$rootGetters['harvester-common/getFeatureEnabled']('schedulingVMBackup');
|
return this.$rootGetters['harvester-common/getFeatureEnabled']('schedulingVMBackup');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get nameDisplay() {
|
||||||
|
return this.metadata?.annotations?.[HCI_ANNOTATIONS.VM_DISPLAY_NAME] || this.metadata?.name || this.id;
|
||||||
|
}
|
||||||
|
|
||||||
get volumeEncryptionFeatureEnabled() {
|
get volumeEncryptionFeatureEnabled() {
|
||||||
return this.$rootGetters['harvester-common/getFeatureEnabled']('volumeEncryption');
|
return this.$rootGetters['harvester-common/getFeatureEnabled']('volumeEncryption');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -123,6 +123,7 @@ export default {
|
|||||||
this.value?.[0]?.currentRouter().push(goTo);
|
this.value?.[0]?.currentRouter().push(goTo);
|
||||||
}
|
}
|
||||||
this.close();
|
this.close();
|
||||||
|
this.$store.commit('action-menu/togglePromptModal', { performCallback: true, clearTableSelection: true });
|
||||||
}).catch((err) => {
|
}).catch((err) => {
|
||||||
this.$emit('errors', err);
|
this.$emit('errors', err);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ export const HCI = {
|
|||||||
RESTORE: 'harvesterhci.io.virtualmachinerestore',
|
RESTORE: 'harvesterhci.io.virtualmachinerestore',
|
||||||
NODE_NETWORK: 'network.harvesterhci.io.nodenetwork',
|
NODE_NETWORK: 'network.harvesterhci.io.nodenetwork',
|
||||||
CLUSTER_NETWORK: 'network.harvesterhci.io.clusternetwork',
|
CLUSTER_NETWORK: 'network.harvesterhci.io.clusternetwork',
|
||||||
|
HOST_NETWORK_CONFIG: 'network.harvesterhci.io.hostnetworkconfig',
|
||||||
SUBNET: 'kubeovn.io.subnet',
|
SUBNET: 'kubeovn.io.subnet',
|
||||||
VPC: 'kubeovn.io.vpc',
|
VPC: 'kubeovn.io.vpc',
|
||||||
IP: 'kubeovn.io.ip',
|
IP: 'kubeovn.io.ip',
|
||||||
@@ -62,6 +63,7 @@ export const HCI = {
|
|||||||
VMIMPORT_SOURCE_OVA: 'migration.harvesterhci.io.ovasource',
|
VMIMPORT_SOURCE_OVA: 'migration.harvesterhci.io.ovasource',
|
||||||
VMIMPORT: 'migration.harvesterhci.io.virtualmachineimport',
|
VMIMPORT: 'migration.harvesterhci.io.virtualmachineimport',
|
||||||
MIGRATION: 'migration.harvesterhci.io',
|
MIGRATION: 'migration.harvesterhci.io',
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export const VOLUME_SNAPSHOT = 'snapshot.storage.k8s.io.volumesnapshot';
|
export const VOLUME_SNAPSHOT = 'snapshot.storage.k8s.io.volumesnapshot';
|
||||||
|
|||||||
@@ -31,22 +31,42 @@ export function registerAddonSideNav(store, productName, {
|
|||||||
}, 600);
|
}, 600);
|
||||||
};
|
};
|
||||||
|
|
||||||
// Adds or removes the resource IDs from the product visibility whitelist.
|
const hasAccessibleSchema = (t) => {
|
||||||
const setMenuVisibility = (visible) => {
|
try {
|
||||||
if (visible) {
|
return !!store.getters[`${ productName }/schemaFor`]?.(t);
|
||||||
|
} catch (e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const showTypes = (visibleTypes) => {
|
||||||
store.commit('type-map/basicType', {
|
store.commit('type-map/basicType', {
|
||||||
product: productName,
|
product: productName,
|
||||||
group: navGroup,
|
group: navGroup,
|
||||||
types
|
types: visibleTypes
|
||||||
});
|
});
|
||||||
} else {
|
};
|
||||||
// Manually delete the keys from the state object to hide them.
|
|
||||||
|
const hideTypes = () => {
|
||||||
const basicTypes = store.state['type-map'].basicTypes[productName];
|
const basicTypes = store.state['type-map'].basicTypes[productName];
|
||||||
|
|
||||||
if (basicTypes) {
|
if (basicTypes) {
|
||||||
types.forEach((t) => delete basicTypes[t]);
|
types.forEach((t) => delete basicTypes[t]);
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Adds or removes the resource IDs from the product visibility whitelist.
|
||||||
|
const setMenuVisibility = (visible) => {
|
||||||
|
const accessibleTypes = visible ? types.filter(hasAccessibleSchema) : [];
|
||||||
|
|
||||||
|
// Always clear first to remove any previously-registered types that are
|
||||||
|
// no longer accessible (e.g. partial permission changes like types=[A,B] where B is dropped).
|
||||||
|
hideTypes();
|
||||||
|
|
||||||
|
if (accessibleTypes.length > 0) {
|
||||||
|
showTypes(accessibleTypes);
|
||||||
}
|
}
|
||||||
|
|
||||||
kickSideNav();
|
kickSideNav();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user