Skip to content

OCPBUGS-70182: Unify capitalization when comparing architectures for available updates #1327

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

Open
DavidHurta wants to merge 3 commits into
base: release-4.18
Choose a base branch
from
Open

OCPBUGS-70182: Unify capitalization when comparing architectures for available updates #1327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3c564d
availableupdates_test: Add test cases for spec.DesiredUpdate
DavidHurta Nov 24, 2025
f46f52c
availableupdates: Unify capitalization when comparing architectures
DavidHurta Nov 24, 2025
1b8e283
availableupdates: Refactor getting desired/current architecture
DavidHurta Oct 30, 2025
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
21 changes: 10 additions & 11 deletions pkg/cvo/availableupdates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,7 @@ func (optr *Operator) syncAvailableUpdates(ctx context.Context, config *configv1

channel := config.Spec.Channel
desiredArch := optr.getDesiredArchitecture(config.Spec.DesiredUpdate)
currentArch := runtime.GOARCH

if optr.release.Architecture == configv1.ClusterVersionArchitectureMulti {
currentArch = "multi"
}

if desiredArch == "" {
desiredArch = currentArch
}
currentArch := optr.getCurrentArchitecture()

// updates are only checked at most once per minimumUpdateCheckInterval or if the generation changes
optrAvailableUpdates := optr.getAvailableUpdates()
Expand Down Expand Up @@ -327,10 +319,17 @@ func (optr *Operator) getAvailableUpdates() *availableUpdates {
}

func (optr *Operator) getDesiredArchitecture(update *configv1.Update) string {
if update != nil {
if update != nil && len(update.Architecture) > 0 {
return string(update.Architecture)
}
return ""
return optr.getCurrentArchitecture()
}

func (optr *Operator) getCurrentArchitecture() string {
if optr.release.Architecture == configv1.ClusterVersionArchitectureMulti {
return string(configv1.ClusterVersionArchitectureMulti)
}
return runtime.GOARCH
}

func calculateAvailableUpdatesStatus(ctx context.Context, clusterID string, transport *http.Transport, userAgent, updateService, desiredArch,
Expand Down
Loading