capi: refactor bootstrap building to use shared ConfigBuilder

The intent is that the ConfigBuilder from bare-metal support is reusable.

Author: justinsb

clusterapi/controlplane/kops/api/v1beta1/kopscontrolplane_types.go

@@ -60,13 +60,35 @@ type KopsControlPlaneInitializationStatus struct {
 	ControlPlaneInitialized *bool `json:"controlPlaneInitialized,omitempty"`
 }
 
+// SystemEndpointType identifies the service that the SystemEndpoint is describing.
+type SystemEndpointType string
+
+const (
+	// SystemEndpointTypeKubeAPIServer indicates that the endpoint is for the Kubernetes API server.
+	SystemEndpointTypeKubeAPIServer SystemEndpointType = "kube-apiserver"
+	// SystemEndpointTypeKopsController indicates that the endpoint is for the kops-controller.
+	SystemEndpointTypeKopsController SystemEndpointType = "kops-controller"
+)
+
+// SystemEndpointScope describes whether an endpoint is intended for internal or external use.
+type SystemEndpointScope string
+
+const (
+	// SystemEndpointScopeInternal indicates that the endpoint is intended for internal use.
+	SystemEndpointScopeInternal SystemEndpointScope = "internal"
+	// SystemEndpointScopeExternal indicates that the endpoint is intended for external use.
+	SystemEndpointScopeExternal SystemEndpointScope = "external"
+)
+
 // SystemEndpoint represents a reachable Kubernetes API endpoint.
 type SystemEndpoint struct {
-	// The hostname on which the API server is serving.
-	Host string `json:"host"`
-	// The hostname on which the API server is serving.
-	Type  string `json:"type"`
-	Scope string `json:"scope"`
+	// The type of the endpoint
+	Type SystemEndpointType `json:"type"`
+
+	// The hostname or IP on which the API server is serving.
+	Endpoint string `json:"endpoint"`
+
+	Scope SystemEndpointScope `json:"scope"`
 }
 
 // +kubebuilder:object:root=true

pkg/commands/toolbox_enroll.go

@@ -423,11 +423,11 @@ type BootstrapData struct {
 // ConfigBuilder builds bootstrap configuration for a node.
 type ConfigBuilder struct {
 	// ClusterName is the name of the cluster to build.
-	// Required.
+	// Required (unless Cluster is set).
 	ClusterName string
 
 	// InstanceGroupName is the name of the InstanceGroup we are building configuration for.
-	// Required.
+	// Required (unless InstanceGroup is set).
 	InstanceGroupName string
 
 	// Clientset is the clientset to use to query for clusters / instancegroups etc

pkg/controllers/clusterapi/cluster_controller.go

@@ -31,6 +31,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/yaml"
+
+	capikops "k8s.io/kops/clusterapi/controlplane/kops/api/v1beta1"
 )
 
 // NewClusterReconciler is the constructor for an ClusterReconciler
@@ -163,7 +165,7 @@ func (s *clusterScope) applyGCPCluster(ctx context.Context, kube client.Client)
 	return nil
 }
 
-func (s *clusterScope) findSystemEndpoints(ctx context.Context) ([]map[string]any, error) {
+func (s *clusterScope) findSystemEndpoints(ctx context.Context) ([]capikops.SystemEndpoint, error) {
 	cluster := s.Cluster
 
 	clusterInternal := &kops.Cluster{}
@@ -183,38 +185,38 @@ func (s *clusterScope) findSystemEndpoints(ctx context.Context) ([]map[string]an
 		return nil, fmt.Errorf("error getting ingress status: %v", err)
 	}
 
-	var targets []map[string]any
+	var targets []capikops.SystemEndpoint
 
 	for _, ingress := range ingresses {
-		target := make(map[string]any)
+		var target capikops.SystemEndpoint
 		if ingress.Hostname != "" {
-			target["host"] = ingress.Hostname
+			target.Endpoint = ingress.Hostname
 		}
 		if ingress.IP != "" {
-			target["host"] = ingress.IP
+			target.Endpoint = ingress.IP
 		}
-		target["type"] = "kops-controller"
+		target.Type = capikops.SystemEndpointTypeKopsController
 		if ingress.InternalEndpoint {
-			target["scope"] = "internal"
+			target.Scope = capikops.SystemEndpointScopeInternal
 		} else {
-			target["scope"] = "global"
+			target.Scope = capikops.SystemEndpointScopeExternal
 		}
 		targets = append(targets, target)
 	}
 
 	for _, ingress := range ingresses {
-		target := make(map[string]any)
+		var target capikops.SystemEndpoint
 		if ingress.Hostname != "" {
-			target["host"] = ingress.Hostname
+			target.Endpoint = ingress.Hostname
 		}
 		if ingress.IP != "" {
-			target["host"] = ingress.IP
+			target.Endpoint = ingress.IP
 		}
-		target["type"] = "kube-apiserver"
+		target.Type = capikops.SystemEndpointTypeKubeAPIServer
 		if ingress.InternalEndpoint {
-			target["scope"] = "internal"
+			target.Scope = capikops.SystemEndpointScopeInternal
 		} else {
-			target["scope"] = "global"
+			target.Scope = capikops.SystemEndpointScopeExternal
 		}
 		targets = append(targets, target)
 	}
@@ -234,17 +236,17 @@ func (s *clusterScope) createKopsControlPlane(ctx context.Context, kube client.C
 	// TODO: cloud-provider-gcp should not assume cluster name is a valid prefix
 	name := gce.SafeClusterName(s.Cluster.GetName())
 
-	status := map[string]any{}
+	status := capikops.KopsControlPlaneStatus{}
 
 	systemEndpoints, err := s.findSystemEndpoints(ctx)
 	if err != nil {
 		return err
 	}
-	status["systemEndpoints"] = systemEndpoints
+	status.SystemEndpoints = systemEndpoints
 
-	status["initialization"] = map[string]any{
-		"controlPlaneInitialized": true,
-	}
+	status.Initialization = capikops.KopsControlPlaneInitializationStatus{}
+	controlPlaneInitialized := true
+	status.Initialization.ControlPlaneInitialized = &controlPlaneInitialized
 
 	// Create secret
 	{