@@ -17,8 +17,10 @@ limitations under the License.
17
17
package loadbalancer
18
18
19
19
import (
20
+ "context"
20
21
"errors"
21
22
"fmt"
23
+ "net"
22
24
"reflect"
23
25
"time"
24
26
@@ -27,7 +29,7 @@ import (
27
29
"github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors"
28
30
"github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools"
29
31
"k8s.io/apimachinery/pkg/util/wait"
30
- "k8s.io/utils/net"
32
+ utilsnet "k8s.io/utils/net"
31
33
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
32
34
"sigs.k8s.io/cluster-api/util"
33
35
@@ -42,10 +44,28 @@ import (
42
44
const (
43
45
networkPrefix string = "k8s-clusterapi"
44
46
kubeapiLBSuffix string = "kubeapi"
47
+ resolvedMsg string = "ControlPlaneEndpoint.Host is not an IP address, using the first resolved IP address"
45
48
)
46
49
47
50
const loadBalancerProvisioningStatusActive = "ACTIVE"
48
51
52
+ // We wrap the LookupHost function in a variable to allow overriding it in unit tests.
53
+ //
54
+ //nolint:gocritic
55
+ var lookupHost = func (host string ) (string , error ) {
56
+ ctx , cancel := context .WithTimeout (context .TODO (), 30 * time .Second )
57
+ defer cancel ()
58
+ ips , err := net .DefaultResolver .LookupHost (ctx , host )
59
+ if err != nil {
60
+ return "" , err
61
+ }
62
+ if ip := net .ParseIP (ips [0 ]); ip == nil {
63
+ return "" , fmt .Errorf ("failed to resolve IP address for host %s" , host )
64
+ }
65
+ return ips [0 ], nil
66
+ }
67
+
68
+ // ReconcileLoadBalancer reconciles the load balancer for the given cluster.
49
69
func (s * Service ) ReconcileLoadBalancer (openStackCluster * infrav1.OpenStackCluster , clusterName string , apiServerPort int ) (bool , error ) {
50
70
loadBalancerName := getLoadBalancerName (clusterName )
51
71
s .scope .Logger ().Info ("Reconciling load balancer" , "name" , loadBalancerName )
@@ -57,13 +77,18 @@ func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackClust
57
77
}
58
78
59
79
var fixedIPAddress string
80
+ var err error
81
+
60
82
switch {
61
83
case lbStatus .InternalIP != "" :
62
84
fixedIPAddress = lbStatus .InternalIP
63
85
case openStackCluster .Spec .APIServerFixedIP != "" :
64
86
fixedIPAddress = openStackCluster .Spec .APIServerFixedIP
65
87
case openStackCluster .Spec .DisableAPIServerFloatingIP && openStackCluster .Spec .ControlPlaneEndpoint .IsValid ():
66
- fixedIPAddress = openStackCluster .Spec .ControlPlaneEndpoint .Host
88
+ fixedIPAddress , err = lookupHost (openStackCluster .Spec .ControlPlaneEndpoint .Host )
89
+ if err != nil {
90
+ return false , fmt .Errorf ("lookup host: %w" , err )
91
+ }
67
92
}
68
93
69
94
providers , err := s .loadbalancerClient .ListLoadBalancerProviders ()
@@ -108,7 +133,10 @@ func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackClust
108
133
case openStackCluster .Spec .APIServerFloatingIP != "" :
109
134
floatingIPAddress = openStackCluster .Spec .APIServerFloatingIP
110
135
case openStackCluster .Spec .ControlPlaneEndpoint .IsValid ():
111
- floatingIPAddress = openStackCluster .Spec .ControlPlaneEndpoint .Host
136
+ floatingIPAddress , err = lookupHost (openStackCluster .Spec .ControlPlaneEndpoint .Host )
137
+ if err != nil {
138
+ return false , fmt .Errorf ("lookup host: %w" , err )
139
+ }
112
140
}
113
141
fp , err := s .networkingService .GetOrCreateFloatingIP (openStackCluster , openStackCluster , clusterName , floatingIPAddress )
114
142
if err != nil {
@@ -307,9 +335,9 @@ func validateIPs(openStackCluster *infrav1.OpenStackCluster, definedCIDRs []stri
307
335
308
336
for _ , v := range definedCIDRs {
309
337
switch {
310
- case net .IsIPv4String (v ):
338
+ case utilsnet .IsIPv4String (v ):
311
339
marshaledCIDRs = append (marshaledCIDRs , v + "/32" )
312
- case net .IsIPv4CIDRString (v ):
340
+ case utilsnet .IsIPv4CIDRString (v ):
313
341
marshaledCIDRs = append (marshaledCIDRs , v )
314
342
default :
315
343
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