Update etcd-manager/pkg/volumes/openstack/util.go

cleverer Co-authored-by: Ciprian Hacman <[email protected]>
kubernetes-retired · Mar 14, 2023 · 736f4b6 · 736f4b6
1 parent 53b8d17
commit 736f4b6
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/etcd-manager/pkg/volumes/openstack/util.go b/etcd-manager/pkg/volumes/openstack/util.go
@@ -35,13 +35,10 @@ func GetServerFixedIP(addrs map[string]interface{}, name string, networkCIDR *ne
 				if addrType, ok := addrMap[openstackExternalIPType]; ok && addrType == openstackAddressFixed {
 					if fixedIP, ok := addrMap[openstackAddress]; ok {
 						if fixedIPStr, ok := fixedIP.(string); ok {
-							if networkCIDR != nil {
-								if networkCIDR.Contains(net.ParseIP(fixedIPStr)) {
-									return fixedIPStr, nil
-								}
-							} else {
-								return fixedIPStr, nil
+							if networkCIDR != nil && !networkCIDR.Contains(net.ParseIP(fixedIPStr)) {
+									continue
 							}
+							return fixedIPStr, nil
 						}
 					}
 				}