Skip to content

Commit

Permalink
Merge pull request #44937 from corhere/backport-23.0/fix-44925-ipvlan…
Browse files Browse the repository at this point in the history
…-panic

[23.0 backport] libnet/d/ipvlan: gracefully migrate from older dbs
  • Loading branch information
neersighted committed Feb 7, 2023
2 parents b67344b + 427101f commit fc5d6c9
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion libnetwork/drivers/ipvlan/ipvlan_store.go
Expand Up @@ -193,7 +193,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 {
Expand Down

0 comments on commit fc5d6c9

Please sign in to comment.