Skip to content

Bug 1822752: pkg/cvo: Separate payload load from payload apply #683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Feb 11, 2022
Merged

Bug 1822752: pkg/cvo: Separate payload load from payload apply #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7221c93
pkg/cvo: Separate payload load from payload apply
jottofar Oct 28, 2021
8c0ee65
Change payload step msgs to reflect what's being done
jottofar Jan 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pkg/cvo/cvo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,11 +507,12 @@ func handleErr(ctx context.Context, queue workqueue.RateLimitingInterface, err e
// 1. A ClusterVersion object exists
// 2. The ClusterVersion object has the appropriate status for the state of the cluster
// 3. The configSync object is kept up to date maintaining the user's desired version
// 4. Loads initial/updated payload releases
//
// It returns an error if it could not update the cluster version object.
func (optr *Operator) sync(ctx context.Context, key string) error {
startTime := time.Now()
klog.V(2).Infof("Started syncing cluster version %q (%v)", key, startTime)
klog.V(2).Infof("Started syncing cluster version %q, spec changes, status, and payload (%v)", key, startTime)
defer func() {
klog.V(2).Infof("Finished syncing cluster version %q (%v)", key, time.Since(startTime))
}()
Expand Down Expand Up @@ -574,7 +575,7 @@ func (optr *Operator) sync(ctx context.Context, key string) error {
}

// inform the config sync loop about our desired state
status := optr.configSync.Update(config.Generation, desired, config.Spec.Overrides, state)
status := optr.configSync.Update(ctx, config.Generation, desired, config.Spec.Overrides, state, optr.name, optr.cvLister)

// write cluster version status
return optr.syncStatus(ctx, original, config, status, errs)
Expand Down
Loading