Skip to content

Commit c2428d4

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 c2428d4

File tree

2 files changed

+44
-5
lines changed

2 files changed

+44
-5
lines changed

pkg/cloud/services/loadbalancer/loadbalancer.go

Lines changed: 26 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,29 @@ const (
4647

4748
const loadBalancerProvisioningStatusActive = "ACTIVE"
4849

50+
var lookupHost = func(host string) ([]string, error) {
51+
return net.LookupHost(host)
52+
}
53+
4954
func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackCluster, clusterName string, apiServerPort int) (bool, error) {
5055
loadBalancerName := getLoadBalancerName(clusterName)
5156
s.scope.Logger().Info("Reconciling load balancer", "name", loadBalancerName)
5257

5358
var fixedIPAddress string
59+
var err error
60+
5461
switch {
5562
case openStackCluster.Spec.APIServerFixedIP != "":
5663
fixedIPAddress = openStackCluster.Spec.APIServerFixedIP
5764
case openStackCluster.Spec.DisableAPIServerFloatingIP && openStackCluster.Spec.ControlPlaneEndpoint.IsValid():
58-
fixedIPAddress = openStackCluster.Spec.ControlPlaneEndpoint.Host
65+
ips, err := lookupHost(openStackCluster.Spec.ControlPlaneEndpoint.Host)
66+
if err != nil {
67+
return false, fmt.Errorf("lookup host: %w", err)
68+
}
69+
fixedIPAddress = ips[0]
70+
if net.ParseIP(fixedIPAddress) == nil {
71+
s.scope.Logger().Info("ControlPlaneEndpoint.Host is not an IP address, using the first resolved IP address", "host", openStackCluster.Spec.ControlPlaneEndpoint.Host, "ip", fixedIPAddress)
72+
}
5973
}
6074

6175
providers, err := s.loadbalancerClient.ListLoadBalancerProviders()
@@ -93,7 +107,14 @@ func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackClust
93107
case openStackCluster.Spec.APIServerFloatingIP != "":
94108
floatingIPAddress = openStackCluster.Spec.APIServerFloatingIP
95109
case openStackCluster.Spec.ControlPlaneEndpoint.IsValid():
96-
floatingIPAddress = openStackCluster.Spec.ControlPlaneEndpoint.Host
110+
ips, err := lookupHost(openStackCluster.Spec.ControlPlaneEndpoint.Host)
111+
if err != nil {
112+
return false, fmt.Errorf("lookup host: %w", err)
113+
}
114+
floatingIPAddress = ips[0]
115+
if net.ParseIP(floatingIPAddress) == nil {
116+
s.scope.Logger().Info("ControlPlaneEndpoint.Host is not an IP address, using the first resolved IP address", "host", openStackCluster.Spec.ControlPlaneEndpoint.Host, "ip", floatingIPAddress)
117+
}
97118
}
98119
fp, err := s.networkingService.GetOrCreateFloatingIP(openStackCluster, openStackCluster, clusterName, floatingIPAddress)
99120
if err != nil {
@@ -294,9 +315,9 @@ func validateIPs(openStackCluster *infrav1.OpenStackCluster, definedCIDRs []stri
294315

295316
for _, v := range definedCIDRs {
296317
switch {
297-
case net.IsIPv4String(v):
318+
case utilsnet.IsIPv4String(v):
298319
marshaledCIDRs = append(marshaledCIDRs, v+"/32")
299-
case net.IsIPv4CIDRString(v):
320+
case utilsnet.IsIPv4CIDRString(v):
300321
marshaledCIDRs = append(marshaledCIDRs, v)
301322
default:
302323
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)