Skip to content

Bug 1878925: pkg/cvo/updatepayload: Drop history from target pullspec lookup #684

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 1 commit into from
Nov 4, 2021
Merged

Bug 1878925: pkg/cvo/updatepayload: Drop history from target pullspec lookup #684

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 1 addition & 11 deletions pkg/cvo/updatepayload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,7 @@ func copyPayloadCmd(tdir string) string {
}

// findUpdateFromConfig identifies a desired update from user input or returns false. It will
// resolve payload if the user specifies a version and a matching available update or previous
// update is in the history.
// resolve payload if the user specifies a version and a matching available update.
func findUpdateFromConfig(config *configv1.ClusterVersion) (configv1.Update, bool) {
update := config.Spec.DesiredUpdate
if update == nil {
Expand All @@ -329,14 +328,5 @@ func findUpdateFromConfigVersion(config *configv1.ClusterVersion, version string
}, true
}
}
for _, history := range config.Status.History {
if history.Version == version && len(history.Image) > 0 {
return configv1.Update{
Version: version,
Image: history.Image,
Force: force,
}, true
}
}
return configv1.Update{}, false
}