Allow configuring the backoff time.

Round out the test coverage somewhat.

Author: bigkevmcd

api/v1alpha1/clusterbootstrapconfig_types.go

@@ -23,7 +23,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-const defaultWaitDuration = time.Duration(0)
+const defaultWaitDuration = time.Second * 60
 
 const BootstrappedAnnotation = "capi.weave.works/bootstrapped"
 
@@ -43,9 +43,17 @@ type JobTemplate struct {
 
 // ClusterBootstrapConfigSpec defines the desired state of ClusterBootstrapConfig
 type ClusterBootstrapConfigSpec struct {
-	ClusterSelector     metav1.LabelSelector `json:"clusterSelector"`
-	Template            JobTemplate          `json:"jobTemplate"`
-	RequireClusterReady bool                 `json:"requireClusterReady"`
+	ClusterSelector metav1.LabelSelector `json:"clusterSelector"`
+	Template        JobTemplate          `json:"jobTemplate"`
+
+	// Wait for the remote cluster to be "ready" before creating the jobs.
+	// Defaults to false.
+	//+kubebuilder:default:false
+	RequireClusterReady bool `json:"requireClusterReady"`
+	// When checking for readiness, this is the time to wait before
+	// checking again.
+	//+kubebuilder:default:60s
+	ClusterReadinessBackoff *metav1.Duration `json:"clusterReadinessBackoff,omitempty"`
 }
 
 // ClusterBootstrapConfigStatus defines the observed state of ClusterBootstrapConfig
@@ -64,6 +72,15 @@ type ClusterBootstrapConfig struct {
 	Status ClusterBootstrapConfigStatus `json:"status,omitempty"`
 }
 
+// ClusterReadinessRequeue returns the configured ClusterReadinessBackoff or a default
+// value if not configured.
+func (c ClusterBootstrapConfig) ClusterReadinessRequeue() time.Duration {
+	if v := c.Spec.ClusterReadinessBackoff; v != nil {
+		return v.Duration
+	}
+	return defaultWaitDuration
+}
+
 //+kubebuilder:object:root=true
 
 // ClusterBootstrapConfigList contains a list of ClusterBootstrapConfig

api/v1alpha1/clusterbootstrapconfig_types_test.go

@@ -0,0 +1,38 @@
+/*
+Copyright 2022.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	"testing"
+	"time"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func TestControl(t *testing.T) {
+	cfg := ClusterBootstrapConfig{}
+
+	if v := cfg.ClusterReadinessRequeue(); v != defaultWaitDuration {
+		t.Fatalf("ClusterReadinessRequeue() got %v, want %v", v, defaultWaitDuration)
+	}
+
+	want := time.Second * 20
+	cfg.Spec.ClusterReadinessBackoff = &metav1.Duration{Duration: want}
+	if v := cfg.ClusterReadinessRequeue(); v != want {
+		t.Fatalf("ClusterReadinessRequeue() got %v, want %v", v, want)
+	}
+}

api/v1alpha1/zz_generated.deepcopy.go

@@ -37,6 +37,10 @@ spec:
           spec:
             description: ClusterBootstrapConfigSpec defines the desired state of ClusterBootstrapConfig
             properties:
+              clusterReadinessBackoff:
+                description: When checking for readiness, this is the time to wait
+                  before checking again.
+                type: string
               clusterSelector:
                 description: A label selector is a label query over a set of resources.
                   The result of matchLabels and matchExpressions are ANDed. An empty
@@ -6890,6 +6894,8 @@ spec:
                 - spec
                 type: object
               requireClusterReady:
+                description: Wait for the remote cluster to be "ready" before creating
+                  the jobs. Defaults to false.
                 type: boolean
             required:
             - clusterSelector

config/crd/bases/capi.weave.works_clusterbootstrapconfigs.yaml

@@ -20,7 +20,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"time"
 
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -47,17 +46,16 @@ type ClusterBootstrapConfigReconciler struct {
 	configParser func(b []byte) (client.Client, error)
 }
 
+// NewClusterBootstrapConfigReconcielr creates and returns a configured
+// reconciler ready for use.
 func NewClusterBootstrapConfigReconciler(c client.Client, s *runtime.Scheme) *ClusterBootstrapConfigReconciler {
 	return &ClusterBootstrapConfigReconciler{
 		Client:       c,
 		Scheme:       s,
-		configParser: bytesToKubeConfig,
+		configParser: kubeConfigBytesToClient,
 	}
 }
 
-// TODO: make this configurable on the Spec
-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
 //+kubebuilder:rbac:groups=capi.weave.works,resources=clusterbootstrapconfigs/finalizers,verbs=update
@@ -91,7 +89,7 @@ func (r *ClusterBootstrapConfigReconciler) Reconcile(ctx context.Context, req ct
 			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{RequeueAfter: clusterBootstrapConfig.ClusterReadinessRequeue()}, nil
 				}
 
 				return ctrl.Result{}, fmt.Errorf("failed to create client for cluster %s: %w", clusterName, err)
@@ -104,7 +102,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: requeueAfterTime}, nil
+				return ctrl.Result{RequeueAfter: clusterBootstrapConfig.ClusterReadinessRequeue()}, nil
 			}
 		}
 		if err := bootstrapClusterWithConfig(ctx, logger, r.Client, c, &clusterBootstrapConfig); err != nil {
@@ -249,7 +247,7 @@ func (r *ClusterBootstrapConfigReconciler) getKubeConfig(ctx context.Context, cl
 	return kubeConfig, nil
 }
 
-func bytesToKubeConfig(b []byte) (client.Client, error) {
+func kubeConfigBytesToClient(b []byte) (client.Client, error) {
 	restConfig, err := clientcmd.RESTConfigFromKubeConfig(b)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse KubeConfig from secret: %w", err)