@@ -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,20 +44,39 @@ 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 net.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
+ return net .DefaultResolver .LookupHost (ctx , host )
59
+ }
60
+
49
61
func (s * Service ) ReconcileLoadBalancer (openStackCluster * infrav1.OpenStackCluster , clusterName string , apiServerPort int ) (bool , error ) {
50
62
loadBalancerName := getLoadBalancerName (clusterName )
51
63
s .scope .Logger ().Info ("Reconciling load balancer" , "name" , loadBalancerName )
52
64
53
65
var fixedIPAddress string
66
+ var err error
67
+
54
68
switch {
55
69
case openStackCluster .Spec .APIServerFixedIP != "" :
56
70
fixedIPAddress = openStackCluster .Spec .APIServerFixedIP
57
71
case openStackCluster .Spec .DisableAPIServerFloatingIP && openStackCluster .Spec .ControlPlaneEndpoint .IsValid ():
58
- fixedIPAddress = openStackCluster .Spec .ControlPlaneEndpoint .Host
72
+ ips , err := lookupHost (openStackCluster .Spec .ControlPlaneEndpoint .Host )
73
+ if err != nil {
74
+ return false , fmt .Errorf ("lookup host: %w" , err )
75
+ }
76
+ fixedIPAddress = ips [0 ]
77
+ if net .ParseIP (fixedIPAddress ) == nil {
78
+ s .scope .Logger ().Info (resolvedMsg , "host" , openStackCluster .Spec .ControlPlaneEndpoint .Host , "ip" , fixedIPAddress )
79
+ }
59
80
}
60
81
61
82
providers , err := s .loadbalancerClient .ListLoadBalancerProviders ()
@@ -93,7 +114,14 @@ func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackClust
93
114
case openStackCluster .Spec .APIServerFloatingIP != "" :
94
115
floatingIPAddress = openStackCluster .Spec .APIServerFloatingIP
95
116
case openStackCluster .Spec .ControlPlaneEndpoint .IsValid ():
96
- floatingIPAddress = openStackCluster .Spec .ControlPlaneEndpoint .Host
117
+ ips , err := lookupHost (openStackCluster .Spec .ControlPlaneEndpoint .Host )
118
+ if err != nil {
119
+ return false , fmt .Errorf ("lookup host: %w" , err )
120
+ }
121
+ floatingIPAddress = ips [0 ]
122
+ if net .ParseIP (floatingIPAddress ) == nil {
123
+ s .scope .Logger ().Info (resolvedMsg , "host" , openStackCluster .Spec .ControlPlaneEndpoint .Host , "ip" , floatingIPAddress )
124
+ }
97
125
}
98
126
fp , err := s .networkingService .GetOrCreateFloatingIP (openStackCluster , openStackCluster , clusterName , floatingIPAddress )
99
127
if err != nil {
@@ -294,9 +322,9 @@ func validateIPs(openStackCluster *infrav1.OpenStackCluster, definedCIDRs []stri
294
322
295
323
for _ , v := range definedCIDRs {
296
324
switch {
297
- case net .IsIPv4String (v ):
325
+ case utilsnet .IsIPv4String (v ):
298
326
marshaledCIDRs = append (marshaledCIDRs , v + "/32" )
299
- case net .IsIPv4CIDRString (v ):
327
+ case utilsnet .IsIPv4CIDRString (v ):
300
328
marshaledCIDRs = append (marshaledCIDRs , v )
301
329
default :
302
330
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