Don't error when the cluster-access secret is not available.

Author: bigkevmcd

controllers/clusterbootstrapconfig_controller.go

@@ -23,6 +23,7 @@ import (
 	"time"
 
 	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -55,7 +56,7 @@ func NewClusterBootstrapConfigReconciler(c client.Client, s *runtime.Scheme) *Cl
 }
 
 // TODO: make this configurable on the Spec
-var requeueAfterTime = time.Minute * 2
+var requeueAfterTime = time.Second * 32
 
 //+kubebuilder:rbac:groups=capi.weave.works,resources=clusterbootstrapconfigs,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=capi.weave.works,resources=clusterbootstrapconfigs/status,verbs=get;update;patch
@@ -88,6 +89,11 @@ func (r *ClusterBootstrapConfigReconciler) Reconcile(ctx context.Context, req ct
 			clusterName := types.NamespacedName{Name: c.GetName(), Namespace: c.GetNamespace()}
 			clusterClient, err := r.clientForCluster(ctx, clusterName)
 			if err != nil {
+				if apierrors.IsNotFound(err) {
+					logger.Info("waiting for cluster access secret to be available")
+					return ctrl.Result{RequeueAfter: requeueAfterTime}, nil
+				}
+
 				return ctrl.Result{}, fmt.Errorf("failed to create client for cluster %s: %w", clusterName, err)
 			}
 
@@ -97,6 +103,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
 			}
 		}

controllers/clusterbootstrapconfig_controller_test.go

@@ -58,7 +58,35 @@ func TestReconcile_when_cluster_not_ready(t *testing.T) {
 	if l := len(jobs.Items); l != 0 {
 		t.Fatalf("found %d jobs, want %d", l, 0)
 	}
+}
+
+func TestReconcile_when_cluster_secret_not_available(t *testing.T) {
+	bc := makeTestClusterBootstrapConfig(func(c *capiv1alpha1.ClusterBootstrapConfig) {
+		c.Spec.RequireClusterReady = true
+	})
+	cl := makeTestCluster(func(c *clusterv1.Cluster) {
+		c.ObjectMeta.Labels = bc.Spec.ClusterSelector.MatchLabels
+		c.Status.Phase = string(clusterv1.ClusterPhaseProvisioned)
+	})
+	reconciler := makeTestReconciler(t, bc, cl)
+
+	// This cheats by using the test client as the remote client to simplify
+	// getting the value from the remote client.
+	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.RequeueAfter != requeueAfterTime {
+		t.Fatalf("RequeueAfter got %v, want %v", result.RequeueAfter, requeueAfterTime)
+	}
 }
 
 func TestReconcile_when_cluster_ready(t *testing.T) {