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

OCPBUGS-25989: Synchronize From Upstream Repositories #663

Merged
merged 6 commits into from Jan 19, 2024
Merged

OCPBUGS-25989: Synchronize From Upstream Repositories #663

merged 6 commits into from Jan 19, 2024

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-01-18 17:11:04 operator-framework/operator-lifecycle-manager@58f48df Steve Kuznetsov operators/olm: filter RBAC lists by namespace (#3157)
2024-01-18 23:35:06 operator-framework/operator-lifecycle-manager@d8a5e1e Kevin Rizza Update golangci-lint to 1.54 (#3160)
2024-01-19 14:48:04 operator-framework/operator-lifecycle-manager@f9d8b1e Steve Kuznetsov go.mod: bump golang to 1.21 (#3158)
2024-01-17 21:26:55 operator-framework/operator-registry@8986186 Jordan Keister include composite template builder's output path (#1208)
2024-01-18 11:56:47 operator-framework/operator-registry@3871e94 Steve Kuznetsov go.mod: update golang to 1.21 (#1213)
2024-01-18 10:57:21 operator-framework/api@9a02b66 Steve Kuznetsov go.mod: bump to golang 1.21

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

stevekuznetsov and others added 6 commits January 19, 2024 19:03
@stevekuznetsov
operators/olm: filter RBAC lists by namespace (#3157)
42591fb 
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 58f48dfcaf718eec84d2d3633ce68ed91405a795
@kevinrizza
Update golangci-lint to 1.54 (#3160)
751abff 
Signed-off-by: kevinrizza <krizza@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: d8a5e1eb2b017c9d5401945ec0f38ef13ac1f2ae
@stevekuznetsov
go.mod: bump golang to 1.21 (#3158)
ba34916 
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: f9d8b1e957fa65417ae2682a4d87fdacb61a3b8e
@grokspawn
include composite template builder's output path (#1208)
8748220 
Signed-off-by: Jordan Keister <jordan@nimblewidget.com>
Upstream-repository: operator-registry
Upstream-commit: 8986186e78db17ca6dfed645f02181604f9fc66e
@stevekuznetsov
go.mod: update golang to 1.21 (#1213)
7ab63ab 
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Upstream-repository: operator-registry
Upstream-commit: 3871e9450c5e7fe79d144fe7f8c844224d64e614
@stevekuznetsov
go.mod: bump to golang 1.21
19ce0f1 
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Upstream-repository: api
Upstream-commit: 9a02b668de16ce5c23612a4707cd8bd748936230
@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 Jan 19, 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 Jan 19, 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-01-18 17:11:04 operator-framework/operator-lifecycle-manager@58f48df Steve Kuznetsov operators/olm: filter RBAC lists by namespace (#3157)
2024-01-18 23:35:06 operator-framework/operator-lifecycle-manager@d8a5e1e Kevin Rizza Update golangci-lint to 1.54 (#3160)
2024-01-19 14:48:04 operator-framework/operator-lifecycle-manager@f9d8b1e Steve Kuznetsov go.mod: bump golang to 1.21 (#3158)
2024-01-17 21:26:55 operator-framework/operator-registry@8986186 Jordan Keister include composite template builder's output path (#1208)
2024-01-18 11:56:47 operator-framework/operator-registry@3871e94 Steve Kuznetsov go.mod: update golang to 1.21 (#1213)
2024-01-18 10:57:21 operator-framework/api@9a02b66 Steve Kuznetsov go.mod: bump to golang 1.21

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 January 19, 2024 19:07
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 19, 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-01-18 17:11:04 operator-framework/operator-lifecycle-manager@58f48df Steve Kuznetsov operators/olm: filter RBAC lists by namespace (#3157)
2024-01-18 23:35:06 operator-framework/operator-lifecycle-manager@d8a5e1e Kevin Rizza Update golangci-lint to 1.54 (#3160)
2024-01-19 14:48:04 operator-framework/operator-lifecycle-manager@f9d8b1e Steve Kuznetsov go.mod: bump golang to 1.21 (#3158)
2024-01-17 21:26:55 operator-framework/operator-registry@8986186 Jordan Keister include composite template builder's output path (#1208)
2024-01-18 11:56:47 operator-framework/operator-registry@3871e94 Steve Kuznetsov go.mod: update golang to 1.21 (#1213)
2024-01-18 10:57:21 operator-framework/api@9a02b66 Steve Kuznetsov go.mod: bump to golang 1.21

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.

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 19, 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
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 19, 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

@stevekuznetsov
Copy link
Contributor

/re-title OCPBUGS-25989: Synchronize From Upstream Repositories

@stevekuznetsov
Copy link
Contributor

/retitle OCPBUGS-25989: Synchronize From Upstream Repositories

@openshift-ci openshift-ci bot changed the title NO-ISSUE: Synchronize From Upstream Repositories OCPBUGS-25989: Synchronize From Upstream Repositories Jan 19, 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 Jan 19, 2024
@openshift-ci-robot
Copy link

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

  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is MODIFIED instead

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-01-18 17:11:04 operator-framework/operator-lifecycle-manager@58f48df Steve Kuznetsov operators/olm: filter RBAC lists by namespace (#3157)
2024-01-18 23:35:06 operator-framework/operator-lifecycle-manager@d8a5e1e Kevin Rizza Update golangci-lint to 1.54 (#3160)
2024-01-19 14:48:04 operator-framework/operator-lifecycle-manager@f9d8b1e Steve Kuznetsov go.mod: bump golang to 1.21 (#3158)
2024-01-17 21:26:55 operator-framework/operator-registry@8986186 Jordan Keister include composite template builder's output path (#1208)
2024-01-18 11:56:47 operator-framework/operator-registry@3871e94 Steve Kuznetsov go.mod: update golang to 1.21 (#1213)
2024-01-18 10:57:21 operator-framework/api@9a02b66 Steve Kuznetsov go.mod: bump to golang 1.21

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.

@stevekuznetsov
Copy link
Contributor

/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 Jan 19, 2024
@openshift-ci-robot
Copy link

@stevekuznetsov: This pull request references Jira Issue OCPBUGS-25989, 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 @jianzhangbjz

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 Jan 19, 2024
@stevekuznetsov
Copy link
Contributor

/cherry-pick release-4.15

@openshift-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-4.15

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
Copy link
Contributor

openshift-ci bot commented Jan 19, 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 283d8d5 into openshift:master Jan 19, 2024
13 checks passed
@openshift-ci-robot
Copy link

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

Jira Issue OCPBUGS-25989 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-01-18 17:11:04 operator-framework/operator-lifecycle-manager@58f48df Steve Kuznetsov operators/olm: filter RBAC lists by namespace (#3157)
2024-01-18 23:35:06 operator-framework/operator-lifecycle-manager@d8a5e1e Kevin Rizza Update golangci-lint to 1.54 (#3160)
2024-01-19 14:48:04 operator-framework/operator-lifecycle-manager@f9d8b1e Steve Kuznetsov go.mod: bump golang to 1.21 (#3158)
2024-01-17 21:26:55 operator-framework/operator-registry@8986186 Jordan Keister include composite template builder's output path (#1208)
2024-01-18 11:56:47 operator-framework/operator-registry@3871e94 Steve Kuznetsov go.mod: update golang to 1.21 (#1213)
2024-01-18 10:57:21 operator-framework/api@9a02b66 Steve Kuznetsov go.mod: bump to golang 1.21

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

@stevekuznetsov: #663 failed to apply on top of branch "release-4.15":

Applying: operators/olm: filter RBAC lists by namespace (#3157)
Applying: Update golangci-lint to 1.54 (#3160)
Applying: go.mod: bump golang to 1.21 (#3158)
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/go.mod
M	staging/operator-lifecycle-manager/go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Auto-merging staging/operator-lifecycle-manager/go.sum
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/go.sum
Auto-merging staging/operator-lifecycle-manager/go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 go.mod: bump golang to 1.21 (#3158)
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.15

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-bot
Copy link
Contributor Author

[ART PR BUILD NOTIFIER]

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

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.16.0-0.nightly-2024-01-21-092529

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

@jianzhangbjz jianzhangbjz Awaiting requested review from jianzhangbjz

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@openshift-bot @openshift-ci-robot @stevekuznetsov @openshift-cherrypick-robot @openshift-merge-robot @kevinrizza @grokspawn