diff options
| author | Paul Holzinger <paul.holzinger@web.de> | 2021-05-04 17:06:57 +0200 |
|---|---|---|
| committer | Paul Holzinger <paul.holzinger@web.de> | 2021-05-04 20:14:13 +0200 |
| commit | fb7d16c7a841bbe2c02cb97b2820334b617e7f44 (patch) | |
| tree | bb82d46a3565624611c0696ef51efd903e82e6c1 /pkg/domain/infra/abi | |
| parent | dea6189982b4d128aa1ae9ce379a1f94b4eb8a8f (diff) | |
| download | podman-fb7d16c7a841bbe2c02cb97b2820334b617e7f44.tar.gz podman-fb7d16c7a841bbe2c02cb97b2820334b617e7f44.tar.bz2 podman-fb7d16c7a841bbe2c02cb97b2820334b617e7f44.zip | |
add --mac-address to podman play kube
Add a new --mac-address flag to podman play kube. This is used to specify
a static MAC address which should be used for the pod. This option can be
specified several times because play kube can create more than one pod.
Fixes #9731
Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
Diffstat (limited to 'pkg/domain/infra/abi')
| -rw-r--r-- | pkg/domain/infra/abi/play.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go index 6ddd4a042..4b8be6c35 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -199,11 +199,17 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY } if len(options.StaticIPs) > *ipIndex { p.StaticIP = &options.StaticIPs[*ipIndex] - *ipIndex++ } else if len(options.StaticIPs) > 0 { - // only warn if the user has set at least one ip ip + // 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 { + p.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++ // Create the Pod pod, err := generate.MakePod(p, ic.Libpod) |