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

Merge pull request #44935 from corhere/fix-44925-ipvlan-unmarshal-panic

Browse source 
libnet/d/ipvlan: gracefully migrate from older dbs
This commit is contained in:
Bjorn Neergaard 2023-02-06 13:03:56 -07:00 committed by GitHub
commit c758d8b040
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -188,7 +188,12 @@ 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)
if v, ok := nMap["IpvlanFlag"]; ok {
config.IpvlanFlag = v.(string)
} else {
// Migrate config from an older daemon which did not have the flag configurable.
config.IpvlanFlag = flagBridge
}
config.Internal = nMap["Internal"].(bool)
config.CreatedSlaveLink = nMap["CreatedSubIface"].(bool)
if v, ok := nMap["Ipv4Subnets"]; ok {