Skip to content

OCPBUGS-31080,OCPBUGS-31438: Manual downstream sync #719

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
Merged
merged 10 commits into from
Mar 27, 2024
Merged

OCPBUGS-31080,OCPBUGS-31438: Manual downstream sync #719

merged 10 commits into from
Mar 27, 2024

Conversation

dtfranz
Copy link
Contributor

@dtfranz dtfranz commented Mar 27, 2024

Manually syncing since a reverted dependabot commit is breaking the syncer tool at the moment.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 27, 2024
@openshift-ci-robot
Copy link

@dtfranz: This pull request references Jira Issue OCPBUGS-31080, 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:

Manually syncing since a reverted dependabot commit is breaking the syncer tool at the moment.

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 added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Mar 27, 2024
@openshift-ci openshift-ci bot requested review from dinhxuanvu and kevinrizza March 27, 2024 05:52
@dtfranz
Copy link
Contributor Author

dtfranz commented Mar 27, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Mar 27, 2024
@openshift-ci-robot
Copy link

@dtfranz: This pull request references Jira Issue OCPBUGS-31080, 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 openshift-ci bot requested a review from kuiwang02 March 27, 2024 05:53
@dtfranz
Copy link
Contributor Author

dtfranz commented Mar 27, 2024

/retest

dependabot bot and others added 9 commits March 27, 2024 11:26
@dependabot @dtfranz
build(deps): bump google.golang.org/protobuf from 1.31.0 to 1.33.0 (#…
ddd371d 
…3188)

Bumps google.golang.org/protobuf from 1.31.0 to 1.33.0.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 0f1e94546012917207c7175cb1351619ad69eb94
@dtfranz
RoleBinding SSA (#3190)
0ccf3d9 
Switch to SSA for RoleBindings during install (as we do now for Services and ClusterRoleBindings) to avoid issues with race conditions and/or failures to retrieve resources due to missing labels.

Signed-off-by: Daniel Franz <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 6b2b933f7fb5dd1fd6fe7da967f3f22a27c4253c
@grokspawn @dtfranz
bumping o-f upstream libs as deps for this project (#3192)
b69bc20 
Signed-off-by: Jordan Keister <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: e1db71e11f30fd270aaf44900f244077bd957595
@joelanford @dtfranz
OCPBUGS-31438: Correctly detect catalog image ID for extractContent c…
5caebe2 
…atalog pods (#3194)

Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 275d62ee402e1b2b5447aa92ca5a5e8f016e9168
@dependabot @dtfranz
build(deps): bump k8s.io/client-go from 0.28.5 to 0.29.2 (#1222)
9dc79cc 
Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.28.5 to 0.29.2.
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.28.5...v0.29.2)

---
updated-dependencies:
- dependency-name: k8s.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Upstream-repository: operator-registry
Upstream-commit: 6752eccbb17616f65394f8a6e66b6012da9ca85f
@grokspawn @dtfranz
Revert "build(deps): bump k8s.io/client-go from 0.28.5 to 0.29.2 (#12…
9b5b80f 
…22)" (#1232)

This reverts commit 6752eccbb17616f65394f8a6e66b6012da9ca85f.

Upstream-repository: operator-registry
Upstream-commit: a923299d6d4b43c656cc7fa2895d52d0a8ba43dd
@rhdedgar @dtfranz
Updating runc version in go.mod, go.sum (#1240)
c06d929 
Upstream-repository: operator-registry
Upstream-commit: 025e8caf0ba5d69174f23bda42c7d1260e0875d3
@grokspawn @dtfranz
[chore] bump docker/cli, docker/docker to 25.0.5 (#1239)
821adf7 
Signed-off-by: Jordan Keister <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 53eb66156a93d09d84ccbd5bcd545f5b2f849e57
@dependabot @dtfranz
build(deps): bump github.com/onsi/ginkgo/v2 from 2.15.0 to 2.17.1 (#1…
3419ad7 
…238)

Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.15.0 to 2.17.1.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.15.0...v2.17.1)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Upstream-repository: operator-registry
Upstream-commit: ba4de0b810529bd1446b508a0a0950842e881d5e
@dependabot @grokspawn
build(deps): bump golang.org/x/net from 0.20.0 to 0.22.0 (#1233)
4fb2637 
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.20.0 to 0.22.0.
- [Commits](golang/net@v0.20.0...v0.22.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Upstream-repository: operator-registry
Upstream-commit: e5bba5fb1218a817c2325153152b946f3fa4d0f9
@dtfranz dtfranz changed the title OCPBUGS-31080: Manual downstream sync OCPBUGS-31080,OCPBUGS-31438: Manual downstream sync Mar 27, 2024
@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. and removed jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Mar 27, 2024
@openshift-ci-robot
Copy link

@dtfranz: This pull request references Jira Issue OCPBUGS-31080, which is valid.

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 POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @kuiwang02

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

This pull request references Jira Issue OCPBUGS-31438, 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:

Manually syncing since a reverted dependabot commit is breaking the syncer tool at the moment.

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.

@grokspawn
Copy link
Contributor

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Mar 27, 2024
@openshift-ci-robot
Copy link

@grokspawn: This pull request references Jira Issue OCPBUGS-31080, which is valid.

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 POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @kuiwang02

This pull request references Jira Issue OCPBUGS-31438, 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 New, 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 openshift-ci bot requested a review from jianzhangbjz March 27, 2024 19:12
@grokspawn
Copy link
Contributor

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 27, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Mar 27, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dtfranz, grokspawn

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 Mar 27, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Mar 27, 2024

@dtfranz: 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 b7049d2 into openshift:master Mar 27, 2024
13 checks passed
@openshift-ci-robot
Copy link

@dtfranz: Jira Issue OCPBUGS-31080: All pull requests linked via external trackers have merged:

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

Jira Issue OCPBUGS-31438: All pull requests linked via external trackers have merged:

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

In response to this:

Manually syncing since a reverted dependabot commit is breaking the syncer tool at the moment.

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

Fix included in accepted release 4.16.0-0.nightly-2024-03-28-223620

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

@dinhxuanvu dinhxuanvu Awaiting requested review from dinhxuanvu

@kevinrizza kevinrizza Awaiting requested review from kevinrizza

@kuiwang02 kuiwang02 Awaiting requested review from kuiwang02

@jianzhangbjz jianzhangbjz Awaiting requested review from jianzhangbjz

Assignees

@grokspawn grokspawn

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. 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.
6 participants
@dtfranz @openshift-ci-robot @grokspawn @openshift-merge-robot @joelanford @rhdedgar