Add a 'timeout' to the standalone reconcile

When the reconcile is failing the process loop forever. This is annoying
when used into automation like Ansible.

This change ensures the process exit 1 when the reconcile in not done
after 5 minutes.

Change-Id: Iac270ef5c9a0339fe2f70a50db29f27f13dc0dbd

Author: morucci

CHANGELOG.md

@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
 
 - "Debug" toggle for fluent bit sidecars
 - A support for running zuul-executor component external to the cluster.
+- The standalone deployment mode exits 1 when the reconcile is not possible after 300 seconds
 
 ### Changed
 

cli/cmd/dev/apply.go

@@ -45,7 +45,11 @@ func applyStandalone(ns string, sfResource string, kubeContext string) {
 			"CR", sf,
 			"CR name", sf.ObjectMeta.Name,
 			"Namespace", ns)
-		controllers.Standalone(sf, ns, kubeContext)
+		err = controllers.Standalone(sf, ns, kubeContext)
+		if err != nil {
+			ctrl.Log.Error(err, "Could not reconcile resource")
+			os.Exit(1)
+		}
 		os.Exit(0)
 	}
 }

controllers/main.go

@@ -146,7 +146,7 @@ func Main(ns string, metricsAddr string, probeAddr string, enableLeaderElection
 	}
 }
 
-func Standalone(sf sfv1.SoftwareFactory, ns string, kubeContext string) {
+func Standalone(sf sfv1.SoftwareFactory, ns string, kubeContext string) error {
 
 	config := GetConfigContextOrDie(kubeContext)
 	cl, err := client.New(config, client.Options{
@@ -165,5 +165,5 @@ func Standalone(sf sfv1.SoftwareFactory, ns string, kubeContext string) {
 		RESTConfig: config,
 		CancelFunc: cancelFunc,
 	}
-	sfr.StandaloneReconcile(ctx, ns, sf)
+	return sfr.StandaloneReconcile(ctx, ns, sf)
 }

controllers/softwarefactory_controller.go

@@ -11,6 +11,7 @@ import (
 	"errors"
 	"fmt"
 	"sort"
+	"strconv"
 	"time"
 
 	certv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
@@ -436,8 +437,9 @@ func (r *SoftwareFactoryReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 
 }
 
-func (r *SoftwareFactoryReconciler) StandaloneReconcile(ctx context.Context, ns string, sf sfv1.SoftwareFactory) {
+func (r *SoftwareFactoryReconciler) StandaloneReconcile(ctx context.Context, ns string, sf sfv1.SoftwareFactory) error {
 	d, _ := time.ParseDuration("5s")
+	maxAttempt := 60
 	log := log.FromContext(ctx)
 
 	// Create a fake resource that simulate the Resource Owner.
@@ -456,21 +458,26 @@ func (r *SoftwareFactoryReconciler) StandaloneReconcile(ctx context.Context, ns
 		// Create the fake controller configMap
 		if err := r.Create(ctx, &controllerCM); err != nil {
 			log.Error(err, "Unable to create configMap", "name", controllerCMName)
-			return
+			return err
 		}
 	}
 
 	sfCtrl := r.mkSFController(ctx, ns, &controllerCM, sf, true)
+	attempt := 0
 
 	for {
 		status := sfCtrl.Step()
+		attempt += 1
+		if attempt == maxAttempt {
+			return errors.New("unable to reconcile after max attempts")
+		}
 		if status.Ready {
-			break
+			log.Info("Standalone reconcile done.")
+			return nil
 		}
-		log.Info("Waiting 5s for the next reconcile call ...")
+		log.Info("[attempt #" + strconv.Itoa(attempt) + "] Waiting 5s for the next reconcile call ...")
 		time.Sleep(d)
 	}
-	log.Info("Standalone reconcile done.")
 }
 
 // SetupWithManager sets up the controller with the Manager.