improve infinite loops

pkg/agent/agent.go

@@ -10,6 +10,7 @@ import (
 	"github.com/pluralsh/deployment-operator/pkg/manifests"
 	deploysync "github.com/pluralsh/deployment-operator/pkg/sync"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/util/workqueue"
@@ -91,13 +92,12 @@ func (agent *Agent) Run() {
 		}
 	}()
 
-	for {
+	wait.PollInfinite(agent.refresh, func() (done bool, err error) {
 		log.Info("fetching services for cluster")
 		svcs, err := agent.consoleClient.GetServices()
 		if err != nil {
 			log.Error(err, "failed to fetch service list from deployments service")
-			time.Sleep(agent.refresh)
-			continue
+			return false, nil
 		}
 
 		for _, svc := range svcs {
@@ -108,12 +108,12 @@ func (agent *Agent) Run() {
 		info, err := agent.discoveryClient.ServerVersion()
 		if err != nil {
 			log.Error(err, "failed to fetch cluster version")
+			return false, nil
 		}
 		v := fmt.Sprintf("%s.%s", info.Major, info.Minor)
 		if err := agent.consoleClient.Ping(v); err != nil {
 			log.Error(err, "failed to ping cluster after scheduling syncs")
 		}
-
-		time.Sleep(agent.refresh)
-	}
+		return false, nil
+	})
 }

pkg/sync/loop.go

@@ -4,13 +4,13 @@ import (
 	"context"
 	"fmt"
 	"runtime/debug"
-	"time"
 
 	"github.com/argoproj/gitops-engine/pkg/sync"
 	"github.com/argoproj/gitops-engine/pkg/sync/common"
 	"github.com/samber/lo"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/util/wait"
 )
 
 func (engine *Engine) ControlLoop() {
@@ -25,12 +25,12 @@ func (engine *Engine) ControlLoop() {
 
 	engine.RegisterHandlers()
 
-	for {
+	wait.PollInfinite(syncDelay, func() (done bool, err error) {
 		log.Info("Polling for new service updates")
 
 		item, shutdown := engine.svcQueue.Get()
 		if shutdown {
-			break
+			return true, nil
 		}
 
 		if err := engine.processItem(item); err != nil {
@@ -39,8 +39,8 @@ func (engine *Engine) ControlLoop() {
 
 		engine.syncing = ""
 
-		time.Sleep(time.Duration(syncDelay))
-	}
+		return false, nil
+	})
 }
 
 func (engine *Engine) processItem(item interface{}) error {