Support old control-plane label

This queries both the new (/control-plane) and old (/master) labels.

The old label is only queried if we don't find any of the newer label.

Author: bigkevmcd

config/default/kustomization.yaml

@@ -1,5 +1,5 @@
 # Adds namespace to all resources.
-namespace: cluster-bootstrap-controller-system
+namespace: flux-system
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named

controllers/cluster.go

@@ -4,32 +4,34 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
+const (
+	deprecatedControlPlaneLabel = "node-role.kubernetes.io/master"
+	controlPlaneLabel           = "node-role.kubernetes.io/control-plane"
+)
+
 // IsControlPlaneReady takes a client connected to a cluster and reports whether or
 // not the control-plane for the cluster is "ready".
 func IsControlPlaneReady(ctx context.Context, cl client.Client) (bool, error) {
 	logger := log.FromContext(ctx)
-	nodes := &corev1.NodeList{}
-	// https://github.com/kubernetes/enhancements/blob/master/keps/sig-cluster-lifecycle/kubeadm/2067-rename-master-label-taint/README.md#design-details
-	err := cl.List(ctx, nodes, client.HasLabels([]string{"node-role.kubernetes.io/control-plane"}))
+	readiness := []bool{}
+	readyNodes, err := listReadyNodesWithLabel(ctx, logger, cl, controlPlaneLabel)
 	if err != nil {
-		return false, fmt.Errorf("failed to query cluster node list: %w", err)
+		return false, err
 	}
-	logger.Info("listed nodes", "count", len(nodes.Items))
+	readiness = append(readiness, readyNodes...)
 
-	readiness := []bool{}
-	for _, node := range nodes.Items {
-		for _, c := range node.Status.Conditions {
-			logger.Info("node status", "type", c.Type, "status", c.Status)
-			switch c.Type {
-			case corev1.NodeReady:
-				readiness = append(readiness, c.Status == corev1.ConditionTrue)
-			}
+	if len(readyNodes) == 0 {
+		readyNodes, err := listReadyNodesWithLabel(ctx, logger, cl, deprecatedControlPlaneLabel)
+		if err != nil {
+			return false, err
 		}
+		readiness = append(readiness, readyNodes...)
 	}
 
 	isReady := func(bools []bool) bool {
@@ -45,3 +47,24 @@ func IsControlPlaneReady(ctx context.Context, cl client.Client) (bool, error) {
 	// If we have no statuses, then we really don't know if we're ready or not.
 	return (len(readiness) > 0 && isReady(readiness)), nil
 }
+
+func listReadyNodesWithLabel(ctx context.Context, logger logr.Logger, cl client.Client, label string) ([]bool, error) {
+	nodes := &corev1.NodeList{}
+	// https://github.com/kubernetes/enhancements/blob/master/keps/sig-cluster-lifecycle/kubeadm/2067-rename-master-label-taint/README.md#design-details
+	err := cl.List(ctx, nodes, client.HasLabels([]string{label}))
+	if err != nil {
+		return nil, fmt.Errorf("failed to query cluster node list: %w", err)
+	}
+	logger.Info("listed nodes with control plane label", "label", label, "count", len(nodes.Items))
+
+	readiness := []bool{}
+	for _, node := range nodes.Items {
+		for _, c := range node.Status.Conditions {
+			switch c.Type {
+			case corev1.NodeReady:
+				readiness = append(readiness, c.Status == corev1.ConditionTrue)
+			}
+		}
+	}
+	return readiness, nil
+}

controllers/clusterbootstrapconfig_controller.go

@@ -104,7 +104,7 @@ func (r *ClusterBootstrapConfigReconciler) Reconcile(ctx context.Context, req ct
 			if !ready {
 				logger.Info("waiting for control plane to be ready", "cluster", clusterName)
 
-				return ctrl.Result{RequeueAfter: time.Minute * 2}, nil
+				return ctrl.Result{RequeueAfter: requeueAfterTime}, nil
 			}
 		}
 		if err := bootstrapClusterWithConfig(ctx, logger, r.Client, c, &clusterBootstrapConfig); err != nil {

controllers/clusterbootstrapconfig_controller_test.go

@@ -131,6 +131,48 @@ func TestReconcile_when_cluster_ready(t *testing.T) {
 	}
 }
 
+func TestReconcile_when_cluster_ready_and_old_label(t *testing.T) {
+	bc := makeTestClusterBootstrapConfig(func(c *capiv1alpha1.ClusterBootstrapConfig) {
+		c.Spec.RequireClusterReady = true
+	})
+	readyNode := makeNode(map[string]string{
+		"node-role.kubernetes.io/master": "",
+	}, corev1.NodeCondition{Type: "Ready", Status: "True", LastHeartbeatTime: metav1.Now(), LastTransitionTime: metav1.Now(), Reason: "KubeletReady", Message: "kubelet is posting ready status"})
+
+	cl := makeTestCluster(func(c *clusterv1.Cluster) {
+		c.ObjectMeta.Labels = bc.Spec.ClusterSelector.MatchLabels
+		c.Status.Phase = string(clusterv1.ClusterPhaseProvisioned)
+	})
+	secret := makeTestSecret(types.NamespacedName{
+		Name:      cl.GetName() + "-kubeconfig",
+		Namespace: cl.GetNamespace(),
+	}, map[string][]byte{"value": []byte("testing")})
+	// This cheats by using the local client as the remote client to simplify
+	// getting the value from the remote client.
+	reconciler := makeTestReconciler(t, bc, cl, secret, readyNode)
+	reconciler.configParser = func(b []byte) (client.Client, error) {
+		return reconciler.Client, nil
+	}
+
+	result, err := reconciler.Reconcile(context.TODO(), ctrl.Request{NamespacedName: types.NamespacedName{
+		Name:      bc.GetName(),
+		Namespace: bc.GetNamespace(),
+	}})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !result.IsZero() {
+		t.Fatalf("want empty result, got %v", result)
+	}
+	var jobs batchv1.JobList
+	if err := reconciler.List(context.TODO(), &jobs, client.InNamespace(testNamespace)); err != nil {
+		t.Fatal(err)
+	}
+	if l := len(jobs.Items); l != 1 {
+		t.Fatalf("found %d jobs, want %d", l, 1)
+	}
+}
+
 func makeTestReconciler(t *testing.T, objs ...runtime.Object) *ClusterBootstrapConfigReconciler {
 	s, tc := makeTestClientAndScheme(t, objs...)
 	return NewClusterBootstrapConfigReconciler(tc, s)