Generate Controlplane Init Bootstrap data

This PR generates the `kubeadm init` bootstrap data
It will wait unitl the infrastructure is ready before allowing anything
beyond the bootstrap control plane from joining the cluster.

Signed-off-by: Chuck Ha <[email protected]>

Author: chuckha

api/v1alpha2/kubeadmbootstrapconfig_types.go

@@ -21,14 +21,18 @@ import (
 	kubeadmv1beta1 "sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm/kubeadm/v1beta1"
 )
 
-// KubeadmConfigSpec defines the desired state of KubeadmConfig
+// KubeadmConfigSpec defines the desired state of KubeadmConfig.
+// Either ClusterConfiguration and InitConfiguration should be defined or the JoinConfiguration should be defined.
 type KubeadmConfigSpec struct {
-	ClusterConfiguration kubeadmv1beta1.ClusterConfiguration `json:"clusterConfiguration"`
-	InitConfiguration    kubeadmv1beta1.InitConfiguration    `json:"initConfiguration,omitempty"`
-	JoinConfiguration    kubeadmv1beta1.JoinConfiguration    `json:"joinConfiguration,omitempty"`
-	// AdditionalUserDataFiles specifies extra files to be passed to user_data upon creation.
+	// ClusterConfiguration along with InitConfiguration are the configurations necessary for the init command
 	// +optional
-	AdditionalUserDataFiles []Files `json:"additionalUserDataFiles,omitempty"`
+	ClusterConfiguration *kubeadmv1beta1.ClusterConfiguration `json:"clusterConfiguration,omitempty"`
+	// InitConfiguration along with ClusterConfiguration are the configurations necessary for the init command
+	// +optional
+	InitConfiguration *kubeadmv1beta1.InitConfiguration `json:"initConfiguration,omitempty"`
+	// JoinConfiguration is the kubeadm configuration for the join command
+	// +optional
+	JoinConfiguration *kubeadmv1beta1.JoinConfiguration `json:"joinConfiguration,omitempty"`
 }
 
 // KubeadmConfigStatus defines the observed state of KubeadmConfig

api/v1alpha2/zz_generated.deepcopy.go

@@ -22,6 +22,7 @@ package v1alpha2
 
 import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
+	"sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm/kubeadm/v1beta1"
 )
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
@@ -101,13 +102,20 @@ func (in *KubeadmConfigList) DeepCopyObject() runtime.Object {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *KubeadmConfigSpec) DeepCopyInto(out *KubeadmConfigSpec) {
 	*out = *in
-	in.ClusterConfiguration.DeepCopyInto(&out.ClusterConfiguration)
-	in.InitConfiguration.DeepCopyInto(&out.InitConfiguration)
-	in.JoinConfiguration.DeepCopyInto(&out.JoinConfiguration)
-	if in.AdditionalUserDataFiles != nil {
-		in, out := &in.AdditionalUserDataFiles, &out.AdditionalUserDataFiles
-		*out = make([]Files, len(*in))
-		copy(*out, *in)
+	if in.ClusterConfiguration != nil {
+		in, out := &in.ClusterConfiguration, &out.ClusterConfiguration
+		*out = new(v1beta1.ClusterConfiguration)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.InitConfiguration != nil {
+		in, out := &in.InitConfiguration, &out.InitConfiguration
+		*out = new(v1beta1.InitConfiguration)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.JoinConfiguration != nil {
+		in, out := &in.JoinConfiguration, &out.JoinConfiguration
+		*out = new(v1beta1.JoinConfiguration)
+		(*in).DeepCopyInto(*out)
 	}
 }
 

cloudinit/cloudinit.go

@@ -38,25 +38,25 @@ type BaseUserData struct {
 	WriteFiles         []v1alpha2.Files
 }
 
-func generate(kind string, tpl string, data interface{}) (string, error) {
+func generate(kind string, tpl string, data interface{}) ([]byte, error) {
 	tm := template.New(kind).Funcs(defaultTemplateFuncMap)
 	if _, err := tm.Parse(filesTemplate); err != nil {
-		return "", errors.Wrap(err, "failed to parse files template")
+		return nil, errors.Wrap(err, "failed to parse files template")
 	}
 
 	if _, err := tm.Parse(commandsTemplate); err != nil {
-		return "", errors.Wrap(err, "failed to parse commands template")
+		return nil, errors.Wrap(err, "failed to parse commands template")
 	}
 
 	t, err := tm.Parse(tpl)
 	if err != nil {
-		return "", errors.Wrapf(err, "failed to parse %s template", kind)
+		return nil, errors.Wrapf(err, "failed to parse %s template", kind)
 	}
 
 	var out bytes.Buffer
 	if err := t.Execute(&out, data); err != nil {
-		return "", errors.Wrapf(err, "failed to generate %s template", kind)
+		return nil, errors.Wrapf(err, "failed to generate %s template", kind)
 	}
 
-	return out.String(), nil
+	return out.Bytes(), nil
 }

cloudinit/controlplane_certs.go

@@ -17,7 +17,7 @@ limitations under the License.
 package cloudinit
 
 import (
-	"errors"
+	"github.com/pkg/errors"
 	"sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm/api/v1alpha2"
 )
 

cloudinit/controlplane_init.go

@@ -16,10 +16,6 @@ limitations under the License.
 
 package cloudinit
 
-import (
-	"github.com/pkg/errors"
-)
-
 const (
 	controlPlaneCloudInit = `{{.Header}}
 {{template "files" .WriteFiles}}
@@ -42,23 +38,23 @@ type ControlPlaneInput struct {
 	BaseUserData
 	Certificates
 
-	ClusterConfiguration string
-	InitConfiguration    string
+	ClusterConfiguration []byte
+	InitConfiguration    []byte
 }
 
 // NewInitControlPlane returns the user data string to be used on a controlplane instance.
-func NewInitControlPlane(input *ControlPlaneInput) (string, error) {
+func NewInitControlPlane(input *ControlPlaneInput) ([]byte, error) {
 	input.Header = cloudConfigHeader
 	if err := input.Certificates.validate(); err != nil {
-		return "", errors.Wrapf(err, "ControlPlaneInput is invalid")
+		return nil, err
 	}
 
 	input.WriteFiles = certificatesToFiles(input.Certificates)
 	input.WriteFiles = append(input.WriteFiles, input.AdditionalFiles...)
 	userData, err := generate("InitControlplane", controlPlaneCloudInit, input)
 	if err != nil {
-		return "", errors.Wrapf(err, "failed to generate user data for new control plane machine")
+		return nil, err
 	}
 
-	return userData, err
+	return userData, nil
 }

cloudinit/controlplane_join.go

@@ -34,28 +34,28 @@ runcmd:
 `
 )
 
-// ControlPlaneJoinInput defines context to generate controlplane instance user data for controlplane node join.
+// ControlPlaneJoinInput defines context to generate controlplane instance user data for control plane node join.
 type ControlPlaneJoinInput struct {
 	BaseUserData
 	Certificates
 
 	BootstrapToken      string
 	ControlPlaneAddress string
-	JoinConfiguration   string
+	JoinConfiguration   []byte
 }
 
-// NewJoinControlPlane returns the user data string to be used on a new contrplplane instance.
-func NewJoinControlPlane(input *ControlPlaneJoinInput) (string, error) {
+// NewJoinControlPlane returns the user data string to be used on a new control plane instance.
+func NewJoinControlPlane(input *ControlPlaneJoinInput) ([]byte, error) {
 	input.Header = cloudConfigHeader
 	if err := input.Certificates.validate(); err != nil {
-		return "", errors.Wrapf(err, "ControlPlaneInput is invalid")
+		return nil, errors.Wrapf(err, "ControlPlaneInput is invalid")
 	}
 
 	input.WriteFiles = certificatesToFiles(input.Certificates)
 	input.WriteFiles = append(input.WriteFiles, input.AdditionalFiles...)
 	userData, err := generate("JoinControlplane", controlPlaneJoinCloudInit, input)
 	if err != nil {
-		return "", errors.Wrapf(err, "failed to generate user data for machine joining control plane")
+		return nil, errors.Wrapf(err, "failed to generate user data for machine joining control plane")
 	}
 
 	return userData, err

cloudinit/node.go

@@ -35,11 +35,11 @@ runcmd:
 type NodeInput struct {
 	BaseUserData
 
-	JoinConfiguration string
+	JoinConfiguration []byte
 }
 
 // NewNode returns the user data string to be used on a node instance.
-func NewNode(input *NodeInput) (string, error) {
+func NewNode(input *NodeInput) ([]byte, error) {
 	input.Header = cloudConfigHeader
 	input.WriteFiles = append(input.WriteFiles, input.AdditionalFiles...)
 	return generate("Node", nodeCloudInit, input)

config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml

@@ -28,7 +28,9 @@ spec:
         metadata:
           type: object
         spec:
-          description: KubeadmConfigSpec defines the desired state of KubeadmConfig
+          description: KubeadmConfigSpec defines the desired state of KubeadmConfig.
+            Either ClusterConfiguration and InitConfiguration should be defined or
+            the JoinConfiguration should be defined.
           properties:
             additionalUserDataFiles:
               description: AdditionalUserDataFiles specifies extra files to be passed
@@ -57,8 +59,8 @@ spec:
                 type: object
               type: array
             clusterConfiguration:
-              description: ClusterConfiguration contains cluster-wide configuration
-                for a kubeadm cluster
+              description: ClusterConfiguration along with InitConfiguration are the
+                configurations necessary for the init command
               properties:
                 apiServer:
                   description: APIServer contains extra settings for the API server
@@ -375,8 +377,8 @@ spec:
               - networking
               type: object
             initConfiguration:
-              description: InitConfiguration contains a list of elements that is specific
-                "kubeadm init"-only runtime information.
+              description: InitConfiguration along with ClusterConfiguration are the
+                configurations necessary for the init command
               properties:
                 apiVersion:
                   description: 'APIVersion defines the versioned schema of this representation
@@ -525,8 +527,8 @@ spec:
                   type: object
               type: object
             joinConfiguration:
-              description: JoinConfiguration contains elements describing a particular
-                node.
+              description: JoinConfiguration is the kubeadm configuration for the
+                join command
               properties:
                 apiVersion:
                   description: 'APIVersion defines the versioned schema of this representation
@@ -703,8 +705,6 @@ spec:
               - discovery
               - nodeRegistration
               type: object
-          required:
-          - clusterConfiguration
           type: object
         status:
           description: KubeadmConfigStatus defines the observed state of KubeadmConfig