github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1508 from janosi/sctp-hostport

Browse Source 
Remove the protocol filter from the HostPort management
This commit is contained in:
Michael Crosby 2020-06-15 14:48:37 -04:00 committed by GitHub
commit 6164822714
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/server/sandbox_run.go
View File

@ -414,9 +414,6 @@ func toCNIPortMappings(criPortMappings []*runtime.PortMapping) []cni.PortMapping
if mapping.HostPort <= 0 { if mapping.HostPort <= 0 {
continue continue
} }
if mapping.Protocol != runtime.Protocol_TCP && mapping.Protocol != runtime.Protocol_UDP {
continue
}
portMappings = append(portMappings, cni.PortMapping{ portMappings = append(portMappings, cni.PortMapping{
HostPort: mapping.HostPort, HostPort: mapping.HostPort,
ContainerPort: mapping.ContainerPort, ContainerPort: mapping.ContainerPort,

18
pkg/server/sandbox_run_test.go
View File

@ -175,6 +175,12 @@ func TestToCNIPortMappings(t *testing.T) {
HostPort: 8765, HostPort: 8765,
HostIp: "126.125.124.123", HostIp: "126.125.124.123",
}, },
{
Protocol: runtime.Protocol_SCTP,
ContainerPort: 1234,
HostPort: 5678,
HostIp: "123.124.125.126",
},
}, },
cniPortMappings: []cni.PortMapping{ cniPortMappings: []cni.PortMapping{
{ {
@ -189,6 +195,12 @@ func TestToCNIPortMappings(t *testing.T) {
Protocol: "tcp", Protocol: "tcp",
HostIP: "126.125.124.123", HostIP: "126.125.124.123",
}, },
{
HostPort: 5678,
ContainerPort: 1234,
Protocol: "sctp",
HostIP: "123.124.125.126",
},
}, },
}, },
"CRI port mapping without host port should be skipped": { "CRI port mapping without host port should be skipped": {
@ -216,12 +228,6 @@ func TestToCNIPortMappings(t *testing.T) {
}, },
"CRI port mapping with unsupported protocol should be skipped": { "CRI port mapping with unsupported protocol should be skipped": {
criPortMappings: []*runtime.PortMapping{ criPortMappings: []*runtime.PortMapping{
{
Protocol: runtime.Protocol_SCTP,
ContainerPort: 1234,
HostPort: 5678,
HostIp: "123.124.125.126",
},
{ {
Protocol: runtime.Protocol_TCP, Protocol: runtime.Protocol_TCP,
ContainerPort: 4321, ContainerPort: 4321,