mirror of
https://github.com/harvester/harvester-ui-extension.git
synced 2026-11-22 16:47:34 +08:00
Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7dbd442519 | ||
|
|
5a0d7f283d | ||
|
|
9fdbe9c58f | ||
|
|
f652ed9d4b | ||
|
|
21a1cd4e89 | ||
|
|
facc74ca51 |
No files matched your search
@@ -7,6 +7,8 @@ import { Checkbox } from '@components/Form/Checkbox';
|
|||||||
import { HCI } from '../../types';
|
import { HCI } from '../../types';
|
||||||
import { DOC } from '../../config/doc-links';
|
import { DOC } from '../../config/doc-links';
|
||||||
import { docLink } from '../../utils/feature-flags';
|
import { docLink } from '../../utils/feature-flags';
|
||||||
|
import isEqual from 'lodash/isEqual';
|
||||||
|
import { clone } from '@shell/utils/object';
|
||||||
|
|
||||||
export const ksmtunedMode = [{
|
export const ksmtunedMode = [{
|
||||||
value: 'standard',
|
value: 'standard',
|
||||||
@@ -64,11 +66,13 @@ export default {
|
|||||||
|
|
||||||
this.enableMergeAcrossNodes = !!this.ksmtuned.spec?.mergeAcrossNodes;
|
this.enableMergeAcrossNodes = !!this.ksmtuned.spec?.mergeAcrossNodes;
|
||||||
this.spec = this.ksmtuned.spec;
|
this.spec = this.ksmtuned.spec;
|
||||||
|
this.originSpec = clone(this.ksmtuned.spec);
|
||||||
},
|
},
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
ksmtuned: {},
|
ksmtuned: {},
|
||||||
|
originSpec: {},
|
||||||
spec: {},
|
spec: {},
|
||||||
thresCoef: 30,
|
thresCoef: 30,
|
||||||
ksmtunedMode,
|
ksmtunedMode,
|
||||||
@@ -99,6 +103,11 @@ export default {
|
|||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
async saveKsmtuned() {
|
async saveKsmtuned() {
|
||||||
|
// no ksmtuned spec change, skip save
|
||||||
|
if (isEqual(this.spec, this.originSpec)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
this.spec.mergeAcrossNodes = this.enableMergeAcrossNodes ? 1 : 0;
|
this.spec.mergeAcrossNodes = this.enableMergeAcrossNodes ? 1 : 0;
|
||||||
this.ksmtuned['spec'] = this.spec;
|
this.ksmtuned['spec'] = this.spec;
|
||||||
|
|
||||||
|
|||||||
@@ -527,7 +527,6 @@ export default {
|
|||||||
id: this.longhornNode.id,
|
id: this.longhornNode.id,
|
||||||
opt: { force: true },
|
opt: { force: true },
|
||||||
});
|
});
|
||||||
|
|
||||||
await new Promise((resolve) => setTimeout(resolve, '5000'));
|
await new Promise((resolve) => setTimeout(resolve, '5000'));
|
||||||
await retrySave();
|
await retrySave();
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -0,0 +1,196 @@
|
|||||||
|
<script>
|
||||||
|
import debounce from 'lodash/debounce';
|
||||||
|
import { _EDIT, _VIEW } from '@shell/config/query-params';
|
||||||
|
import { removeAt } from '@shell/utils/array';
|
||||||
|
import { Banner } from '@components/Banner';
|
||||||
|
import InfoBox from '@shell/components/InfoBox';
|
||||||
|
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
||||||
|
import { LabeledInput } from '@components/Form/LabeledInput';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'AccessControlList',
|
||||||
|
|
||||||
|
emits: ['update:value'],
|
||||||
|
|
||||||
|
components: {
|
||||||
|
Banner, InfoBox, LabeledSelect, LabeledInput
|
||||||
|
},
|
||||||
|
|
||||||
|
props: {
|
||||||
|
value: {
|
||||||
|
type: Array,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
|
mode: {
|
||||||
|
type: String,
|
||||||
|
default: _EDIT,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
data() {
|
||||||
|
const rows = (this.value || []).map((row) => {
|
||||||
|
return {
|
||||||
|
action: row.action || '',
|
||||||
|
direction: row.direction || '',
|
||||||
|
priority: row.priority || 0,
|
||||||
|
match: row.match || '',
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
return { rows };
|
||||||
|
},
|
||||||
|
|
||||||
|
computed: {
|
||||||
|
isView() {
|
||||||
|
return this.mode === _VIEW;
|
||||||
|
},
|
||||||
|
|
||||||
|
actionOptions() {
|
||||||
|
return [
|
||||||
|
{ label: 'Allow', value: 'allow' },
|
||||||
|
{ label: 'Drop', value: 'drop' },
|
||||||
|
{ label: 'Pass', value: 'pass' },
|
||||||
|
{ label: 'Reject', value: 'reject' },
|
||||||
|
{ label: 'Allow-related', value: 'allow-related' },
|
||||||
|
{ label: 'Allow-stateless', value: 'allow-stateless' },
|
||||||
|
];
|
||||||
|
},
|
||||||
|
directionOptions() {
|
||||||
|
return [
|
||||||
|
{ label: 'To-lport', value: 'to-lport' },
|
||||||
|
{ label: 'From-lport', value: 'from-lport' },
|
||||||
|
];
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
created() {
|
||||||
|
this.queueUpdate = debounce(this.update, 100);
|
||||||
|
},
|
||||||
|
|
||||||
|
methods: {
|
||||||
|
add() {
|
||||||
|
this.rows.push({
|
||||||
|
action: '',
|
||||||
|
direction: '',
|
||||||
|
priority: this.rows.length,
|
||||||
|
match: '',
|
||||||
|
});
|
||||||
|
this.queueUpdate();
|
||||||
|
},
|
||||||
|
|
||||||
|
removeRule(idx) {
|
||||||
|
removeAt(this.rows, idx);
|
||||||
|
this.queueUpdate();
|
||||||
|
},
|
||||||
|
|
||||||
|
update() {
|
||||||
|
if (this.isView) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.$emit('update:value', this.rows);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<Banner
|
||||||
|
v-if="rows.length > 0"
|
||||||
|
color="info"
|
||||||
|
>
|
||||||
|
<t
|
||||||
|
k="harvester.subnet.acl.banner"
|
||||||
|
:raw="true"
|
||||||
|
/>
|
||||||
|
</Banner>
|
||||||
|
<div
|
||||||
|
v-for="(row, idx) in rows"
|
||||||
|
:key="idx"
|
||||||
|
>
|
||||||
|
<InfoBox class="box">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="role-link btn btn-sm removeBtn"
|
||||||
|
:disabled="isView"
|
||||||
|
@click="removeRule(idx)"
|
||||||
|
>
|
||||||
|
<i class="icon icon-x" />
|
||||||
|
</button>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col span-4">
|
||||||
|
<LabeledSelect
|
||||||
|
v-model:value="row.action"
|
||||||
|
:mode="mode"
|
||||||
|
class="mt-5 ml-5"
|
||||||
|
:options="actionOptions"
|
||||||
|
:required="true"
|
||||||
|
:label="t('harvester.subnet.acl.action.label')"
|
||||||
|
:placeholder="t('harvester.subnet.acl.action.placeholder')"
|
||||||
|
@update:value="update"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="col span-4">
|
||||||
|
<LabeledSelect
|
||||||
|
v-model:value="row.direction"
|
||||||
|
:mode="mode"
|
||||||
|
:options="directionOptions"
|
||||||
|
class="mt-5"
|
||||||
|
:required="true"
|
||||||
|
:label="t('harvester.subnet.acl.direction.label')"
|
||||||
|
:placeholder="t('harvester.subnet.acl.direction.placeholder')"
|
||||||
|
@update:value="update"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="col span-3">
|
||||||
|
<LabeledInput
|
||||||
|
v-model:value.number="row.priority"
|
||||||
|
type="number"
|
||||||
|
class="mb-20 mt-5"
|
||||||
|
:max="32767"
|
||||||
|
:min="0"
|
||||||
|
:mode="mode"
|
||||||
|
required
|
||||||
|
label-key="harvester.subnet.acl.priority.label"
|
||||||
|
@update:value="update"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col span-11">
|
||||||
|
<LabeledInput
|
||||||
|
v-model:value="row.match"
|
||||||
|
class="mb-5 ml-5"
|
||||||
|
:mode="mode"
|
||||||
|
required
|
||||||
|
:placeholder="t('harvester.subnet.acl.match.placeholder')"
|
||||||
|
label-key="harvester.subnet.acl.match.label"
|
||||||
|
@update:value="update"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</InfoBox>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="btn role-tertiary add"
|
||||||
|
:disabled="isView"
|
||||||
|
@click="add()"
|
||||||
|
>
|
||||||
|
<t k="harvester.subnet.acl.addRule" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.box {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
.removeBtn {
|
||||||
|
position: absolute;
|
||||||
|
top: 10px;
|
||||||
|
right: 10px;
|
||||||
|
padding: 0px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -15,6 +15,7 @@ import { allHash } from '@shell/utils/promise';
|
|||||||
import { HCI } from '../../types';
|
import { HCI } from '../../types';
|
||||||
import ResourceTabs from '@shell/components/form/ResourceTabs/index';
|
import ResourceTabs from '@shell/components/form/ResourceTabs/index';
|
||||||
import { Banner } from '@components/Banner';
|
import { Banner } from '@components/Banner';
|
||||||
|
import AccessControlList from './AccessControlList';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'EditSubnet',
|
name: 'EditSubnet',
|
||||||
@@ -32,6 +33,7 @@ export default {
|
|||||||
ArrayList,
|
ArrayList,
|
||||||
ResourceTabs,
|
ResourceTabs,
|
||||||
Loading,
|
Loading,
|
||||||
|
AccessControlList
|
||||||
},
|
},
|
||||||
|
|
||||||
mixins: [CreateEditView],
|
mixins: [CreateEditView],
|
||||||
@@ -51,7 +53,8 @@ export default {
|
|||||||
gatewayIP: '',
|
gatewayIP: '',
|
||||||
excludeIps: [],
|
excludeIps: [],
|
||||||
private: false,
|
private: false,
|
||||||
enableDHCP
|
enableDHCP,
|
||||||
|
acls: []
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -143,6 +146,7 @@ export default {
|
|||||||
async saveSubnet(buttonCb) {
|
async saveSubnet(buttonCb) {
|
||||||
const errors = [];
|
const errors = [];
|
||||||
const name = this.value?.metadata?.name;
|
const name = this.value?.metadata?.name;
|
||||||
|
const hasEmptyAcls = this.value?.spec?.acls?.some((acl) => !acl.match || !acl.action || acl.priority === undefined || acl.priority === null);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (!name) {
|
if (!name) {
|
||||||
@@ -153,6 +157,8 @@ export default {
|
|||||||
errors.push(this.t('validation.required', { key: this.t('harvester.subnet.provider.label') }, true));
|
errors.push(this.t('validation.required', { key: this.t('harvester.subnet.provider.label') }, true));
|
||||||
} else if (this.value.spec.excludeIps.includes('')) {
|
} else if (this.value.spec.excludeIps.includes('')) {
|
||||||
errors.push(this.t('harvester.validation.subnet.excludeIps'));
|
errors.push(this.t('harvester.validation.subnet.excludeIps'));
|
||||||
|
} else if (hasEmptyAcls) {
|
||||||
|
errors.push(this.t('harvester.validation.subnet.aclEmptyError'));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (errors.length > 0) {
|
if (errors.length > 0) {
|
||||||
@@ -371,6 +377,17 @@ export default {
|
|||||||
</template>
|
</template>
|
||||||
</ArrayList>
|
</ArrayList>
|
||||||
</Tab>
|
</Tab>
|
||||||
|
<Tab
|
||||||
|
name="ACL"
|
||||||
|
:label="t('harvester.subnet.acl.label')"
|
||||||
|
:weight="-2"
|
||||||
|
class="bordered-table"
|
||||||
|
>
|
||||||
|
<AccessControlList
|
||||||
|
v-model:value="value.spec.acls"
|
||||||
|
:mode="mode"
|
||||||
|
/>
|
||||||
|
</Tab>
|
||||||
</ResourceTabs>
|
</ResourceTabs>
|
||||||
</CruResource>
|
</CruResource>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -404,7 +404,7 @@ harvester:
|
|||||||
sha512: 'Invalid SHA512 checksum.'
|
sha512: 'Invalid SHA512 checksum.'
|
||||||
subnet:
|
subnet:
|
||||||
excludeIps: 'Exclude IPs cannot be empty. Please remove or fill in the exclude IPs.'
|
excludeIps: 'Exclude IPs cannot be empty. Please remove or fill in the exclude IPs.'
|
||||||
|
aclEmptyError: The fields in subnet access control list rule can not be empty.
|
||||||
dashboard:
|
dashboard:
|
||||||
label: Dashboard
|
label: Dashboard
|
||||||
header: "Harvester Cluster: {cluster}"
|
header: "Harvester Cluster: {cluster}"
|
||||||
@@ -1062,6 +1062,23 @@ harvester:
|
|||||||
placeholder: e.g. 172.16.0.0/16
|
placeholder: e.g. 172.16.0.0/16
|
||||||
excludeIPs:
|
excludeIPs:
|
||||||
tooltip: The IP address list to reserve from automatic assignment. The gateway IP address is always excluded and will be automatically added to the list.
|
tooltip: The IP address list to reserve from automatic assignment. The gateway IP address is always excluded and will be automatically added to the list.
|
||||||
|
acl:
|
||||||
|
label: Access Control List
|
||||||
|
tooltip: The ACL to apply to this Subnet. Must be one of the ACLs in the same namespace.
|
||||||
|
action:
|
||||||
|
label: Action
|
||||||
|
placeholder: Please select an action
|
||||||
|
direction:
|
||||||
|
label: Direction
|
||||||
|
placeholder: Please select a direction
|
||||||
|
addRule: Add Rule
|
||||||
|
priority:
|
||||||
|
label: Priority
|
||||||
|
placeholder: Please select a priority
|
||||||
|
match:
|
||||||
|
label: Match
|
||||||
|
placeholder: e.g. ip4.dst == 10.10.0.2
|
||||||
|
banner: The supported field in ACL match can refer to <a href="https://kubeovn.github.io/docs/v1.14.x/en/guide/subnet/#subnet-acl" target="_blank">KubeOvn Subnet ACL document</a>
|
||||||
|
|
||||||
vpc:
|
vpc:
|
||||||
noAddonEnabled:
|
noAddonEnabled:
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ export default {
|
|||||||
async fetch() {
|
async fetch() {
|
||||||
const inStore = this.$store.getters['currentProduct'].inStore;
|
const inStore = this.$store.getters['currentProduct'].inStore;
|
||||||
const _hash = {
|
const _hash = {
|
||||||
vms: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VM }),
|
vms: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VM, opt: { force: true } }),
|
||||||
pod: this.$store.dispatch(`${ inStore }/findAll`, { type: POD }),
|
pod: this.$store.dispatch(`${ inStore }/findAll`, { type: POD }),
|
||||||
pvcs: this.$store.dispatch(`${ inStore }/findAll`, { type: PVC }),
|
pvcs: this.$store.dispatch(`${ inStore }/findAll`, { type: PVC }),
|
||||||
pvs: this.$store.dispatch(`${ inStore }/findAll`, { type: PV }),
|
pvs: this.$store.dispatch(`${ inStore }/findAll`, { type: PV }),
|
||||||
|
|||||||
@@ -892,7 +892,7 @@ export default {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const specInterfaces = this.spec?.template?.spec?.domain?.devices?.interfaces;
|
const specInterfaces = this.spec?.template?.spec?.domain?.devices?.interfaces;
|
||||||
const mergedInterfaces = this.mergeDeviceList(specInterfaces, interfaces);
|
const mergedInterfaces = this.mergeInterfaceList(specInterfaces, interfaces);
|
||||||
|
|
||||||
const spec = {
|
const spec = {
|
||||||
...this.spec.template.spec,
|
...this.spec.template.spec,
|
||||||
@@ -1551,6 +1551,32 @@ export default {
|
|||||||
this.refreshYamlEditor();
|
this.refreshYamlEditor();
|
||||||
},
|
},
|
||||||
|
|
||||||
|
mergeInterfaceList(specInterfaceList, interfaceList) {
|
||||||
|
if (!specInterfaceList || specInterfaceList.length === 0) {
|
||||||
|
return interfaceList;
|
||||||
|
}
|
||||||
|
const specInterfaceMap = new Map(specInterfaceList.map((iface) => [iface.name, iface]));
|
||||||
|
|
||||||
|
return interfaceList.map((iface) => {
|
||||||
|
const specInterface = specInterfaceMap.get(iface.name);
|
||||||
|
|
||||||
|
if (specInterface) {
|
||||||
|
const merged = { ...specInterface, ...iface };
|
||||||
|
|
||||||
|
// currently we only have bridge and masquerade network type, they are mutually exclusive
|
||||||
|
if (iface['bridge']) {
|
||||||
|
delete merged['masquerade'];
|
||||||
|
} else {
|
||||||
|
delete merged['bridge'];
|
||||||
|
}
|
||||||
|
|
||||||
|
return merged;
|
||||||
|
}
|
||||||
|
|
||||||
|
return iface;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
mergeDeviceList(specDeviceList, deviceList) {
|
mergeDeviceList(specDeviceList, deviceList) {
|
||||||
if (!specDeviceList || specDeviceList.length === 0) {
|
if (!specDeviceList || specDeviceList.length === 0) {
|
||||||
return deviceList;
|
return deviceList;
|
||||||
|
|||||||
@@ -3114,9 +3114,9 @@
|
|||||||
"@types/node" "*"
|
"@types/node" "*"
|
||||||
|
|
||||||
"@types/node@*", "@types/node@20.10.8", "@types/node@^14.14.31", "@types/node@~20.19.0":
|
"@types/node@*", "@types/node@20.10.8", "@types/node@^14.14.31", "@types/node@~20.19.0":
|
||||||
version "20.19.13"
|
version "20.19.17"
|
||||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.13.tgz#b79004a05068e28fb2de281b3a44c5c993650e59"
|
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.17.tgz#41b52697373aef8a43b3b92f33b43f329b2d674b"
|
||||||
integrity sha512-yCAeZl7a0DxgNVteXFHt9+uyFbqXGy/ShC4BlcHkoE0AfGXYv/BUiplV72DjMYXHDBXFjhvr6DD1NiRVfB4j8g==
|
integrity sha512-gfehUI8N1z92kygssiuWvLiwcbOB3IRktR6hTDgJlXMYh5OvkPSRmgfoBUmfZt+vhwJtX7v1Yw4KvvAf7c5QKQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
undici-types "~6.21.0"
|
undici-types "~6.21.0"
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user