Skip to content

Commit 1c44a80

Browse files
committed
loadbalancer: resolve ControlPlaneEndpoint.Host when needed
`ControlPlaneEndpoint.Host` is not guaranteed to be an IP address, it can also be an hostname. Now we'll try to lookup the hostname if it's not an IP and set that for the LB VipAddress.
1 parent 5968640 commit 1c44a80

File tree

2 files changed

+47
-5
lines changed

2 files changed

+47
-5
lines changed

pkg/cloud/services/loadbalancer/loadbalancer.go

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package loadbalancer
1919
import (
2020
"errors"
2121
"fmt"
22+
"net"
2223
"reflect"
2324
"time"
2425

@@ -27,7 +28,7 @@ import (
2728
"github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors"
2829
"github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools"
2930
"k8s.io/apimachinery/pkg/util/wait"
30-
"k8s.io/utils/net"
31+
utilsnet "k8s.io/utils/net"
3132
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
3233
"sigs.k8s.io/cluster-api/util"
3334

@@ -46,16 +47,32 @@ const (
4647

4748
const loadBalancerProvisioningStatusActive = "ACTIVE"
4849

50+
// We wrap the net.LookupHost function in a variable to allow overriding it in unit tests.
51+
//
52+
//nolint:gocritic
53+
var lookupHost = func(host string) ([]string, error) {
54+
return net.LookupHost(host)
55+
}
56+
4957
func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackCluster, clusterName string, apiServerPort int) (bool, error) {
5058
loadBalancerName := getLoadBalancerName(clusterName)
5159
s.scope.Logger().Info("Reconciling load balancer", "name", loadBalancerName)
5260

5361
var fixedIPAddress string
62+
var err error
63+
5464
switch {
5565
case openStackCluster.Spec.APIServerFixedIP != "":
5666
fixedIPAddress = openStackCluster.Spec.APIServerFixedIP
5767
case openStackCluster.Spec.DisableAPIServerFloatingIP && openStackCluster.Spec.ControlPlaneEndpoint.IsValid():
58-
fixedIPAddress = openStackCluster.Spec.ControlPlaneEndpoint.Host
68+
ips, err := lookupHost(openStackCluster.Spec.ControlPlaneEndpoint.Host)
69+
if err != nil {
70+
return false, fmt.Errorf("lookup host: %w", err)
71+
}
72+
fixedIPAddress = ips[0]
73+
if net.ParseIP(fixedIPAddress) == nil {
74+
s.scope.Logger().Info("ControlPlaneEndpoint.Host is not an IP address, using the first resolved IP address", "host", openStackCluster.Spec.ControlPlaneEndpoint.Host, "ip", fixedIPAddress)
75+
}
5976
}
6077

6178
providers, err := s.loadbalancerClient.ListLoadBalancerProviders()
@@ -93,7 +110,14 @@ func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackClust
93110
case openStackCluster.Spec.APIServerFloatingIP != "":
94111
floatingIPAddress = openStackCluster.Spec.APIServerFloatingIP
95112
case openStackCluster.Spec.ControlPlaneEndpoint.IsValid():
96-
floatingIPAddress = openStackCluster.Spec.ControlPlaneEndpoint.Host
113+
ips, err := lookupHost(openStackCluster.Spec.ControlPlaneEndpoint.Host)
114+
if err != nil {
115+
return false, fmt.Errorf("lookup host: %w", err)
116+
}
117+
floatingIPAddress = ips[0]
118+
if net.ParseIP(floatingIPAddress) == nil {
119+
s.scope.Logger().Info("ControlPlaneEndpoint.Host is not an IP address, using the first resolved IP address", "host", openStackCluster.Spec.ControlPlaneEndpoint.Host, "ip", floatingIPAddress)
120+
}
97121
}
98122
fp, err := s.networkingService.GetOrCreateFloatingIP(openStackCluster, openStackCluster, clusterName, floatingIPAddress)
99123
if err != nil {
@@ -294,9 +318,9 @@ func validateIPs(openStackCluster *infrav1.OpenStackCluster, definedCIDRs []stri
294318

295319
for _, v := range definedCIDRs {
296320
switch {
297-
case net.IsIPv4String(v):
321+
case utilsnet.IsIPv4String(v):
298322
marshaledCIDRs = append(marshaledCIDRs, v+"/32")
299-
case net.IsIPv4CIDRString(v):
323+
case utilsnet.IsIPv4CIDRString(v):
300324
marshaledCIDRs = append(marshaledCIDRs, v)
301325
default:
302326
record.Warnf(openStackCluster, "FailedIPAddressValidation", "%s is not a valid IPv4 nor CIDR address and will not get applied to allowed_cidrs", v)

pkg/cloud/services/loadbalancer/loadbalancer_test.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ limitations under the License.
1717
package loadbalancer
1818

1919
import (
20+
"errors"
21+
"net"
2022
"testing"
2123

2224
"github.com/go-logr/logr"
@@ -28,6 +30,7 @@ import (
2830
"github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools"
2931
"github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/providers"
3032
. "github.com/onsi/gomega"
33+
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
3134

3235
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7"
3336
"sigs.k8s.io/cluster-api-provider-openstack/pkg/clients/mock"
@@ -38,9 +41,24 @@ func Test_ReconcileLoadBalancer(t *testing.T) {
3841
mockCtrl := gomock.NewController(t)
3942
defer mockCtrl.Finish()
4043

44+
// Stub the call to net.LookupHost
45+
lookupHost = func(host string) (addrs []string, err error) {
46+
if net.ParseIP(host) != nil {
47+
return []string{host}, nil
48+
} else if host == "api.test-cluster.test" {
49+
ips := []string{"192.168.100.10"}
50+
return ips, nil
51+
}
52+
return nil, errors.New("Unknown Host " + host)
53+
}
54+
4155
openStackCluster := &infrav1.OpenStackCluster{
4256
Spec: infrav1.OpenStackClusterSpec{
4357
DisableAPIServerFloatingIP: true,
58+
ControlPlaneEndpoint: clusterv1.APIEndpoint{
59+
Host: "api.test-cluster.test",
60+
Port: 6443,
61+
},
4462
},
4563
Status: infrav1.OpenStackClusterStatus{
4664
ExternalNetwork: &infrav1.NetworkStatus{

0 commit comments

Comments
 (0)