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

OCPBUGS-24009: Synchronize From Upstream Repositories #706

Merged

Conversation

openshift-bot
Copy link
Contributor

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-02-28 19:13:27 operator-framework/operator-lifecycle-manager@fc3c183 Todd Short Fix finalizer processing (#3180)
2024-02-28 22:51:50 operator-framework/operator-lifecycle-manager@dc0c564 Daniel Franz Modify installation steps for ClusterRoleBindings and Services to use SSA in order to avoid race conditions. (#3182)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-runtime
/cc @openshift/openshift-team-operator-ecosystem

tmshort and others added 2 commits February 29, 2024 00:02
There are two reconcilers for the CSV, one is controller-runtime based,
the other is based on queueinformer. A finalizer was added to the CSV
and it's handled by the controller-runtime reconciler.

However, the queueinformer-based reconciler may take a while to do its
processing such that the CSV may be deleted and the finalizer run via
the controller-runtime reconciler. (This still takes <1s.)

This causes problems when CSV being synced is deleted. The queueinformer
attempts to sync RBAC to the stale CSV. The proper (BIG/risky) fix is to
consolidate the two reconcilers. A less risky fix is to move the finalizer
to the queueinformer reconciler and query the lister cache to see if the
CSV has been deleted, and not do the RBAC updates if that's the case.

Signed-off-by: Todd Short <todd.short@me.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: fc3c18363f6710da41cd003b9c4b41e826c4e244
… SSA in order to avoid race conditions. (#3182)

Signed-off-by: Daniel Franz <dfranz@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: dc0c564f62d526bae0467d53f439e1c91a17ed8a
@openshift-bot openshift-bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. labels Feb 29, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 29, 2024
@openshift-ci-robot
Copy link

@openshift-bot: This pull request explicitly references no jira issue.

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-02-28 19:13:27 operator-framework/operator-lifecycle-manager@fc3c183 Todd Short Fix finalizer processing (#3180)
2024-02-28 22:51:50 operator-framework/operator-lifecycle-manager@dc0c564 Daniel Franz Modify installation steps for ClusterRoleBindings and Services to use SSA in order to avoid race conditions. (#3182)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-runtime
/cc @openshift/openshift-team-operator-ecosystem

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested a review from a team February 29, 2024 00:03
Copy link
Contributor

openshift-ci bot commented Feb 29, 2024

@openshift-bot: GitHub didn't allow me to request PR reviews from the following users: openshift/openshift-team-operator-ecosystem.

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

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-02-28 19:13:27 operator-framework/operator-lifecycle-manager@fc3c183 Todd Short Fix finalizer processing (#3180)
2024-02-28 22:51:50 operator-framework/operator-lifecycle-manager@dc0c564 Daniel Franz Modify installation steps for ClusterRoleBindings and Services to use SSA in order to avoid race conditions. (#3182)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-runtime
/cc @openshift/openshift-team-operator-ecosystem

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.

Copy link
Contributor

openshift-ci bot commented Feb 29, 2024

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: openshift-bot

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

1 similar comment
Copy link
Contributor

openshift-ci bot commented Feb 29, 2024

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: openshift-bot

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

@dtfranz
Copy link
Contributor

dtfranz commented Feb 29, 2024

/retitle OCPBUGS-24009: Synchronize From Upstream Repositories

@openshift-ci openshift-ci bot changed the title NO-ISSUE: Synchronize From Upstream Repositories OCPBUGS-24009: Synchronize From Upstream Repositories Feb 29, 2024
@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Feb 29, 2024
@openshift-ci-robot
Copy link

@openshift-bot: This pull request references Jira Issue OCPBUGS-24009, which is invalid:

  • expected the bug to target the "4.16.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-02-28 19:13:27 operator-framework/operator-lifecycle-manager@fc3c183 Todd Short Fix finalizer processing (#3180)
2024-02-28 22:51:50 operator-framework/operator-lifecycle-manager@dc0c564 Daniel Franz Modify installation steps for ClusterRoleBindings and Services to use SSA in order to avoid race conditions. (#3182)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-runtime
/cc @openshift/openshift-team-operator-ecosystem

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 openshift-eng/jira-lifecycle-plugin repository.

@dtfranz
Copy link
Contributor

dtfranz commented Feb 29, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Feb 29, 2024
@openshift-ci-robot
Copy link

@dtfranz: This pull request references Jira Issue OCPBUGS-24009, which is valid. The bug has been moved to the POST state.

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

Requesting review from QA contact:
/cc @kuiwang02

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Feb 29, 2024
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD b3bfaa4 and 2 for PR HEAD 978852d in total

@dtfranz
Copy link
Contributor

dtfranz commented Feb 29, 2024

/test e2e-gcp-ovn

@kuiwang02
Copy link

/payload-aggregate periodic-ci-openshift-release-master-ci-4.16-upgrade-from-stable-4.15-e2e-azure-sdn-upgrade 10

Copy link
Contributor

openshift-ci bot commented Feb 29, 2024

@kuiwang02: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-ci-4.16-upgrade-from-stable-4.15-e2e-azure-sdn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/7ae9f940-d6db-11ee-82b9-7fbe2e10117b-0

@tmshort
Copy link
Contributor

tmshort commented Feb 29, 2024

/retest

@openshift-bot openshift-bot changed the title OCPBUGS-24009: Synchronize From Upstream Repositories NO-ISSUE: Synchronize From Upstream Repositories Mar 1, 2024
@openshift-ci-robot
Copy link

@openshift-bot: This pull request explicitly references no jira issue.

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-02-28 19:13:27 operator-framework/operator-lifecycle-manager@fc3c183 Todd Short Fix finalizer processing (#3180)
2024-02-28 22:51:50 operator-framework/operator-lifecycle-manager@dc0c564 Daniel Franz Modify installation steps for ClusterRoleBindings and Services to use SSA in order to avoid race conditions. (#3182)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-runtime
/cc @openshift/openshift-team-operator-ecosystem

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot removed the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Mar 1, 2024
Copy link
Contributor

openshift-ci bot commented Mar 1, 2024

@openshift-bot: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit cce0b4b into openshift:master Mar 1, 2024
13 checks passed
@dtfranz
Copy link
Contributor

dtfranz commented Mar 1, 2024

/retitle OCPBUGS-24009: Synchronize From Upstream Repositories

@openshift-ci openshift-ci bot changed the title NO-ISSUE: Synchronize From Upstream Repositories OCPBUGS-24009: Synchronize From Upstream Repositories Mar 1, 2024
@openshift-ci-robot
Copy link

@openshift-bot: Jira Issue OCPBUGS-24009: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-24009 has been moved to the MODIFIED state.

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-02-28 19:13:27 operator-framework/operator-lifecycle-manager@fc3c183 Todd Short Fix finalizer processing (#3180)
2024-02-28 22:51:50 operator-framework/operator-lifecycle-manager@dc0c564 Daniel Franz Modify installation steps for ClusterRoleBindings and Services to use SSA in order to avoid race conditions. (#3182)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-runtime
/cc @openshift/openshift-team-operator-ecosystem

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-bot
Copy link
Contributor Author

[ART PR BUILD NOTIFIER]

This PR has been included in build operator-registry-container-v4.16.0-202403010139.p0.gcce0b4b.assembly.stream.el9 for distgit operator-registry.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor Author

[ART PR BUILD NOTIFIER]

This PR has been included in build operator-lifecycle-manager-container-v4.16.0-202403010139.p0.gcce0b4b.assembly.stream.el9 for distgit operator-lifecycle-manager.
All builds following this will include this PR.

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. 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

5 participants