diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-03 17:15:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-03 17:15:46 +0100 |
| commit | 4105b025d60dd6d067fa293de11c45dcfd7ea30e (patch) | |
| tree | 8e5f61e3adc5cb03d57a71a1998999d9d7587bb4 /pkg/specgen/podspecgen.go | |
| parent | a245da1e52b63c451f4683f7a9b225aa49521939 (diff) | |
| parent | 001d48929dcbe4f3a8eeb3db2a7bfdce5a90f81a (diff) | |
| download | podman-4105b025d60dd6d067fa293de11c45dcfd7ea30e.tar.gz podman-4105b025d60dd6d067fa293de11c45dcfd7ea30e.tar.bz2 podman-4105b025d60dd6d067fa293de11c45dcfd7ea30e.zip | |
Merge pull request #12166 from Luap99/mac
MAC address json unmarshal should allow strings
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. |