stashing this

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

Author: chuckha

api/v1alpha2/kubeadmbootstrapconfig_types.go

@@ -21,11 +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"`
+	// ClusterConfiguration along with InitConfiguration are the configurations necessary for the init command
+	// +optional
+	ClusterConfiguration *kubeadmv1beta1.ClusterConfiguration `json:"clusterConfiguration"`
+	// 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

controllers/bootstrapdata.go

@@ -36,16 +36,12 @@ func (u *BootstrapDataGenerator) GenerateControlPlaneInit(config *v1alpha2.Kubea
 
 	// TODO: use secrets for certs, plug into kubeadm
 	// 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")

controllers/kubeadmconfig_controller.go

@@ -18,13 +18,14 @@ package controllers
 
 import (
 	"context"
-	"time"
+	"encoding/json"
 
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubeadmv1alpha2 "sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm/api/v1alpha2"
+	"sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm/cloudinit"
 	"sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2"
 	"sigs.k8s.io/cluster-api/pkg/util"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -35,21 +36,13 @@ var (
 	machineKind = v1alpha2.SchemeGroupVersion.WithKind("Machine")
 )
 
-
-// Locker are the methods necessary to add locking around the first control plane init.
-type Locker interface {
-	Acquire(*v1alpha2.Cluster) bool
-	Release(*v1alpha2.Cluster) bool
-}
-
 type bootstrapDataGenerator interface {
 	GenerateControlPlaneInit(config *kubeadmv1alpha2.KubeadmConfig) error
 }
 
 // KubeadmConfigReconciler reconciles a KubeadmConfig object
 type KubeadmConfigReconciler struct {
 	client.Client
-	ControlPlaneInitLock   Locker
 	Log                    logr.Logger
 	BootstrapDataGenerator bootstrapDataGenerator
 }
@@ -130,18 +123,28 @@ func (r *KubeadmConfigReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
 		}
 	}
 
-	if util.IsControlPlaneMachine(machine) {
-		locked := r.ControlPlaneInitLock.Acquire(cluster)
-		// Could not acquire the lock so let's try again in a sec
-		if !locked {
-			return ctrl.Result{RequeueAfter: 10 * time.Second}, nil
+	// if the machine has cluster and or init defined on it then generate the init regular join
+	if config.Spec.InitConfiguration != nil && config.Spec.ClusterConfiguration != nil {
+		// get both of these to strings to pass to the cloud init control plane generator
+		initdata, err := json.Marshal(config.Spec.InitConfiguration)
+		if err != nil {
+			log.Error(err, "failed to marshal init configuration")
+			return ctrl.Result{}, err
 		}
-
-		// Generate control plane init
-		if err := r.BootstrapDataGenerator.GenerateControlPlaneInit(&config); err != nil {
-			log.Error(err, "error generating control plane init")
+		clusterdata, err := json.Marshal(config.Spec.ClusterConfiguration)
+		if err != nil {
+			log.Error(err, "failed to marshal cluster configuration")
 			return ctrl.Result{}, err
 		}
+
+		cloudinit.NewInitControlPlane(&cloudinit.ControlPlaneInput{
+			InitConfiguration: string(initdata),
+			ClusterConfiguration: string(clusterdata),
+		})
+	}
+
+	if util.IsControlPlaneMachine(machine) {
+
 	}
 
 	if err := r.Update(ctx, &config); err != nil {

go.sum

@@ -256,6 +256,7 @@ k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5 h1:VBM/0P5TWxwk+Nw6Z+lAw3DKgO76g
 k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 sigs.k8s.io/cluster-api v0.0.0-20190725170330-835ee872f98d h1:DjeaMyqyw5tpps/prbudaojzp8gRMPV6L6MU4C8M8Eg=
 sigs.k8s.io/cluster-api v0.0.0-20190725170330-835ee872f98d/go.mod h1:DIiQEP2FjsAiEgBTgT5EEUAVM7XRy7aLgeERFXvZHaQ=
+sigs.k8s.io/controller-runtime v0.1.12 h1:ovDq28E64PeY1yR+6H7DthakIC09soiDCrKvfP2tPYo=
 sigs.k8s.io/controller-runtime v0.2.0-beta.4 h1:S1XVfRWR1MuIXZdkYx3jN8JDw+bbQxmWZroy0i87z/A=
 sigs.k8s.io/controller-runtime v0.2.0-beta.4/go.mod h1:HweyYKQ8fBuzdu2bdaeBJvsFgAi/OqBBnrVGXcqKhME=
 sigs.k8s.io/controller-tools v0.2.0-beta.4 h1:W+coTe+nkVNclQrikwlRp6GJKwgcrHzvIQZ9kCaak5A=