diff --git a/ui/src/views/compute/CreateKubernetesCluster.vue b/ui/src/views/compute/CreateKubernetesCluster.vue index f51a9deb383..3aefdbbf544 100644 --- a/ui/src/views/compute/CreateKubernetesCluster.vue +++ b/ui/src/views/compute/CreateKubernetesCluster.vue @@ -22,21 +22,39 @@ :form="form" @submit="handleSubmit" layout="vertical"> - + + + {{ $t('label.name') }} + + + + - + + + {{ $t('label.description') }} + + + + - + + + {{ $t('label.zoneid') }} + + + + + + + {{ $t('label.kubernetesversionid') }} + + + + + + + {{ $t('label.serviceofferingid') }} + + + + + + + {{ $t('label.noderootdisksize') }} + + + + - + + + {{ $t('label.networkid') }} + + + + - + + + {{ $t('label.masternodes') }} + + + + - + + + {{ $t('label.externalloadbalanceripaddress') }} + + + + - + + + {{ $t('label.cks.cluster.size') }} + + + + - + + + {{ $t('label.keypair') }} + + + + x.dataIndex !== 'instancename') } }, mounted () { @@ -231,6 +209,9 @@ export default { } }, methods: { + isAdmin () { + return ['Admin'].includes(this.$store.getters.userInfo.roletype) + }, isAdminOrDomainAdmin () { return ['Admin', 'DomainAdmin'].includes(this.$store.getters.userInfo.roletype) }, diff --git a/ui/src/views/compute/ScaleKubernetesCluster.vue b/ui/src/views/compute/ScaleKubernetesCluster.vue index 75edb9ebb5e..2657e99832b 100644 --- a/ui/src/views/compute/ScaleKubernetesCluster.vue +++ b/ui/src/views/compute/ScaleKubernetesCluster.vue @@ -22,7 +22,13 @@ :form="form" @submit="handleSubmit" layout="vertical"> - + + + {{ $t('label.cks.cluster.size') }} + + + + - + + + {{ $t('label.serviceofferingid') }} + + + + - + + + {{ $t('label.kubernetesversionid') }} + + + + - + + + {{ $t('label.semanticversion') }} + + + + - + + + {{ $t('label.name') }} + + + + - + + + {{ $t('label.zoneid') }} + + + + + + + {{ $t('label.url') }} + + + + - + + + {{ $t('label.checksum') }} + + + + - + + + {{ $t('label.mincpunumber') }} + + + + - + + + {{ $t('label.minmemory') }} + + + + - + + + {{ $t('label.name') }} + + + + - + + + {{ $t('label.displaytext') }} + + + + - + + + {{ $t('label.zoneid') }} + + + + + + + {{ $t('label.domain') }} + + + + - + + + {{ $t('label.networkofferingid') }} + + + + + + + {{ $t('label.vlan') }} + + + + - + + + {{ $t('label.vpcid') }} + + + + + + + {{ $t('label.externalid') }} + + + + - + + + {{ $t('label.gateway') }} + + + + - + + + {{ $t('label.netmask') }} + + + + - + + + {{ $t('label.networkdomain') }} + + + + - + + + {{ $t('label.account') }} + + + + - + + + {{ $t('label.name') }} + + + + - + + + {{ $t('label.displaytext') }} + + + + - + + + {{ $t('label.zoneid') }} + + + + + + + {{ $t('label.domain') }} + + + + - + + + {{ $t('label.networkofferingid') }} + + + + + + + {{ $t('label.vlan') }} + + + + - + + + {{ $t('label.bypassvlanoverlapcheck') }} + + + + - + + + {{ $t('label.isolatedpvlantype') }} + + + + + + + {{ $t('label.isolatedpvlanid') }} + + + + - + + + {{ $t('label.account') }} + + + + + + {{ $t('label.name') }} + + + + - + + + {{ $t('label.displaytext') }} + + + + - + + + {{ $t('label.zoneid') }} + + + + + + + {{ $t('label.physicalnetworkid') }} + + + + - + + + {{ $t('label.vlan') }} + + + + - + + + {{ $t('label.bypassvlanoverlapcheck') }} + + + + - + + + {{ $t('label.isolatedpvlantype') }} + + + + + + + {{ $t('label.isolatedpvlanid') }} + + + + @@ -133,7 +181,13 @@ - + + + {{ $t('label.domain') }} + + + + + + + {{ $t('label.subdomainaccess') }} + + + + - + + + {{ $t('label.account') }} + + + + - + + + {{ $t('label.projectid') }} + + + + + + + {{ $t('label.networkofferingid') }} + + + + + + + {{ $t('label.ip4gateway') }} + + + + - + + + {{ $t('label.ip4netmask') }} + + + + + + {{ $t('label.startipv4') }} + + + + - + + + {{ $t('label.endipv4') }} + + + + - + + + {{ $t('label.ip6gateway') }} + + + + - + + + {{ $t('label.ip6cidr') }} + + + + - + + + {{ $t('label.startipv6') }} + + + + - + + + {{ $t('label.endipv6') }} + + + + - + + + {{ $t('label.networkdomain') }} + + + + - + + + {{ $t('label.hideipaddressusage') }} + + + +
@@ -320,6 +458,12 @@ export default { }, beforeCreate () { this.form = this.$form.createForm(this) + this.apiConfig = this.$store.getters.apis.createNetwork || {} + this.apiParams = {} + this.apiConfig.params.forEach(param => { + this.apiParams[param.name] = param + }) + console.log(this.apiParams) }, created () { },