From 92e79774fc1ebf6388a4af82ef1fea750792e555 Mon Sep 17 00:00:00 2001 From: Brad Williams Date: Thu, 26 Feb 2026 15:38:11 -0500 Subject: [PATCH] Fixing release-5 prefix bug for OCP 5.0 rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED --- cmd/release-controller/sync_verify.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/cmd/release-controller/sync_verify.go b/cmd/release-controller/sync_verify.go index 482aa7b84..086809902 100644 --- a/cmd/release-controller/sync_verify.go +++ b/cmd/release-controller/sync_verify.go @@ -220,7 +220,7 @@ func (c *Controller) resolveUpgradeRelease(upgradeRelease *releasecontroller.Upg } else if upgradeRelease.Candidate != nil { // create blank semver.Range var constraint semver.Range - stream := fmt.Sprintf("%s.0-0.%s%s", upgradeRelease.Candidate.Version, upgradeRelease.Candidate.Stream, strings.TrimPrefix(release.Config.To, "release")) + stream := fmt.Sprintf("%s.0-0.%s%s", upgradeRelease.Candidate.Version, upgradeRelease.Candidate.Stream, TrimPrefixes(release.Config.To, "release-5", "release")) r, latest, err := releasecontroller.LatestForStream(c.parsedReleaseConfigCache, c.eventRecorder, c.releaseLister, stream, constraint, upgradeRelease.Candidate.Relative, "") if err != nil { return "", "", fmt.Errorf("failed to get latest tag for stream %s: %w", stream, err) @@ -239,3 +239,12 @@ func (c *Controller) resolveUpgradeRelease(upgradeRelease *releasecontroller.Upg } return "", "", fmt.Errorf("upgradeRelease fields must be set if upgradeRelease is set") } + +func TrimPrefixes(s string, prefixes ...string) string { + for _, prefix := range prefixes { + if after, found := strings.CutPrefix(s, prefix); found { + return after + } + } + return s +} \ No newline at end of file