Some general thoughts

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

Author: chuckha

cloudinit/controlplane_certs.go

@@ -16,7 +16,7 @@ limitations under the License.
 
 package cloudinit
 
-import "errors"
+import "github.com/pkg/errors"
 
 // Certificates is a template struct to hold certificate data
 type Certificates struct {

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}}
@@ -50,15 +46,15 @@ type ControlPlaneInput struct {
 func NewInitControlPlane(input *ControlPlaneInput) (string, error) {
 	input.Header = cloudConfigHeader
 	if err := input.Certificates.validate(); err != nil {
-		return "", errors.Wrapf(err, "ControlPlaneInput is invalid")
+		return "", 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 "", err
 	}
 
-	return userData, err
+	return userData, nil
 }

controllers/control_plane_init.go

@@ -0,0 +1,48 @@
+package controllers
+
+import (
+	"encoding/json"
+
+	"github.com/go-logr/logr"
+	"github.com/pkg/errors"
+	"sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm/api/v1alpha1"
+	"sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm/cloudinit"
+)
+
+type UserDataGenerator struct {
+	logr.Logger
+}
+
+func (u *UserDataGenerator) GenerateControlPlaneInit(config *v1alpha1.KubeadmBootstrapConfig) error {
+	u.Info("Generating user data for first control plane")
+
+	// TODO: sub in things in the cluster configuration like the cluster name and other data we can extract from the cluster object
+	config.Spec.ClusterConfiguration.APIVersion = "v1beta1"
+	config.Spec.ClusterConfiguration.Kind = "ClusterConfiguration"
+	clusterdata, err := json.Marshal(config.Spec.ClusterConfiguration)
+	if err != nil {
+		u.Error(err, "failed to marshal cluster configuration")
+		return errors.WithStack(err)
+	}
+
+	config.Spec.ClusterConfiguration.Kind = "v1beta1"
+	config.Spec.ClusterConfiguration.APIVersion = "InitConfiguration"
+	initdata, err := json.Marshal(config.Spec.InitConfiguration)
+	if err != nil {
+		u.Error(err, "failed to marshal init configuration")
+		return errors.WithStack(err)
+	}
+
+	cicfg, err := cloudinit.NewInitControlPlane(&cloudinit.ControlPlaneInput{
+		ClusterConfiguration: string(clusterdata),
+		InitConfiguration:    string(initdata),
+	})
+	if err != nil {
+		u.Error(err, "could not create new init control plane")
+		return err
+	}
+
+	config.Status.BootstrapData = []byte(cicfg)
+	config.Status.Ready = true
+	return nil
+}

controllers/kubeadmbootstrapconfig_controller.go

@@ -18,7 +18,7 @@ package controllers
 
 import (
 	"context"
-	"fmt"
+	"time"
 
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
@@ -33,10 +33,15 @@ var (
 	machineKind = v1alpha2.SchemeGroupVersion.WithKind("Machine").String()
 )
 
+type userDataGenerator interface {
+	GenerateControlPlaneInit(config *kubeadmv1alpha1.KubeadmBootstrapConfig) error
+}
+
 // KubeadmBootstrapConfigReconciler reconciles a KubeadmBootstrapConfig object
 type KubeadmBootstrapConfigReconciler struct {
 	client.Client
-	Log logr.Logger
+	Log               logr.Logger
+	UserDataGenerator userDataGenerator
 }
 
 // +kubebuilder:rbac:groups=kubeadm.bootstrap.cluster.sigs.k8s.io,resources=kubeadmbootstrapconfigs,verbs=get;list;watch;create;update;patch;delete
@@ -50,8 +55,8 @@ func (r *KubeadmBootstrapConfigReconciler) Reconcile(req ctrl.Request) (ctrl.Res
 
 	config := kubeadmv1alpha1.KubeadmBootstrapConfig{}
 	if err := r.Get(ctx, req.NamespacedName, &config); err != nil {
-		log.Error(err, "failed to get config", "stacktrace", fmt.Sprintf("%+v", err))
-		return ctrl.Result{}, err
+		log.Error(err, "failed to get config")
+		return ctrl.Result{}, errors.WithStack(err)
 	}
 
 	// Find the owner reference
@@ -93,6 +98,30 @@ func (r *KubeadmBootstrapConfigReconciler) Reconcile(req ctrl.Request) (ctrl.Res
 		log.Error(err, "failed to get cluster")
 		return ctrl.Result{}, errors.WithStack(err)
 	}
+
+	// If the machine is not Ready, requeue until it's ready
+	if machine.Status.BootstrapReady == nil || *machine.Status.BootstrapReady == false {
+		log.Info("requeuing as machine is not yet ready", "machine-name", machine.Name)
+		return ctrl.Result{RequeueAfter: 30 * time.Second}, nil
+	}
+
+	// if the bootstrap data is not nil then it's already been generated and we don't have anything else to do
+	if machine.Spec.Bootstrap.Data != nil {
+		log.Info("Nothing to be done for this machine", "machine-name", machine.Name)
+		return ctrl.Result{}, nil
+	}
+
+	// Generate the cloud-init for controlplane init
+	if r.UserDataGenerator == nil {
+		r.UserDataGenerator = &UserDataGenerator{
+			Logger: r.Log.WithName("user-data-generator"),
+		}
+	}
+	if err := r.UserDataGenerator.GenerateControlPlaneInit(&config); err != nil {
+		log.Error(err, "error generating control plane init")
+		return ctrl.Result{}, err
+	}
+	// TODO save config object
 	return ctrl.Result{}, nil
 }