Skip to content

[release-4.16] OCPBUGS-43964: Fix desired before sync_worker's work is initialized #1097

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-bot merged 6 commits into from
Nov 5, 2024
Merged

[release-4.16] OCPBUGS-43964: Fix desired before sync_worker's work is initialized #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e94580f
TestCVO: set known caps from configv1.KnownClusterVersionCapabilities
ingvagabund Jul 25, 2024
a411e9d
OCPBUGS-35228: Fix desired before sync_worker's work is initialized
hongkailiu Sep 10, 2024
6906bbf
Fix unit tests
hongkailiu Sep 11, 2024
e3a05d4
Add test to cover the case of stillInitializing == true
hongkailiu Sep 11, 2024
a1ee1ca
Better naming of variables and functions
hongkailiu Sep 12, 2024
ae4e180
Improve some wording and simplify unit tests
hongkailiu Sep 17, 2024
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
17 changes: 13 additions & 4 deletions pkg/cvo/cvo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,16 +677,25 @@ func (optr *Operator) sync(ctx context.Context, key string) error {
config := validation.ClearInvalidFields(original, errs)

// identify the desired next version
desired, ok := findUpdateFromConfig(config, optr.getArchitecture())
if ok {
klog.V(2).Infof("Desired version from spec is %#v", desired)
desired, found := findUpdateFromConfig(config, optr.getArchitecture())
initialized := optr.configSync.Initialized()
if found && initialized {
klog.V(2).Infof("Desired version from spec is %#v after initialization", desired)
} else {
pendingDesired := desired
currentVersion := optr.currentVersion()
desired = configv1.Update{
Version: currentVersion.Version,
Image: currentVersion.Image,
}
klog.V(2).Infof("Desired version from operator is %#v", desired)
if !initialized {
klog.V(2).Infof("Desired version from operator is %#v with user's request to go to %#v. "+
"We are currently initializing the worker and will evaluate the request later", desired, pendingDesired)
// enqueue to trigger a reconciliation on ClusterVersion
optr.queue.Add(optr.queueKey())
} else {
klog.V(2).Infof("Desired version from operator is %#v", desired)
}
}

// handle the case of a misconfigured CVO by doing nothing
Expand Down
Loading