0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #44027 from thaJeztah/22.06_backport_libnetwork_ipvlan_fix

Browse source 
[22.06 backport] libnetwork/drivers/ipvlan: fix missing IpvlanFlag field in config JSON
This commit is contained in:
Sebastiaan van Stijn 2022-08-24 16:56:36 +02:00 • committed by GitHub
commit 64b0b54fc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnetwork/drivers/ipvlan/ipvlan_store.go
View file

@ -159,6 +159,7 @@ func (config *configuration) MarshalJSON() ([]byte, error) {
nMap["Mtu"] = config.Mtu
nMap["Parent"] = config.Parent
nMap["IpvlanMode"] = config.IpvlanMode
nMap["IpvlanFlag"] = config.IpvlanFlag
nMap["Internal"] = config.Internal
nMap["CreatedSubIface"] = config.CreatedSlaveLink
if len(config.Ipv4Subnets) > 0 {
@ -192,6 +193,7 @@ func (config *configuration) UnmarshalJSON(b []byte) error {
config.Mtu = int(nMap["Mtu"].(float64))
config.Parent = nMap["Parent"].(string)
config.IpvlanMode = nMap["IpvlanMode"].(string)
config.IpvlanFlag = nMap["IpvlanFlag"].(string)
config.Internal = nMap["Internal"].(bool)
config.CreatedSlaveLink = nMap["CreatedSubIface"].(bool)
if v, ok := nMap["Ipv4Subnets"]; ok {