Skip to content
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.

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

Bug 1993286: fix(openshift): drop z from next calculated y-stream (#2324) #166

Merged
merged 1 commit into from Aug 16, 2021

Conversation

njhale
Copy link
Contributor

@njhale njhale commented Aug 16, 2021

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

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
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 16, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: njhale

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 16, 2021
@timflannagan
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 16, 2021
@timflannagan
Copy link
Contributor

/retitle Bug 1993286: fix(openshift): drop z from next calculated y-stream (#2324)

@openshift-ci openshift-ci bot changed the title Bug 1993286 fix(openshift): drop z from next calculated y-stream (#2324) Bug 1993286: fix(openshift): drop z from next calculated y-stream (#2324) Aug 16, 2021
@openshift-ci openshift-ci bot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Aug 16, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 16, 2021

@njhale: This pull request references Bugzilla bug 1993286, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.9.0) matches configured target release for branch (4.9.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

Bug 1993286: fix(openshift): drop z from next calculated y-stream (#2324)

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Aug 16, 2021
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci openshift-ci bot merged commit 4f3624c into openshift:master Aug 16, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 16, 2021

@njhale: All pull requests linked via external trackers have merged:

Bugzilla bug 1993286 has been moved to the MODIFIED state.

In response to this:

Bug 1993286: fix(openshift): drop z from next calculated y-stream (#2324)

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

timflannagan pushed a commit to timflannagan/operator-framework-olm that referenced this pull request Nov 30, 2021
The tag that configures the serialization of the ServiceAccount field
for the Scorecard configuration incorrectly names the field
"string", which results in the `serviceaccount` field being empty after
unmarshalling, therefore being ignored.
Update the tag to name the field `serviceaccount`

Upstream-repository: api
Upstream-commit: 3e95d2c8cdd80dbf68f09a7647601239904d20fd
timflannagan pushed a commit to timflannagan/operator-framework-olm that referenced this pull request Nov 30, 2021
The tag that configures the serialization of the ServiceAccount field
for the Scorecard configuration incorrectly names the field
"string", which results in the `serviceaccount` field being empty after
unmarshalling, therefore being ignored.
Update the tag to name the field `serviceaccount`

Upstream-repository: api
Upstream-commit: 3e95d2c8cdd80dbf68f09a7647601239904d20fd
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
The tag that configures the serialization of the ServiceAccount field
for the Scorecard configuration incorrectly names the field
"string", which results in the `serviceaccount` field being empty after
unmarshalling, therefore being ignored.
Update the tag to name the field `serviceaccount`

Upstream-repository: api
Upstream-commit: 3e95d2c8cdd80dbf68f09a7647601239904d20fd
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
The tag that configures the serialization of the ServiceAccount field
for the Scorecard configuration incorrectly names the field
"string", which results in the `serviceaccount` field being empty after
unmarshalling, therefore being ignored.
Update the tag to name the field `serviceaccount`

Upstream-repository: api
Upstream-commit: 3e95d2c8cdd80dbf68f09a7647601239904d20fd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants