aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-10-05 16:08:37 +0200
committerGitHub <noreply@github.com>2022-10-05 16:08:37 +0200
commitab2f3cf54db1944257dce8a38c26757e5a3d79a4 (patch)
treeb06f657e5418897107143d02a0ebdabdd86e67c1
parent84c85f4d9457fb35849fa93ba04814df681b9093 (diff)
parentf250560a8043f25771f8ba41b2faf585829b0c9b (diff)
downloadpodman-ab2f3cf54db1944257dce8a38c26757e5a3d79a4.tar.gz
podman-ab2f3cf54db1944257dce8a38c26757e5a3d79a4.tar.bz2
podman-ab2f3cf54db1944257dce8a38c26757e5a3d79a4.zip
Merge pull request #16029 from andrei-n-cosma/kube-default-network
Add pods created by play kube to a default network
-rw-r--r--docs/source/markdown/podman-kube-play.1.md.in2
-rw-r--r--pkg/domain/infra/abi/play.go21
-rw-r--r--test/e2e/play_kube_test.go15
3 files changed, 37 insertions, 1 deletions
diff --git a/docs/source/markdown/podman-kube-play.1.md.in b/docs/source/markdown/podman-kube-play.1.md.in
index d3a6eaa03..dea47c307 100644
--- a/docs/source/markdown/podman-kube-play.1.md.in
+++ b/docs/source/markdown/podman-kube-play.1.md.in
@@ -155,7 +155,7 @@ Note: When joining multiple networks you should use the **--network name:mac=\<m
@@option network
-The *host* network mode should be configured in the YAML file.
+When no network option is specified and *host* network mode is not configured in the YAML file, a new network stack is created and pods are attached to it making possible pod to pod communication.
@@option no-hosts
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go
index 8779acfda..bec5c4cb5 100644
--- a/pkg/domain/infra/abi/play.go
+++ b/pkg/domain/infra/abi/play.go
@@ -40,6 +40,9 @@ import (
// container-specific sd-notify modes.
const sdNotifyAnnotation = "io.containers.sdnotify"
+// default network created/used by kube
+const kubeDefaultNetwork = "podman-default-kube-network"
+
// createServiceContainer creates a container that can later on
// be associated with the pods of a K8s yaml. It will be started along with
// the first pod.
@@ -114,6 +117,19 @@ func (ic *ContainerEngine) PlayKube(ctx context.Context, body io.Reader, options
report := &entities.PlayKubeReport{}
validKinds := 0
+ // when no network options are specified, create a common network for all the pods
+ if len(options.Networks) == 0 {
+ _, err := ic.NetworkCreate(
+ ctx, nettypes.Network{
+ Name: kubeDefaultNetwork,
+ DNSEnabled: true,
+ },
+ )
+ if err != nil && !errors.Is(err, nettypes.ErrNetworkExists) {
+ return nil, err
+ }
+ }
+
// read yaml document
content, err := io.ReadAll(body)
if err != nil {
@@ -338,6 +354,11 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY
return nil, err
}
+ // add kube default network if no network is explicitly added
+ if podOpt.Net.Network.NSMode != "host" && len(options.Networks) == 0 {
+ options.Networks = []string{kubeDefaultNetwork}
+ }
+
if len(options.Networks) > 0 {
ns, networks, netOpts, err := specgen.ParseNetworkFlag(options.Networks)
if err != nil {
diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go
index 651cb1074..8b9e43f65 100644
--- a/test/e2e/play_kube_test.go
+++ b/test/e2e/play_kube_test.go
@@ -3000,6 +3000,21 @@ MemoryReservation: {{ .HostConfig.MemoryReservation }}`})
Expect(logs.OutputToString()).To(Equal(netns))
})
+ It("podman play kube test with kube default network", func() {
+ pod := getPod()
+ err := generateKubeYaml("pod", pod, kubeYaml)
+ Expect(err).To(BeNil())
+
+ kube := podmanTest.Podman([]string{"play", "kube", kubeYaml})
+ kube.WaitWithDefaultTimeout()
+ Expect(kube).Should(Exit(0))
+
+ inspect := podmanTest.Podman([]string{"inspect", pod.Name, "--format", "{{ .InfraConfig.Networks }}"})
+ inspect.WaitWithDefaultTimeout()
+ Expect(inspect).Should(Exit(0))
+ Expect(inspect.OutputToString()).To(Equal("[podman-default-kube-network]"))
+ })
+
It("podman play kube persistentVolumeClaim", func() {
volName := "myvol"
volDevice := "tmpfs"