From 092902b455551d7353163c1e6d322f3605b9a897 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 29 Jun 2021 14:18:46 -0400 Subject: Handle advanced --network options in podman play kube Since Podman create/run can support this, so should play. Fixes: https://github.com/containers/podman/issues/10807 Signed-off-by: Daniel J Walsh --- pkg/domain/infra/abi/play.go | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'pkg/domain') diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go index 0ac9b5d8d..4782f0d01 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -182,20 +182,22 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY return nil, err } if options.Network != "" { - switch strings.ToLower(options.Network) { - case "bridge", "host": + ns, cniNets, netOpts, err := specgen.ParseNetworkString(options.Network) + if err != nil { + return nil, err + } + + if (ns.IsBridge() && len(cniNets) == 0) || ns.IsHost() { 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(options.Network, ",") - logrus.Debugf("Pod joining CNI networks: %v", networks) - p.NetNS.NSMode = specgen.Bridge - p.CNINetworks = append(p.CNINetworks, networks...) + } + logrus.Debugf("Pod %q joining CNI networks: %v", podName, cniNets) + p.NetNS.NSMode = specgen.Bridge + p.CNINetworks = append(p.CNINetworks, cniNets...) + if len(netOpts) > 0 { + p.NetworkOptions = netOpts } } + if len(options.StaticIPs) > *ipIndex { p.StaticIP = &options.StaticIPs[*ipIndex] } else if len(options.StaticIPs) > 0 { -- cgit v1.2.3-54-g00ecf