Merge pull request #4326 from fluxcd/backport-4296-to-release/v2.1.x

[release/v2.1.x] fix: only wait for changeset if the result is not empty
fluxcd · Oct 12, 2023 · cef3eef · cef3eef
2 parents b3e432c + 5e412ee
commit cef3eef
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 {