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

fix: only wait for changeset if the result is not empty
pull/4284/head
Hidde Beydals 1 year ago committed by GitHub
commit 771b7ab98a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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)

Loading…
Cancel
Save