Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-02-19 23:56:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[release/v2.1.x] fix: only wait for changeset if the result is not empty
This commit is contained in:
Hidde Beydals
2023-10-12 14:25:35 +02:00
committed by GitHub
parent b3e432cd8e 5e412ee73d
commit cef3eef641
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/utils/apply.go
View File

@@ -76,9 +76,11 @@ func Apply(ctx context.Context, rcg genericclioptions.RESTClientGetter, opts *ru
changeSet.Append(cs.Entries) changeSet.Append(cs.Entries)
} }
if len(changeSet.Entries) > 0 {
if err := waitForSet(rcg, opts, changeSet); err != nil { if err := waitForSet(rcg, opts, changeSet); err != nil {
return "", err return "", err
} }
}
if len(stageTwo) > 0 { if len(stageTwo) > 0 {
cs, err := applySet(ctx, rcg, opts, stageTwo) cs, err := applySet(ctx, rcg, opts, stageTwo)