actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-24 16:41:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

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

Browse source 
fix: only wait for changeset if the result is not empty
This commit is contained in:
Hidde Beydals 2023-10-12 14:12:01 +02:00 committed by GitHub
commit 771b7ab98a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/utils/apply.go
View file

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