Merge pull request #4296 from Skarlso/fix-apply-timeout-on-empty-set

fix: only wait for changeset if the result is not empty
fluxcd · Oct 12, 2023 · 771b7ab · 771b7ab
2 parents be03ca3 + a51ede6
commit 771b7ab
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/internal/utils/apply.go b/internal/utils/apply.go
@@ -76,8 +76,10 @@ func Apply(ctx context.Context, rcg genericclioptions.RESTClientGetter, opts *ru
 		changeSet.Append(cs.Entries)
 	}
 
-	if err := waitForSet(rcg, opts, changeSet); err != nil {
-		return "", err
+	if len(changeSet.Entries) > 0 {
+		if err := waitForSet(rcg, opts, changeSet); err != nil {
+			return "", err
+		}
 	}
 
 	if len(stageTwo) > 0 {