From 5520b63a06413751a48692515bce3220d29488ad Mon Sep 17 00:00:00 2001
From: nicolaferraro <ni.ferraro@gmail.com>
Date: Tue, 4 Jan 2022 00:17:22 +0100
Subject: [PATCH] Fix #1107: simplify applier code

---
 pkg/client/apply.go | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkg/client/apply.go b/pkg/client/apply.go
index 50be4a76df..cfcc2c6ebd 100644
--- a/pkg/client/apply.go
+++ b/pkg/client/apply.go
@@ -50,8 +50,6 @@ func (c *defaultClient) ServerOrClientSideApplier() ServerOrClientSideApplier {
 func (a *ServerOrClientSideApplier) Apply(ctx context.Context, object ctrl.Object) error {
 	once := false
 	var err error
-	// nolint: ifshort
-	needsRetry := false
 	a.tryServerSideApply.Do(func() {
 		once = true
 		if err = a.serverSideApply(ctx, object); err != nil {
@@ -59,17 +57,13 @@ func (a *ServerOrClientSideApplier) Apply(ctx context.Context, object ctrl.Objec
 				log.Info("Fallback to client-side apply for installing resources")
 				a.hasServerSideApply.Store(false)
 				err = nil
-			} else {
-				needsRetry = true
 			}
 		} else {
 			a.hasServerSideApply.Store(true)
 		}
 	})
-	if needsRetry {
-		a.tryServerSideApply = sync.Once{}
-	}
 	if err != nil {
+		a.tryServerSideApply = sync.Once{}
 		return err
 	}
 	if v := a.hasServerSideApply.Load(); v.(bool) {