Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ui/src/views/compute/KubernetesServiceTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,7 @@ export default {
computed: {
kubernetesManagementPorts () {
const sshPorts = this.virtualmachines
.map((vm, index) => Number(vm.port || vm.sshport || vm.sshPort || this.cksSshStartingPort + index))
.filter(port => Number.isInteger(port))
.map((vm, index) => this.cksSshStartingPort + index)
return [...new Set([6443, ...sshPorts])]
}
},
Expand Down
3 changes: 1 addition & 2 deletions ui/src/views/network/FirewallRules.vue
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,7 @@ export default {
const virtualMachines = cluster.virtualmachines || []
const nodeCount = virtualMachines.length || (Number(cluster.controlnodes || 1) + Number(cluster.size || 0))
const sshPorts = Array.from({ length: nodeCount }, (item, index) => {
const vm = virtualMachines[index] || {}
return Number(vm.port || vm.sshport || vm.sshPort || 2222 + index)
return 2222 + index
}).filter(port => Number.isInteger(port))
this.kubernetesManagementPorts = [...new Set([6443, ...sshPorts])]
}).catch(() => {
Expand Down
12 changes: 2 additions & 10 deletions ui/src/views/network/PortForwarding.vue
Original file line number Diff line number Diff line change
Expand Up @@ -525,8 +525,7 @@ export default {
const virtualMachines = cluster.virtualmachines || []
const nodeCount = virtualMachines.length || (Number(cluster.controlnodes || 1) + Number(cluster.size || 0))
const sshPorts = Array.from({ length: nodeCount }, (item, index) => {
const vm = virtualMachines[index] || {}
return Number(vm.port || vm.sshport || vm.sshPort || 2222 + index)
return 2222 + index
}).filter(port => Number.isInteger(port))
this.kubernetesManagementPorts = [...new Set([6443, ...sshPorts])]
}).catch(() => {
Expand Down Expand Up @@ -623,14 +622,7 @@ export default {
}
return (this.rangeIncludesProtectedPort(rule.publicport, rule.publicendport) &&
(this.rangeIncludesPort(rule.privateport, rule.privateendport, 22) ||
this.rangeIncludesPort(rule.privateport, rule.privateendport, 6443))) ||
this.isKubernetesNodeSshRule(rule)
},
isKubernetesNodeSshRule (rule) {
const vmName = rule.virtualmachinename || ''
return /-(control|node)-/.test(vmName) &&
this.rangeIncludesPort(rule.privateport, rule.privateendport, 22) &&
Number(rule.publicport) >= 2222
this.rangeIncludesPort(rule.privateport, rule.privateendport, 6443)))
},
resetSelection () {
this.setSelection([])
Expand Down
Loading