zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2026-04-22 16:07:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-v1.5.1' into v1.5.1/post-fixes

Browse Source
This commit is contained in:
Abhishek Kondur
2026-04-06 12:06:02 +05:30
committed by GitHub
parent 6a522ae857 cbe60831d5
commit 77a107d55f
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
migrate/migrate_v1_5_1.go
+17 -11
View File
@@ -207,18 +207,23 @@ func migrateNetworks(ctx context.Context) error {
return err
}
_, cidr, err := net.ParseCIDR(network.AddressRange)
if err != nil {
err = fmt.Errorf("error parsing network (%s) cidr (%s): %v", _network.Name, network.AddressRange, err)
logger.Log(4, fmt.Sprintf("migrating network %s failed: %v", _network.Name, err))
return err
var cidr, cidrv6 *net.IPNet
if len(network.AddressRange) != 0 {
_, cidr, err = net.ParseCIDR(network.AddressRange)
if err != nil {
err = fmt.Errorf("error parsing network (%s) cidr (%s): %v", _network.Name, network.AddressRange, err)
logger.Log(4, fmt.Sprintf("migrating network %s failed: %v", _network.Name, err))
return err
}
}
_, cidrv6, err := net.ParseCIDR(network.AddressRange6)
if err != nil {
err = fmt.Errorf("error parsing network (%s) cidr (%s): %v", _network.Name, network.AddressRange6, err)
logger.Log(4, fmt.Sprintf("migrating network %s failed: %v", _network.Name, err))
return err
if len(network.AddressRange6) != 0 {
_, cidrv6, err = net.ParseCIDR(network.AddressRange6)
if err != nil {
err = fmt.Errorf("error parsing network (%s) cidr (%s): %v", _network.Name, network.AddressRange6, err)
logger.Log(4, fmt.Sprintf("migrating network %s failed: %v", _network.Name, err))
return err
}
}
superAdmin := &schema.User{}
@@ -253,7 +258,8 @@ func migrateNetworks(ctx context.Context) error {
if net.ParseIP(nsIP) == nil {
continue
}
if !cidr.Contains(net.ParseIP(nsIP)) && !cidrv6.Contains(net.ParseIP(nsIP)) {
if (cidr != nil && !cidr.Contains(net.ParseIP(nsIP))) &&
(cidrv6 != nil && !cidrv6.Contains(net.ParseIP(nsIP))) {
ns.Servers = append(ns.Servers, nsIP)
}
}