From 75299d39be8ee1b3347825ec2948b49788513e03 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 26 Nov 2018 19:08:43 +0100 Subject: [PATCH] Fix possible panic if NetworkConfig is nil Signed-off-by: Sebastiaan van Stijn --- manager/manager.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/manager/manager.go b/manager/manager.go index 241eee960f..b66a8db570 100644 --- a/manager/manager.go +++ b/manager/manager.go @@ -1010,10 +1010,16 @@ func (m *Manager) becomeLeader(ctx context.Context) { cluster = store.GetCluster(tx, clusterID) }) if cluster.DefaultAddressPool != nil { + if m.config.NetworkConfig == nil { + m.config.NetworkConfig = &cnmallocator.NetworkConfig{} + } m.config.NetworkConfig.DefaultAddrPool = append(m.config.NetworkConfig.DefaultAddrPool, cluster.DefaultAddressPool...) m.config.NetworkConfig.SubnetSize = cluster.SubnetSize } if cluster.VXLANUDPPort != 0 { + if m.config.NetworkConfig == nil { + m.config.NetworkConfig = &cnmallocator.NetworkConfig{} + } m.config.NetworkConfig.VXLANUDPPort = cluster.VXLANUDPPort } }