Skip to content

Commit 9b84e43

Browse files
authored
Merge pull request #849 from jschoiRR/diplo-2026
[Mold Diplo] 쿠버네티스 관리 포트 보호 조건을 Public 포트 기준으로 제한
2 parents 6d334ee + 4c662a0 commit 9b84e43

3 files changed

Lines changed: 4 additions & 14 deletions

File tree

ui/src/views/compute/KubernetesServiceTab.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,7 @@ export default {
292292
computed: {
293293
kubernetesManagementPorts () {
294294
const sshPorts = this.virtualmachines
295-
.map((vm, index) => Number(vm.port || vm.sshport || vm.sshPort || this.cksSshStartingPort + index))
296-
.filter(port => Number.isInteger(port))
295+
.map((vm, index) => this.cksSshStartingPort + index)
297296
return [...new Set([6443, ...sshPorts])]
298297
}
299298
},

ui/src/views/network/FirewallRules.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,7 @@ export default {
348348
const virtualMachines = cluster.virtualmachines || []
349349
const nodeCount = virtualMachines.length || (Number(cluster.controlnodes || 1) + Number(cluster.size || 0))
350350
const sshPorts = Array.from({ length: nodeCount }, (item, index) => {
351-
const vm = virtualMachines[index] || {}
352-
return Number(vm.port || vm.sshport || vm.sshPort || 2222 + index)
351+
return 2222 + index
353352
}).filter(port => Number.isInteger(port))
354353
this.kubernetesManagementPorts = [...new Set([6443, ...sshPorts])]
355354
}).catch(() => {

ui/src/views/network/PortForwarding.vue

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -525,8 +525,7 @@ export default {
525525
const virtualMachines = cluster.virtualmachines || []
526526
const nodeCount = virtualMachines.length || (Number(cluster.controlnodes || 1) + Number(cluster.size || 0))
527527
const sshPorts = Array.from({ length: nodeCount }, (item, index) => {
528-
const vm = virtualMachines[index] || {}
529-
return Number(vm.port || vm.sshport || vm.sshPort || 2222 + index)
528+
return 2222 + index
530529
}).filter(port => Number.isInteger(port))
531530
this.kubernetesManagementPorts = [...new Set([6443, ...sshPorts])]
532531
}).catch(() => {
@@ -623,14 +622,7 @@ export default {
623622
}
624623
return (this.rangeIncludesProtectedPort(rule.publicport, rule.publicendport) &&
625624
(this.rangeIncludesPort(rule.privateport, rule.privateendport, 22) ||
626-
this.rangeIncludesPort(rule.privateport, rule.privateendport, 6443))) ||
627-
this.isKubernetesNodeSshRule(rule)
628-
},
629-
isKubernetesNodeSshRule (rule) {
630-
const vmName = rule.virtualmachinename || ''
631-
return /-(control|node)-/.test(vmName) &&
632-
this.rangeIncludesPort(rule.privateport, rule.privateendport, 22) &&
633-
Number(rule.publicport) >= 2222
625+
this.rangeIncludesPort(rule.privateport, rule.privateendport, 6443)))
634626
},
635627
resetSelection () {
636628
this.setSelection([])

0 commit comments

Comments
 (0)