diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-27 09:32:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-27 09:32:49 -0400 |
| commit | c44efb011003942adedb6ac74457be0123d23a02 (patch) | |
| tree | adf0fa745aac5370ac8f55ff02100408a057d777 /pkg | |
| parent | 053b09660ffbe2df2104186c67e39be70764ff63 (diff) | |
| parent | 70a2c000891ca45c53a39753ad7fb7fde8384812 (diff) | |
| download | podman-c44efb011003942adedb6ac74457be0123d23a02.tar.gz podman-c44efb011003942adedb6ac74457be0123d23a02.tar.bz2 podman-c44efb011003942adedb6ac74457be0123d23a02.zip | |
Merge pull request #14029 from Luap99/kube-hostnet
play kube respect hostNetwork
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/domain/infra/abi/play.go | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go index 45500b23c..5de475480 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -199,18 +199,20 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY return nil, err } - ns, networks, netOpts, err := specgen.ParseNetworkFlag(options.Networks) - if err != nil { - return nil, err - } + if len(options.Networks) > 0 { + ns, networks, netOpts, err := specgen.ParseNetworkFlag(options.Networks) + if err != nil { + return nil, err + } - if (ns.IsBridge() && len(networks) == 0) || ns.IsHost() { - return nil, errors.Errorf("invalid value passed to --network: bridge or host networking must be configured in YAML") - } + if (ns.IsBridge() && len(networks) == 0) || ns.IsHost() { + return nil, errors.Errorf("invalid value passed to --network: bridge or host networking must be configured in YAML") + } - podOpt.Net.Network = ns - podOpt.Net.Networks = networks - podOpt.Net.NetworkOptions = netOpts + podOpt.Net.Network = ns + podOpt.Net.Networks = networks + podOpt.Net.NetworkOptions = netOpts + } // FIXME This is very hard to support properly with a good ux if len(options.StaticIPs) > *ipIndex { |