From 91dbdff77e159fb5377cd57733a05c72cbd94c97 Mon Sep 17 00:00:00 2001 From: Christian Felder Date: Thu, 26 Mar 2020 15:12:22 +0100 Subject: Add support for specifying CNI networks in podman play kube Fixes: #5609 Signed-off-by: Christian Felder --- pkg/adapter/pods.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'pkg') diff --git a/pkg/adapter/pods.go b/pkg/adapter/pods.go index 9a83e9945..64ebd3954 100644 --- a/pkg/adapter/pods.go +++ b/pkg/adapter/pods.go @@ -595,6 +595,22 @@ func (r *LocalRuntime) PlayKubeYAML(ctx context.Context, c *cliconfig.KubePlayVa podPorts := getPodPorts(podYAML.Spec.Containers) podOptions = append(podOptions, libpod.WithInfraContainerPorts(podPorts)) + if c.Flag("network").Changed { + netValue := c.String("network") + switch strings.ToLower(netValue) { + case "bridge", "host": + return nil, errors.Errorf("invalid value passed to --network: bridge or host networking must be configured in YAML") + case "": + return nil, errors.Errorf("invalid value passed to --network: must provide a comma-separated list of CNI networks") + default: + // We'll assume this is a comma-separated list of CNI + // networks. + networks := strings.Split(netValue, ",") + logrus.Debugf("Pod joining CNI networks: %v", networks) + podOptions = append(podOptions, libpod.WithPodNetworks(networks)) + } + } + // Create the Pod pod, err = r.NewPod(ctx, podOptions...) if err != nil { -- cgit v1.2.3-54-g00ecf