@@ -19,6 +19,7 @@ package loadbalancer
19
19
import (
20
20
"errors"
21
21
"fmt"
22
+ "net"
22
23
"reflect"
23
24
"time"
24
25
@@ -27,7 +28,7 @@ import (
27
28
"github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors"
28
29
"github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools"
29
30
"k8s.io/apimachinery/pkg/util/wait"
30
- "k8s.io/utils/net"
31
+ utilsnet "k8s.io/utils/net"
31
32
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
32
33
"sigs.k8s.io/cluster-api/util"
33
34
@@ -46,16 +47,30 @@ const (
46
47
47
48
const loadBalancerProvisioningStatusActive = "ACTIVE"
48
49
50
+ // Wrapper for net.LookupHost so we can override in the test
51
+ var lookupHost = func (host string ) (addrs []string , err error ) {
52
+ if net .ParseIP (host ) != nil {
53
+ return []string {host }, nil
54
+ }
55
+ return net .LookupHost (host )
56
+ }
57
+
49
58
func (s * Service ) ReconcileLoadBalancer (openStackCluster * infrav1.OpenStackCluster , clusterName string , apiServerPort int ) (bool , error ) {
50
59
loadBalancerName := getLoadBalancerName (clusterName )
51
60
s .scope .Logger ().Info ("Reconciling load balancer" , "name" , loadBalancerName )
52
61
53
62
var fixedIPAddress string
63
+ var err error
64
+
54
65
switch {
55
66
case openStackCluster .Spec .APIServerFixedIP != "" :
56
67
fixedIPAddress = openStackCluster .Spec .APIServerFixedIP
57
68
case openStackCluster .Spec .DisableAPIServerFloatingIP && openStackCluster .Spec .ControlPlaneEndpoint .IsValid ():
58
- fixedIPAddress = openStackCluster .Spec .ControlPlaneEndpoint .Host
69
+ ips , err := lookupHost (openStackCluster .Spec .ControlPlaneEndpoint .Host )
70
+ if err != nil {
71
+ return false , err
72
+ }
73
+ fixedIPAddress = ips [0 ]
59
74
}
60
75
61
76
providers , err := s .loadbalancerClient .ListLoadBalancerProviders ()
@@ -93,7 +108,11 @@ func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackClust
93
108
case openStackCluster .Spec .APIServerFloatingIP != "" :
94
109
floatingIPAddress = openStackCluster .Spec .APIServerFloatingIP
95
110
case openStackCluster .Spec .ControlPlaneEndpoint .IsValid ():
96
- floatingIPAddress = openStackCluster .Spec .ControlPlaneEndpoint .Host
111
+ ips , err := lookupHost (openStackCluster .Spec .ControlPlaneEndpoint .Host )
112
+ if err != nil {
113
+ return false , err
114
+ }
115
+ floatingIPAddress = ips [0 ]
97
116
}
98
117
fp , err := s .networkingService .GetOrCreateFloatingIP (openStackCluster , openStackCluster , clusterName , floatingIPAddress )
99
118
if err != nil {
@@ -294,9 +313,9 @@ func validateIPs(openStackCluster *infrav1.OpenStackCluster, definedCIDRs []stri
294
313
295
314
for _ , v := range definedCIDRs {
296
315
switch {
297
- case net .IsIPv4String (v ):
316
+ case utilsnet .IsIPv4String (v ):
298
317
marshaledCIDRs = append (marshaledCIDRs , v + "/32" )
299
- case net .IsIPv4CIDRString (v ):
318
+ case utilsnet .IsIPv4CIDRString (v ):
300
319
marshaledCIDRs = append (marshaledCIDRs , v )
301
320
default :
302
321
record .Warnf (openStackCluster , "FailedIPAddressValidation" , "%s is not a valid IPv4 nor CIDR address and will not get applied to allowed_cidrs" , v )
0 commit comments