diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2021-11-03 14:54:48 +0100 |
|---|---|---|
| committer | Paul Holzinger <pholzing@redhat.com> | 2021-11-03 15:30:16 +0100 |
| commit | 001d48929dcbe4f3a8eeb3db2a7bfdce5a90f81a (patch) | |
| tree | c44bf5a4f6956f1d3900761079f452a9499f8af6 /pkg/domain/entities/pods.go | |
| parent | 82dba9754745f7598619050af4212a20b21821ad (diff) | |
| download | podman-001d48929dcbe4f3a8eeb3db2a7bfdce5a90f81a.tar.gz podman-001d48929dcbe4f3a8eeb3db2a7bfdce5a90f81a.tar.bz2 podman-001d48929dcbe4f3a8eeb3db2a7bfdce5a90f81a.zip | |
MAC address json unmarshal should allow strings
Create a new mac address type which supports json marshal/unmarshal from
and to string. This change is backwards compatible with the previous
versions as the unmarshal method still accepts the old byte array or
base64 encoded string.
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'pkg/domain/entities/pods.go')
| -rw-r--r-- | pkg/domain/entities/pods.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go index 3d8579acf..1df18be58 100644 --- a/pkg/domain/entities/pods.go +++ b/pkg/domain/entities/pods.go @@ -7,6 +7,7 @@ import ( commonFlag "github.com/containers/common/pkg/flag" "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/libpod/network/types" "github.com/containers/podman/v3/pkg/specgen" "github.com/containers/podman/v3/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" @@ -318,7 +319,8 @@ func ToPodSpecGen(s specgen.PodSpecGenerator, p *PodCreateOptions) (*specgen.Pod if p.Net != nil { s.NetNS = p.Net.Network s.StaticIP = p.Net.StaticIP - s.StaticMAC = p.Net.StaticMAC + // type cast to types.HardwareAddr + s.StaticMAC = (*types.HardwareAddr)(p.Net.StaticMAC) s.PortMappings = p.Net.PublishPorts s.CNINetworks = p.Net.CNINetworks s.NetworkOptions = p.Net.NetworkOptions |