From f5fc0960e5eddf64a7d8fbf8fbfd3652b4ee5db3 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Mon, 26 Sep 2022 14:48:37 -0400
Subject: [PATCH] Default missing hostPort to containerPort is defined in
 kube.yaml

If user does not specify hostPort in a kube.yml file but does specify
a containerPort, then the hostPort should default to the containerPort.

Fixes: https://github.com/containers/podman/issues/15942

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 pkg/specgen/generate/kube/kube.go |  3 +++
 test/e2e/play_kube_test.go        |  6 ------
 test/system/700-play.bats         | 24 ++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/pkg/specgen/generate/kube/kube.go b/pkg/specgen/generate/kube/kube.go
index 7d85fd2f36..bc9013afc0 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 67c88953a5..651cb10742 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 bad9544ff6..578d28394a 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
+}