From b1861b807264c49b5d7373073f37e33ac9f06891 Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Thu, 5 Sep 2024 21:25:07 -0500 Subject: [PATCH] Include all APIserver addresses for nodeup config --- pkg/nodemodel/nodeupconfigbuilder.go | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkg/nodemodel/nodeupconfigbuilder.go b/pkg/nodemodel/nodeupconfigbuilder.go index bcf7749a27742..8c2019e4018ac 100644 --- a/pkg/nodemodel/nodeupconfigbuilder.go +++ b/pkg/nodemodel/nodeupconfigbuilder.go @@ -318,18 +318,7 @@ func (n *nodeUpConfigBuilder) BuildConfig(ig *kops.InstanceGroup, wellKnownAddre var controlPlaneIPs []string switch cluster.GetCloudProvider() { case kops.CloudProviderAWS, kops.CloudProviderHetzner, kops.CloudProviderOpenstack: - // Use a private IP address that belongs to the cluster network CIDR (some additional addresses may be FQDNs or public IPs) - for _, additionalIP := range wellKnownAddresses[wellknownservices.KubeAPIServer] { - for _, networkCIDR := range append(cluster.Spec.Networking.AdditionalNetworkCIDRs, cluster.Spec.Networking.NetworkCIDR) { - _, cidr, err := net.ParseCIDR(networkCIDR) - if err != nil { - return nil, nil, fmt.Errorf("failed to parse network CIDR %q: %w", networkCIDR, err) - } - if cidr.Contains(net.ParseIP(additionalIP)) { - controlPlaneIPs = append(controlPlaneIPs, additionalIP) - } - } - } + controlPlaneIPs = append(controlPlaneIPs, wellKnownAddresses[wellknownservices.KubeAPIServer]...) case kops.CloudProviderGCE: // Use the IP address of the internal load balancer (forwarding-rule)