gce: Remove custom resolver

nodeup/pkg/model/bootstrap_client.go

@@ -26,13 +26,11 @@ import (
 	"k8s.io/kops/pkg/bootstrap"
 	"k8s.io/kops/pkg/bootstrap/pkibootstrap"
 	"k8s.io/kops/pkg/kopscontrollerclient"
-	"k8s.io/kops/pkg/resolver"
 	"k8s.io/kops/pkg/wellknownports"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 	"k8s.io/kops/upup/pkg/fi/cloudup/azure"
 	"k8s.io/kops/upup/pkg/fi/cloudup/do"
-	"k8s.io/kops/upup/pkg/fi/cloudup/gce/gcediscovery"
 	"k8s.io/kops/upup/pkg/fi/cloudup/gce/tpm/gcetpmsigner"
 	"k8s.io/kops/upup/pkg/fi/cloudup/hetzner"
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
@@ -51,7 +49,6 @@ func (b BootstrapClientBuilder) Build(c *fi.NodeupModelBuilderContext) error {
 	}
 
 	var authenticator bootstrap.Authenticator
-	var resolver resolver.Resolver
 
 	switch b.CloudProvider() {
 	case kops.CloudProviderAWS:
@@ -66,11 +63,6 @@ func (b BootstrapClientBuilder) Build(c *fi.NodeupModelBuilderContext) error {
 			return err
 		}
 		authenticator = a
-		r, err := gcediscovery.New()
-		if err != nil {
-			return err
-		}
-		resolver = r
 	case kops.CloudProviderHetzner:
 		a, err := hetzner.NewHetznerAuthenticator()
 		if err != nil {
@@ -123,7 +115,6 @@ func (b BootstrapClientBuilder) Build(c *fi.NodeupModelBuilderContext) error {
 		Authenticator: authenticator,
 		CAs:           []byte(b.NodeupConfig.CAs[fi.CertificateIDCA]),
 		BaseURL:       baseURL,
-		Resolver:      resolver,
 	}
 
 	bootstrapClientTask := &nodetasks.BootstrapClientTask{

pkg/kopscontrollerclient/client.go

@@ -33,7 +33,6 @@ import (
 
 	"k8s.io/klog/v2"
 	"k8s.io/kops/pkg/bootstrap"
-	"k8s.io/kops/pkg/resolver"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 )
@@ -47,47 +46,9 @@ type Client struct {
 	// BaseURL is the base URL for the server
 	BaseURL url.URL
 
-	// Resolver is a custom resolver that supports resolution of hostnames without requiring DNS.
-	// In particular, this supports gossip mode.
-	Resolver resolver.Resolver
-
 	httpClient *http.Client
 }
 
-// dial implements a DialContext resolver function, for when a custom resolver is in use
-func (b *Client) dial(ctx context.Context, network, addr string) (net.Conn, error) {
-	var errors []error
-
-	host, port, err := net.SplitHostPort(addr)
-	if err != nil {
-		return nil, fmt.Errorf("cannot split host and port from %q: %w", addr, err)
-	}
-
-	// TODO: cache?
-	addresses, err := b.Resolver.Resolve(ctx, host)
-	if err != nil {
-		return nil, err
-	}
-
-	klog.Infof("resolved %q to %v", host, addresses)
-
-	for _, addr := range addresses {
-		timeout := 5 * time.Second
-		conn, err := net.DialTimeout(network, addr+":"+port, timeout)
-		if err == nil {
-			return conn, nil
-		}
-		if err != nil {
-			klog.Warningf("failed to dial %q: %v", addr, err)
-			errors = append(errors, err)
-		}
-	}
-	if len(errors) == 0 {
-		return nil, fmt.Errorf("no addresses for %q", addr)
-	}
-	return nil, errors[0]
-}
-
 func (b *Client) Query(ctx context.Context, req any, resp any) error {
 	if b.httpClient == nil {
 		certPool := x509.NewCertPool()
@@ -100,10 +61,6 @@ func (b *Client) Query(ctx context.Context, req any, resp any) error {
 			},
 		}
 
-		if b.Resolver != nil {
-			transport.DialContext = b.dial
-		}
-
 		httpClient := &http.Client{
 			Timeout:   time.Duration(15) * time.Second,
 			Transport: transport,
@@ -113,9 +70,7 @@ func (b *Client) Query(ctx context.Context, req any, resp any) error {
 	}
 
 	// Sanity-check DNS to provide clearer diagnostic messages.
-	if b.Resolver != nil {
-		// Don't check DNS when there's a custom resolver.
-	} else if ips, err := net.LookupIP(b.BaseURL.Hostname()); err != nil {
+	if ips, err := net.LookupIP(b.BaseURL.Hostname()); err != nil {
 		if dnsErr, ok := err.(*net.DNSError); ok && dnsErr.IsNotFound {
 			return fi.NewTryAgainLaterError(fmt.Sprintf("kops-controller DNS not setup yet (not found: %v)", dnsErr))
 		}

upup/pkg/fi/cloudup/gce/gcediscovery/resolver.go

@@ -25,7 +25,6 @@ import (
 	compute "google.golang.org/api/compute/v1"
 	"k8s.io/klog/v2"
 	"k8s.io/kops/pkg/apis/kops"
-	"k8s.io/kops/pkg/resolver"
 	"k8s.io/kops/protokube/pkg/gossip"
 	"k8s.io/kops/upup/pkg/fi/cloudup/gce"
 	"k8s.io/kops/upup/pkg/fi/cloudup/gce/gcemetadata"
@@ -220,8 +219,6 @@ func lastComponent(s string) string {
 	return s
 }
 
-var _ resolver.Resolver = &Discovery{}
-
 // Resolve implements resolver.Resolve, providing name -> address resolution using GCE discovery.
 func (r *Discovery) Resolve(ctx context.Context, name string) ([]string, error) {
 	var records []string

upup/pkg/fi/nodeup/command.go

@@ -48,13 +48,11 @@ import (
 	"k8s.io/kops/pkg/bootstrap/pkibootstrap"
 	"k8s.io/kops/pkg/configserver"
 	"k8s.io/kops/pkg/kopscontrollerclient"
-	"k8s.io/kops/pkg/resolver"
 	"k8s.io/kops/pkg/wellknownports"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 	"k8s.io/kops/upup/pkg/fi/cloudup/azure"
 	"k8s.io/kops/upup/pkg/fi/cloudup/do"
-	"k8s.io/kops/upup/pkg/fi/cloudup/gce/gcediscovery"
 	"k8s.io/kops/upup/pkg/fi/cloudup/gce/tpm/gcetpmsigner"
 	"k8s.io/kops/upup/pkg/fi/cloudup/hetzner"
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
@@ -606,7 +604,6 @@ func seedRNG(ctx context.Context, bootConfig *nodeup.BootConfig, region string)
 // getNodeConfigFromServers queries kops-controllers for our node's configuration.
 func getNodeConfigFromServers(ctx context.Context, bootConfig *nodeup.BootConfig, region string) (*nodeup.BootstrapResponse, error) {
 	var authenticator bootstrap.Authenticator
-	var resolver resolver.Resolver
 
 	switch bootConfig.CloudProvider {
 	case api.CloudProviderAWS:
@@ -621,12 +618,6 @@ func getNodeConfigFromServers(ctx context.Context, bootConfig *nodeup.BootConfig
 			return nil, err
 		}
 		authenticator = a
-
-		discovery, err := gcediscovery.New()
-		if err != nil {
-			return nil, err
-		}
-		resolver = discovery
 	case api.CloudProviderHetzner:
 		a, err := hetzner.NewHetznerAuthenticator()
 		if err != nil {
@@ -688,7 +679,6 @@ func getNodeConfigFromServers(ctx context.Context, bootConfig *nodeup.BootConfig
 
 	client := &kopscontrollerclient.Client{
 		Authenticator: authenticator,
-		Resolver:      resolver,
 		CAs:           []byte(bootConfig.ConfigServer.CACertificates),
 	}
 

upup/pkg/fi/nodeup/nodetasks/bootstrap_client.go

@@ -63,12 +63,9 @@ func (b *BootstrapClientTask) GetDependencies(tasks map[string]fi.NodeupTask) []
 	// BootstrapClient depends on the protokube service to ensure gossip DNS
 	var deps []fi.NodeupTask
 	for _, v := range tasks {
-		// If we aren't using a custom resolver, then
 		// BootstrapClient depends on the protokube service to ensure gossip DNS
-		if b.Client.Resolver == nil {
-			if svc, ok := v.(*Service); ok && svc.Name == protokubeService {
-				deps = append(deps, v)
-			}
+		if svc, ok := v.(*Service); ok && svc.Name == protokubeService {
+			deps = append(deps, v)
 		}
 	}
 	return deps