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.

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

Jump to bottom

[release-4.7] Bug 1963141: Make ClusterOperator Available condition sticky. #2173

Merged
merged 1 commit into from May 27, 2021
Merged

[release-4.7] Bug 1963141: Make ClusterOperator Available condition sticky. #2173

merged 1 commit into from May 27, 2021

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #2162

/assign benluddy

@benluddy
Make ClusterOperator Available condition sticky.
25f7e66 
The intermediate CSV phases (those other than Succeeded and Failed)
don't on their own provide availability information, so they should
not be used to make decisions about a corresponding ClusterOperator's
Available status condition.

Signed-off-by: Ben Luddy <bluddy@redhat.com>
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request May 21, 2021
Merged
@openshift-ci openshift-ci bot requested review from exdx and timflannagan May 21, 2021 14:30
@benluddy benluddy changed the title [release-4.7] Make ClusterOperator Available condition sticky. [release-4.7] Bug 1963141: Make ClusterOperator Available condition sticky. May 21, 2021
@benluddy
Copy link
Contributor

/cherry-pick release-4.6

@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 May 21, 2021
@openshift-ci
Copy link

openshift-ci bot commented May 21, 2021

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1963141, 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.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.z) matches configured target release for branch (4.7.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1959158 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
  • dependent Bugzilla bug 1959158 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
  • bug has dependents

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

[release-4.7] Bug 1963141: Make ClusterOperator Available condition sticky.

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-cherrypick-robot
Copy link
Author

@benluddy: once the present PR merges, I will cherry-pick it on top of release-4.6 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.6

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 May 21, 2021
@openshift-ci
Copy link

openshift-ci bot commented May 21, 2021

@openshift-ci[bot]: GitHub didn't allow me to request PR reviews from the following users: jianzhangbjz.

Note that only operator-framework members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1963141, 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.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.z) matches configured target release for branch (4.7.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1959158 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
  • dependent Bugzilla bug 1959158 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
  • bug has dependents

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

[release-4.7] Bug 1963141: Make ClusterOperator Available condition sticky.

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.

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.

@benluddy
Copy link
Contributor

/approve

@openshift-ci
Copy link

openshift-ci bot commented May 21, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: benluddy, openshift-cherrypick-robot

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 May 21, 2021
@hasbro17
Copy link
Contributor

/retest

@hasbro17
Copy link
Contributor

/lgtm

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

/retest

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

10 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@sdodson sdodson added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label May 26, 2021
@hasbro17
Copy link
Contributor

/retest

@openshift-merge-robot openshift-merge-robot merged commit b777578 into operator-framework:release-4.7 May 27, 2021
@openshift-ci
Copy link

openshift-ci bot commented May 27, 2021

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged:

Bugzilla bug 1963141 has been moved to the MODIFIED state.

In response to this:

[release-4.7] Bug 1963141: Make ClusterOperator Available condition sticky.

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-cherrypick-robot
Copy link
Author

@benluddy: #2173 failed to apply on top of branch "release-4.6":

Applying: Make ClusterOperator Available condition sticky.
Using index info to reconstruct a base tree...
M	pkg/lib/operatorstatus/csv_reporter.go
M	pkg/lib/operatorstatus/csv_reporter_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/lib/operatorstatus/csv_reporter_test.go
CONFLICT (content): Merge conflict in pkg/lib/operatorstatus/csv_reporter_test.go
Auto-merging pkg/lib/operatorstatus/csv_reporter.go
CONFLICT (content): Merge conflict in pkg/lib/operatorstatus/csv_reporter.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Make ClusterOperator Available condition sticky.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.6

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.

@benluddy
Copy link
Contributor

/cherry-pick release-4.6

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request May 27, 2021
Merged
@openshift-cherrypick-robot
Copy link
Author

@benluddy: new pull request created: #2177

In response to this:

/cherry-pick release-4.6

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@exdx exdx Awaiting requested review from exdx

@timflannagan timflannagan Awaiting requested review from timflannagan

Assignees

@benluddy benluddy

@hasbro17 hasbro17

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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@openshift-cherrypick-robot @benluddy @hasbro17 @openshift-bot @sdodson @openshift-merge-robot