aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pkg/specgen/generate/kube/kube.go3
-rw-r--r--test/e2e/play_kube_test.go6
-rw-r--r--test/system/700-play.bats24
3 files changed, 27 insertions, 6 deletions
diff --git a/pkg/specgen/generate/kube/kube.go b/pkg/specgen/generate/kube/kube.go
index 7d85fd2f3..bc9013afc 100644
--- a/pkg/specgen/generate/kube/kube.go
+++ b/pkg/specgen/generate/kube/kube.go
@@ -908,6 +908,9 @@ func getPodPorts(containers []v1.Container) []types.PortMapping {
if p.HostPort != 0 && p.ContainerPort == 0 {
p.ContainerPort = p.HostPort
}
+ if p.HostPort == 0 && p.ContainerPort != 0 {
+ p.HostPort = p.ContainerPort
+ }
if p.Protocol == "" {
p.Protocol = "tcp"
}
diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go
index 67c88953a..651cb1074 100644
--- a/test/e2e/play_kube_test.go
+++ b/test/e2e/play_kube_test.go
@@ -133,8 +133,6 @@ spec:
containers:
- name: podnameEqualsContainerNameYaml
image: quay.io/libpod/alpine:latest
- ports:
- - containerPort: 80
`
var podWithoutAName = `
@@ -239,8 +237,6 @@ spec:
- "1.5"
name: alpine
image: quay.io/libpod/alpine:latest
- ports:
- - containerPort: 80
livenessProbe:
exec:
command:
@@ -274,8 +270,6 @@ spec:
- "1.5"
name: alpine
image: quay.io/libpod/alpine:latest
- ports:
- - containerPort: 80
livenessProbe:
exec:
command:
diff --git a/test/system/700-play.bats b/test/system/700-play.bats
index bad9544ff..578d28394 100644
--- a/test/system/700-play.bats
+++ b/test/system/700-play.bats
@@ -386,3 +386,27 @@ status: {}
run_podman rm -a -f
run_podman rm -f -t0 myyaml
}
+
+@test "podman kube play - hostport" {
+ HOST_PORT=$(random_free_port)
+ echo "
+apiVersion: v1
+kind: Pod
+metadata:
+ labels:
+ app: test
+ name: test_pod
+spec:
+ containers:
+ - name: server
+ image: $IMAGE
+ ports:
+ - name: hostp
+ containerPort: $HOST_PORT
+" > $PODMAN_TMPDIR/testpod.yaml
+
+ run_podman kube play $PODMAN_TMPDIR/testpod.yaml
+ run_podman pod inspect test_pod --format "{{.InfraConfig.PortBindings}}"
+ assert "$output" = "map[$HOST_PORT/tcp:[{ $HOST_PORT}]]"
+ run_podman kube down $PODMAN_TMPDIR/testpod.yaml
+}