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/specgen/podspecgen.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/specgen/podspecgen.go')
| -rw-r--r-- | pkg/specgen/podspecgen.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/specgen/podspecgen.go b/pkg/specgen/podspecgen.go index 7713ea26c..32d5be79a 100644 --- a/pkg/specgen/podspecgen.go +++ b/pkg/specgen/podspecgen.go @@ -99,7 +99,7 @@ type PodNetworkConfig struct { // Only available if NetNS is set to Bridge (the default for root). // As such, conflicts with NoInfra=true by proxy. // Optional. - StaticMAC *net.HardwareAddr `json:"static_mac,omitempty"` + StaticMAC *types.HardwareAddr `json:"static_mac,omitempty"` // PortMappings is a set of ports to map into the infra container. // As, by default, containers share their network with the infra // container, this will forward the ports to the entire pod. |