-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(openshift): drop z from next calculated y-stream (#2324)
When determining operator compatibility, drop z and build versions in the calculation of the next Y-stream (minor) release of OpenShift. e.g. If the current version is v4.9.5+build, the next Y-stream is calculated as v4.10.0. If a pre-release is included, drop it as well but don't increment the minor version. e.g. If the current version is v4.10.0-rc, the next Y-stream is calculated as v4.10.0. Before this change, the next Y-stream was the result of simply iterating the cluster's minor version. When the cluster was at a patch version greater than that specified by an operator, upgrades would be erroneously blocked. e.g. If the current version was v4.9.5, the next version would be calculated as v4.10.5, which would block upgrades on operators with max versions set to v4.10 -- or more explicitly [v4.10.0, v4.10.5) (')' is read "exclusive"). Signed-off-by: Nick Hale <njohnhale@gmail.com> Upstream-repository: operator-lifecycle-manager Upstream-commit: 760c10d78d6f830b5aa773080847b46557c5986a
- Loading branch information
Showing
3 changed files
with
127 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 23 additions & 5 deletions
28
...erator-framework/operator-lifecycle-manager/pkg/controller/operators/openshift/helpers.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.