diff options
| author | Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp> | 2018-08-23 14:50:38 +0900 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-24 14:31:38 +0000 |
| commit | af9f83f11c9b92ea806b33b75337de7e5d93592d (patch) | |
| tree | 042bf7901ef33c4464981f29b919222473fb9282 | |
| parent | f1b4f43d7521c33551669d7f889012fcba4ec926 (diff) | |
| download | podman-af9f83f11c9b92ea806b33b75337de7e5d93592d.tar.gz podman-af9f83f11c9b92ea806b33b75337de7e5d93592d.tar.bz2 podman-af9f83f11c9b92ea806b33b75337de7e5d93592d.zip | |
exposes tcp port only if no proto specified.
Also it fix the issue of exposing both tc/udp port even if
only one proto specified.
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
Closes: #1325
Approved by: mheon
| -rw-r--r-- | pkg/spec/createconfig.go | 5 | ||||
| -rw-r--r-- | test/e2e/port_test.go | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/pkg/spec/createconfig.go b/pkg/spec/createconfig.go index 6a7ddc1ae..41030bf26 100644 --- a/pkg/spec/createconfig.go +++ b/pkg/spec/createconfig.go @@ -492,10 +492,7 @@ func (c *CreateConfig) CreatePortBindings() ([]ocicni.PortMapping, error) { } pm.HostPort = int32(hostPort) - // CNI requires us to make both udp and tcp structs - pm.Protocol = "udp" - portBindings = append(portBindings, pm) - pm.Protocol = "tcp" + pm.Protocol = containerPb.Proto() portBindings = append(portBindings, pm) } } diff --git a/test/e2e/port_test.go b/test/e2e/port_test.go index 10698f376..ed15b54ac 100644 --- a/test/e2e/port_test.go +++ b/test/e2e/port_test.go @@ -54,7 +54,6 @@ var _ = Describe("Podman port", func() { result.WaitWithDefaultTimeout() Expect(result.ExitCode()).To(Equal(0)) port := strings.Split(result.OutputToStringArray()[0], ":")[1] - Expect(result.LineInOuputStartsWith(fmt.Sprintf("80/udp -> 0.0.0.0:%s", port))).To(BeTrue()) Expect(result.LineInOuputStartsWith(fmt.Sprintf("80/tcp -> 0.0.0.0:%s", port))).To(BeTrue()) }) |