summaryrefslogtreecommitdiff
path: root/pkg/domain/infra/abi/play.go
diff options
context:
space:
mode:
authorPaul Holzinger <pholzing@redhat.com>2021-12-13 15:56:20 +0100
committerPaul Holzinger <pholzing@redhat.com>2021-12-14 15:23:40 +0100
commit3e9af2029f1f92fbc069f81ba9ca90c090617e9c (patch)
tree2722625080848dd49e91ac60c93b10f5e5cda565 /pkg/domain/infra/abi/play.go
parent535818414c2a6bdcf6434e36c33775ea1a43f1cf (diff)
downloadpodman-3e9af2029f1f92fbc069f81ba9ca90c090617e9c.tar.gz
podman-3e9af2029f1f92fbc069f81ba9ca90c090617e9c.tar.bz2
podman-3e9af2029f1f92fbc069f81ba9ca90c090617e9c.zip
play kube add support for multiple networks
Allow the same --network options for play kube as for podman run/create. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'pkg/domain/infra/abi/play.go')
-rw-r--r--pkg/domain/infra/abi/play.go69
1 files changed, 41 insertions, 28 deletions
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go
index 409ba938a..6b3b04a0b 100644
--- a/pkg/domain/infra/abi/play.go
+++ b/pkg/domain/infra/abi/play.go
@@ -17,6 +17,7 @@ import (
"github.com/containers/image/v5/types"
"github.com/containers/podman/v3/libpod"
"github.com/containers/podman/v3/libpod/define"
+ nettypes "github.com/containers/podman/v3/libpod/network/types"
"github.com/containers/podman/v3/pkg/autoupdate"
"github.com/containers/podman/v3/pkg/domain/entities"
"github.com/containers/podman/v3/pkg/specgen"
@@ -195,39 +196,51 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY
return nil, err
}
- if options.Network != "" {
- ns, networks, netOpts, err := specgen.ParseNetworkFlag([]string{options.Network})
- if err != nil {
- return nil, err
- }
+ 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
- if len(networks) > 0 {
- podOpt.Net.Networks = networks
+ 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 {
+ if !podOpt.Net.Network.IsBridge() {
+ errors.Wrap(define.ErrInvalidArg, "static ip addresses can only be set when the network mode is bridge")
+ }
+ if len(podOpt.Net.Networks) != 1 {
+ return nil, errors.Wrap(define.ErrInvalidArg, "cannot set static ip addresses for more than network, use netname:ip=<ip> syntax to specify ips for more than network")
}
- if len(netOpts) > 0 {
- podOpt.Net.NetworkOptions = netOpts
+ for name, netOpts := range podOpt.Net.Networks {
+ netOpts.StaticIPs = append(netOpts.StaticIPs, options.StaticIPs[*ipIndex])
+ podOpt.Net.Networks[name] = netOpts
}
+ } else if len(options.StaticIPs) > 0 {
+ // only warn if the user has set at least one ip
+ logrus.Warn("No more static ips left using a random one")
}
-
- // FIXME This is very hard to support properly
- // if len(options.StaticIPs) > *ipIndex {
- // podOpt.Net.StaticIP = &options.StaticIPs[*ipIndex]
- // } else if len(options.StaticIPs) > 0 {
- // // only warn if the user has set at least one ip
- // logrus.Warn("No more static ips left using a random one")
- // }
- // if len(options.StaticMACs) > *ipIndex {
- // podOpt.Net.StaticMAC = &options.StaticMACs[*ipIndex]
- // } else if len(options.StaticIPs) > 0 {
- // // only warn if the user has set at least one mac
- // logrus.Warn("No more static macs left using a random one")
- // }
- // *ipIndex++
+ if len(options.StaticMACs) > *ipIndex {
+ if !podOpt.Net.Network.IsBridge() {
+ errors.Wrap(define.ErrInvalidArg, "static mac address can only be set when the network mode is bridge")
+ }
+ if len(podOpt.Net.Networks) != 1 {
+ return nil, errors.Wrap(define.ErrInvalidArg, "cannot set static mac address for more than network, use netname:mac=<mac> syntax to specify mac for more than network")
+ }
+ for name, netOpts := range podOpt.Net.Networks {
+ netOpts.StaticMAC = nettypes.HardwareAddr(options.StaticMACs[*ipIndex])
+ podOpt.Net.Networks[name] = netOpts
+ }
+ } else if len(options.StaticIPs) > 0 {
+ // only warn if the user has set at least one mac
+ logrus.Warn("No more static macs left using a random one")
+ }
+ *ipIndex++
p := specgen.NewPodSpecGenerator()
if err != nil {