Merge pull request #67 from ulucinar/fix-check

Pass maximum concurrent reconciles options to generated controllers

pkg/pipeline/templates/controller.go.tmpl

@@ -19,7 +19,7 @@ import (
 )
 
 // Setup adds a controller that reconciles {{ .CRD.Kind }} managed resources.
-func Setup(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter) error {
+func Setup(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, concurrency int) error {
 	name := managed.ControllerName({{ .TypePackageAlias }}{{ .CRD.Kind }}GroupVersionKind.String())
 	r := managed.NewReconciler(mgr,
 		xpresource.ManagedKind({{ .TypePackageAlias }}{{ .CRD.Kind }}GroupVersionKind),
@@ -30,7 +30,7 @@ func Setup(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter) error {
 
 	return ctrl.NewControllerManagedBy(mgr).
 		Named(name).
-		WithOptions(controller.Options{RateLimiter: rl}).
+		WithOptions(controller.Options{RateLimiter: rl, MaxConcurrentReconciles: concurrency}).
 		For(&{{ .TypePackageAlias }}{{ .CRD.Kind }}{}).
 		Complete(r)
 }

pkg/pipeline/templates/setup.go.tmpl

@@ -27,13 +27,13 @@ import (
 
 // Setup creates all controllers with the supplied logger and adds them to
 // the supplied manager.
-func Setup(mgr ctrl.Manager, l logging.Logger, wl workqueue.RateLimiter) error {
-	for _, setup := range []func(ctrl.Manager, logging.Logger, workqueue.RateLimiter) error{
+func Setup(mgr ctrl.Manager, l logging.Logger, wl workqueue.RateLimiter, concurrency int) error {
+	for _, setup := range []func(ctrl.Manager, logging.Logger, workqueue.RateLimiter, int) error{
 		{{- range $alias := .Aliases }}
 		{{ $alias }}Setup,
 		{{- end }}
 	} {
-		if err := setup(mgr, l, wl); err != nil {
+		if err := setup(mgr, l, wl, concurrency); err != nil {
 			return err
 		}
 	}

pkg/tfcli/init.go

@@ -194,8 +194,14 @@ func (c *Client) checkOperation() error {
 	}
 	// check if operation timed out if timeout is configured
 	if c.timeout != nil && xpState.Ts.Before(time.Now()) {
-		// then async operation has timed out
-		return c.removeStateStore()
+		storeExists, err := c.pathExists(filepath.Join(c.wsPath, fileStore), false)
+		if err != nil {
+			return err
+		}
+		// then async operation has timed out before generating a store file
+		if !storeExists {
+			return c.removeStateStore()
+		}
 	}
 	return tferrors.NewOperationInProgressError(xpState.Operation)
 }