diff options
author | Paul Holzinger <pholzing@redhat.com> | 2022-05-31 16:49:40 +0200 |
---|---|---|
committer | Paul Holzinger <pholzing@redhat.com> | 2022-05-31 16:49:40 +0200 |
commit | 205c8c071e8550b2ddd57cfaa71af7345cfd5fe7 (patch) | |
tree | 5e95293441a8aaef0952bcf9236eba82c4a76375 /libpod | |
parent | dc67e6a182a09c8b65ef139fb9f15ddfdecae70f (diff) | |
download | podman-205c8c071e8550b2ddd57cfaa71af7345cfd5fe7.tar.gz podman-205c8c071e8550b2ddd57cfaa71af7345cfd5fe7.tar.bz2 podman-205c8c071e8550b2ddd57cfaa71af7345cfd5fe7.zip |
fix podman container restore without CreateNetNS
When a container does not use the default podman netns, for example
--network none or --network ns:/path a restore would fail because the
specgen check validates that c.config.StaticMAC is nil but the
unmarshaller sets it to an empty slice.
While we could make the check use len() > 0 I feel like it is more
common to check with != nil for ip and mac addresses.
Adding omitempty tag makes the json marshal/unmarshal work correctly.
This should not cause any issues.
Fixes #14389
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'libpod')
-rw-r--r-- | libpod/container_config.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_config.go b/libpod/container_config.go index ae3bc5865..30b84adcf 100644 --- a/libpod/container_config.go +++ b/libpod/container_config.go @@ -243,12 +243,12 @@ type ContainerNetworkConfig struct { // This cannot be set unless CreateNetNS is set. // If not set, the container will be dynamically assigned an IP by CNI. // Deprecated: Do no use this anymore, this is only for DB backwards compat. - StaticIP net.IP `json:"staticIP"` + StaticIP net.IP `json:"staticIP,omitempty"` // StaticMAC is a static MAC to request for the container. // This cannot be set unless CreateNetNS is set. // If not set, the container will be dynamically assigned a MAC by CNI. // Deprecated: Do no use this anymore, this is only for DB backwards compat. - StaticMAC types.HardwareAddr `json:"staticMAC"` + StaticMAC types.HardwareAddr `json:"staticMAC,omitempty"` // PortMappings are the ports forwarded to the container's network // namespace // These are not used unless CreateNetNS is true |