Merge pull request #7053 from ashley-cui/kubeip

Publish IP from YAML (podman play kube)
containers · Jul 22, 2020 · 9223b72 · 9223b72
2 parents d493374 + 80f57ac
commit 9223b72
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 4 deletions.
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go
@@ -340,9 +340,7 @@ func getPodPorts(containers []v1.Container) []ocicni.PortMapping {
 				HostPort:      p.HostPort,
 				ContainerPort: p.ContainerPort,
 				Protocol:      strings.ToLower(string(p.Protocol)),
-			}
-			if p.HostIP != "" {
-				logrus.Debug("HostIP on port bindings is not supported")
+				HostIP:        p.HostIP,
 			}
 			// only hostPort is utilized in podman context, all container ports
 			// are accessible inside the shared network namespace

diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go
@@ -85,6 +85,11 @@ spec:
       {{ end }}
       privileged: false
       readOnlyRootFilesystem: false
+    ports:
+    - containerPort: {{ .Port }}
+      hostIP: {{ .HostIP }}
+      hostPort: {{ .Port }}
+      protocol: TCP
     workingDir: /
     {{ end }}
   {{ end }}
@@ -336,12 +341,14 @@ type Ctr struct {
 	CapAdd          []string
 	CapDrop         []string
 	PullPolicy      string
+	HostIP          string
+	Port            string
 }
 
 // getCtr takes a list of ctrOptions and returns a Ctr with sane defaults
 // and the configured options
 func getCtr(options ...ctrOption) *Ctr {
-	c := Ctr{defaultCtrName, defaultCtrImage, defaultCtrCmd, defaultCtrArg, true, false, nil, nil, ""}
+	c := Ctr{defaultCtrName, defaultCtrImage, defaultCtrCmd, defaultCtrArg, true, false, nil, nil, "", "", ""}
 	for _, option := range options {
 		option(&c)
 	}
@@ -394,6 +401,13 @@ func withPullPolicy(policy string) ctrOption {
 	}
 }
 
+func withHostIP(ip string, port string) ctrOption {
+	return func(c *Ctr) {
+		c.HostIP = ip
+		c.Port = port
+	}
+}
+
 func getCtrNameInPod(pod *Pod) string {
 	return fmt.Sprintf("%s-%s", pod.Name, defaultCtrName)
 }
@@ -820,4 +834,23 @@ spec:
 			Expect(inspect.OutputToString()).To(ContainSubstring(correctCmd))
 		}
 	})
+
+	It("podman play kube test with network portbindings", func() {
+		ip := "127.0.0.100"
+		port := "5000"
+		ctr := getCtr(withHostIP(ip, port), withImage(BB))
+
+		pod := getPod(withCtr(ctr))
+		err := generatePodKubeYaml(pod, kubeYaml)
+		Expect(err).To(BeNil())
+
+		kube := podmanTest.Podman([]string{"play", "kube", kubeYaml})
+		kube.WaitWithDefaultTimeout()
+		Expect(kube.ExitCode()).To(Equal(0))
+
+		inspect := podmanTest.Podman([]string{"port", getCtrNameInPod(pod)})
+		inspect.WaitWithDefaultTimeout()
+		Expect(inspect.ExitCode()).To(Equal(0))
+		Expect(inspect.OutputToString()).To(Equal("5000/tcp -> 127.0.0.100:5000"))
+	})
 })