diff --git a/ui/src/views/compute/KubernetesServiceTab.vue b/ui/src/views/compute/KubernetesServiceTab.vue index 10d3dbc1ff69..4760f5905263 100644 --- a/ui/src/views/compute/KubernetesServiceTab.vue +++ b/ui/src/views/compute/KubernetesServiceTab.vue @@ -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])] } }, diff --git a/ui/src/views/network/FirewallRules.vue b/ui/src/views/network/FirewallRules.vue index dc5bcdf2cb9f..72a31254d2b4 100644 --- a/ui/src/views/network/FirewallRules.vue +++ b/ui/src/views/network/FirewallRules.vue @@ -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(() => { diff --git a/ui/src/views/network/PortForwarding.vue b/ui/src/views/network/PortForwarding.vue index f48e67bbb550..2688ff842b41 100644 --- a/ui/src/views/network/PortForwarding.vue +++ b/ui/src/views/network/PortForwarding.vue @@ -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(() => { @@ -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([])