Merge pull request #2272 from johnstep/transparent-network-resiliency

Do not fail with an empty transparent IPv4 address
This commit is contained in:
Flavio Crisciani 2018-09-27 14:46:44 -07:00 committed by GitHub
commit 9b39ca36c7

View file

@ -261,7 +261,7 @@ func (ep *hnsEndpoint) UnmarshalJSON(b []byte) error {
}
if v, ok := epMap["Addr"]; ok {
if ep.addr, err = types.ParseCIDR(v.(string)); err != nil {
return types.InternalErrorf("failed to decode endpoint IPv4 address (%s) after json unmarshal: %v", v.(string), err)
logrus.Warnf("failed to decode endpoint IPv4 address (%s) after json unmarshal: %v", v.(string), err)
}
}
if v, ok := epMap["gateway"]; ok {