Skip to content

Commit 69db12a

Browse files
committed
allow specifying arch for edge cluster
Signed-off-by: Abhishek Kumar <[email protected]>
1 parent 8ce28e7 commit 69db12a

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

ui/src/views/infra/zone/StaticInputsForm.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
<a-input
9797
v-else
9898
v-model:value="form[field.key]"
99+
:defaultValue="field.defaultValue"
99100
v-focus="index === 0"
100101
/>
101102
</a-form-item>

ui/src/views/infra/zone/ZoneWizardAddResources.vue

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -151,15 +151,12 @@ export default {
151151
return this.prefillContent?.zoneSuperType === 'Edge' || false
152152
},
153153
steps () {
154-
const steps = []
154+
const steps = [{
155+
title: 'label.cluster',
156+
fromKey: 'clusterResource',
157+
description: 'message.desc.cluster'
158+
}]
155159
const hypervisor = this.prefillContent.hypervisor ? this.prefillContent.hypervisor : null
156-
if (!this.isEdgeZone) {
157-
steps.push({
158-
title: 'label.cluster',
159-
fromKey: 'clusterResource',
160-
description: 'message.desc.cluster'
161-
})
162-
}
163160
if (hypervisor !== 'VMware') {
164161
steps.push({
165162
title: 'label.host',
@@ -190,7 +187,8 @@ export default {
190187
title: 'label.cluster.name',
191188
key: 'clusterName',
192189
placeHolder: 'message.error.cluster.name',
193-
required: true
190+
required: true,
191+
defaultValue: this.isEdgeZone ? 'Cluster-' + (this.prefillContent?.name || 'Edge') : undefined
194192
},
195193
{
196194
title: 'label.arch',

ui/src/views/infra/zone/ZoneWizardLaunchZone.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1280,7 +1280,7 @@ export default {
12801280
params.clustertype = clusterType
12811281
params.podId = this.stepData.podReturned.id
12821282
let clusterName = this.prefillContent?.clusterName || null
1283-
if (this.isEdgeZone) {
1283+
if (!clusterName && this.isEdgeZone) {
12841284
clusterName = 'Cluster-' + this.stepData.zoneReturned.name
12851285
}
12861286
params.arch = this.prefillContent?.arch || null

0 commit comments

Comments
 (0)