NO-ISSUE: Synchronize From Upstream Repositories #1039

grokspawn · 2025-07-15T20:11:15Z

This is a manual PR to handle the bumper failure related to the failure to downstream operator-framework/api#233, but successfully downstreaming updates to files introduced then from operator-framework/api#432

It turns out that opentelemetry introduced some breaking changes, so 220c648 is to pin the dependency until all our dependencies update. (c.f. kubernetes/kubernetes#131942)

It appears that operator-framework/api#233 was already in the blacklist, and I updated to add operator-framework/api#276 to the downstreaming blacklist in dea3ec6.

I manually dropped fixes from operator-framework/api#432 for multiarch_test.go in the downstreaming, since the parent PRs were also dropped.

Bumps [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) from 0.32.0 to 0.32.1. - [Commits](kubernetes/apimachinery@v0.32.0...v0.32.1) --- updated-dependencies: - dependency-name: k8s.io/apimachinery dependency-type: direct:production update-type: version-update:semver-patch ... 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: 255e3a5a9eeb33c0351cdb7dd22678726b9381cb

Upstream-repository: operator-registry Upstream-commit: 385870a11f3f2e574b936e576ab2965d488f3f23

Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.12.0 to 0.13.0. - [Commits](golang/sync@v0.12.0...v0.13.0) --- updated-dependencies: - dependency-name: golang.org/x/sync dependency-version: 0.13.0 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: 76a6d9b4b690ba9da42e91d84b7ad9c450a3f4af

openshift-ci-robot · 2025-07-15T20:11:19Z

@grokspawn: This pull request explicitly references no jira issue.

In response to this:

This is a manual PR to handle the bumper failure related to the failure to downstream operator-framework/api#233, but successfully downstreaming updates to files introduced then from operator-framework/api#432

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 · 2025-07-15T20:12:54Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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:

~~DOWNSTREAM_OWNERS~~ [grokspawn]

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

grokspawn · 2025-07-15T20:48:45Z

Re-attempted this bumper-driven downstream by manually downstreaming

* 0ab3deb Update multi-arch validator to check node affinity for multi-platform environments (#276)
* decf748 ✨ feat: new validator to check Multiple Architectures configuration (#233)

which for some reason were never downstreamed 🤷

Once done, the bumper has a clean downstream experience with no other manual intervention.

It's possible that I'll actually have to re-forcepush here again, if I haven't properly updated the manual PR cherrypicks' commit messages. (Update: yes ... here it comes).

… 1.56.0 (#3608) * 🌱 Bump github.com/operator-framework/operator-registry Bumps [github.com/operator-framework/operator-registry](https://github.com/operator-framework/operator-registry) from 1.55.0 to 1.56.0. - [Release notes](https://github.com/operator-framework/operator-registry/releases) - [Commits](operator-framework/operator-registry@v1.55.0...v1.56.0) --- updated-dependencies: - dependency-name: github.com/operator-framework/operator-registry dependency-version: 1.56.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Regenerate generated files Signed-off-by: Per Goncalves da Silva <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 31ca1a2d28e3c054228dc4df7c50106138c473f2

Bumps [sigs.k8s.io/kind](https://github.com/kubernetes-sigs/kind) from 0.28.0 to 0.29.0. - [Release notes](https://github.com/kubernetes-sigs/kind/releases) - [Commits](kubernetes-sigs/kind@v0.28.0...v0.29.0) --- updated-dependencies: - dependency-name: sigs.k8s.io/kind dependency-version: 0.29.0 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: 0216f70d7b59ad1a8c9cd5cd1711e9292db0737f

…(#1681) Upstream-repository: operator-registry Upstream-commit: f8aa6761eb4ef9a33c2134bab6b59132b7258d0c

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.72.1 to 1.72.2. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.72.1...v1.72.2) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-version: 1.72.2 dependency-type: direct:production update-type: version-update:semver-patch ... 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: 430e13f0aa636d7c24c785af049b24540a235d1a

Bumps [github.com/docker/cli](https://github.com/docker/cli) from 28.1.1+incompatible to 28.2.1+incompatible. - [Commits](docker/cli@v28.1.1...v28.2.1) --- updated-dependencies: - dependency-name: github.com/docker/cli dependency-version: 28.2.1+incompatible 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: 05c5465b9e729f4aaabdbc7e81e109a118ac6b71

Rather than disabling the go-verdiff CI to allow it to pass when there is a legitimate golang version change, use a label to override the test results. The label is `(override-go-verdiff)`. Signed-off-by: Todd Short <[email protected]> Upstream-repository: operator-registry Upstream-commit: c4b5f1196ba2959c6c419e822706e15b2cadd1da

Bumps [github.com/docker/cli](https://github.com/docker/cli) from 28.2.1+incompatible to 28.2.2+incompatible. - [Commits](docker/cli@v28.2.1...v28.2.2) --- updated-dependencies: - dependency-name: github.com/docker/cli dependency-version: 28.2.2+incompatible dependency-type: direct:production update-type: version-update:semver-patch ... 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: 5f276a2eb6b3b473d5a5974e48ae821468ebe91f

Bumps [github.com/containers/common](https://github.com/containers/common) from 0.63.0 to 0.63.1. - [Release notes](https://github.com/containers/common/releases) - [Commits](containers/common@v0.63.0...v0.63.1) --- updated-dependencies: - dependency-name: github.com/containers/common dependency-version: 0.63.1 dependency-type: direct:production update-type: version-update:semver-patch ... 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: adcaa8437c653a6036f4574455ee8f3ef38d728d

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.40.0 to 0.41.0. - [Commits](golang/net@v0.40.0...v0.41.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-version: 0.41.0 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: fc3fa821ce2fd34c71f9b05d71986eb99d301f7c

Bumps [go.etcd.io/bbolt](https://github.com/etcd-io/bbolt) from 1.4.0 to 1.4.1. - [Release notes](https://github.com/etcd-io/bbolt/releases) - [Commits](etcd-io/bbolt@v1.4.0...v1.4.1) --- updated-dependencies: - dependency-name: go.etcd.io/bbolt dependency-version: 1.4.1 dependency-type: direct:production update-type: version-update:semver-patch ... 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: 3924e3351b38bfa9c6ecde60b3ff968b21b93d1d

The required linux/limits.h header is provided by the linux-headers package. Upstream-repository: operator-registry Upstream-commit: a94753239e5f3d9ac0c2dfabdba7d0cc37c8a845

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.72.2 to 1.73.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.72.2...v1.73.0) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-version: 1.73.0 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: 23a9314efd7afa56fc4bf406d4f5ce57fc6af2e2

Signed-off-by: Adam D. Cornett <[email protected]> Upstream-repository: operator-registry Upstream-commit: 53ad34f192cbe5265755ef825c18b0005bfba1a6

Bumps [github.com/operator-framework/api](https://github.com/operator-framework/api) from 0.31.0 to 0.32.0. - [Release notes](https://github.com/operator-framework/api/releases) - [Changelog](https://github.com/operator-framework/api/blob/master/RELEASE.md) - [Commits](operator-framework/api@v0.31.0...v0.32.0) --- updated-dependencies: - dependency-name: github.com/operator-framework/api dependency-version: 0.32.0 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: da476b242ca4c4842b2e79e804f9b166d12fcedb

Upstream-repository: api Upstream-commit: 49ba338549099bea03f96db9902a43ace4c358d9

…penshift#431) Upstream-repository: api Upstream-commit: 48d8867b4e27cf90fef4b60037952a8e40a296c7

Rather than disabling the go-verdiff CI to allow it to pass when there is a legitimate golang version change, use a label to override the test results. The label is `(override-go-verdiff)`. Signed-off-by: Todd Short <[email protected]> Upstream-repository: api Upstream-commit: 774f44e6af301b7c4ec621cd880f3cb081af7e0d

* Bump the k8s-dependencies group across 1 directory with 5 updates Bumps the k8s-dependencies group with 3 updates in the / directory: [k8s.io/api](https://github.com/kubernetes/api), [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) and [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime). Updates `k8s.io/api` from 0.32.3 to 0.33.1 - [Commits](kubernetes/api@v0.32.3...v0.33.1) Updates `k8s.io/apiextensions-apiserver` from 0.32.3 to 0.33.1 - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](kubernetes/apiextensions-apiserver@v0.32.3...v0.33.1) Updates `k8s.io/apimachinery` from 0.32.3 to 0.33.1 - [Commits](kubernetes/apimachinery@v0.32.3...v0.33.1) Updates `k8s.io/client-go` from 0.32.3 to 0.33.1 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.32.3...v0.33.1) Updates `sigs.k8s.io/controller-runtime` from 0.20.4 to 0.21.0 - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](kubernetes-sigs/controller-runtime@v0.20.4...v0.21.0) --- updated-dependencies: - dependency-name: k8s.io/api dependency-version: 0.33.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: k8s.io/apiextensions-apiserver dependency-version: 0.33.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: k8s.io/apimachinery dependency-version: 0.33.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: k8s.io/client-go dependency-version: 0.33.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: sigs.k8s.io/controller-runtime dependency-version: 0.21.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] <[email protected]> * switching from NewYAMLOrJSONDecoder to NewYAMLToJSONDecoder Signed-off-by: Adam D. Cornett <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Adam D. Cornett <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: api Upstream-commit: c102f5c7f59d11d8def91e0442fc44b2e8fed8d2

…encies Upstream-repository: api Upstream-commit: 435042e8d4e3ce62c792a10df470ebad1a19a5f9

Signed-off-by: grokspawn <[email protected]>

grokspawn · 2025-07-16T19:52:31Z

Latest force-push because I forgot to update my vendors after updating the merged PRs. 😞

grokspawn · 2025-07-16T21:57:13Z

/hold
/assign @jianzhangbjz

grokspawn · 2025-07-16T21:57:33Z

setting the hold until the QE folks can pre-merge test (although this synch PR is really just dependency bumps and irrelevant-to-downstream automation changes).

grokspawn · 2025-07-17T03:00:40Z

/retest-required

perdasilva · 2025-07-17T16:04:52Z

/lgtm

jianzhangbjz · 2025-07-18T08:09:36Z

LGTM.
/label qe-approved
/lgtm

jianzhangbjz · 2025-07-18T08:10:10Z

/unhold

grokspawn · 2025-07-18T20:26:44Z

Going to close/open this PR in hopes of getting CI moving again on it.

openshift-ci-robot · 2025-07-19T00:45:24Z

/retest-required

Remaining retests: 0 against base HEAD e449ed4 and 2 for PR HEAD 01b3319 in total

openshift-ci · 2025-07-19T04:09:40Z

@grokspawn: 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-sigs/prow repository. I understand the commands that are listed here.

dependabot bot and others added 3 commits July 15, 2025 14:29

upgraded golang.org/x/oauth2 v0.23.0 => v0.27.0 (#1595)

6a3da31

Upstream-repository: operator-registry Upstream-commit: 385870a11f3f2e574b936e576ab2965d488f3f23

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 15, 2025

openshift-ci bot requested review from ankitathomas and oceanc80 July 15, 2025 20:12

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 15, 2025

grokspawn force-pushed the k8s-bump branch 2 times, most recently from d02b6f4 to 8c4381e Compare July 15, 2025 20:40

grokspawn force-pushed the k8s-bump branch from 8c4381e to 5fdc643 Compare July 15, 2025 20:49

grokspawn changed the title ~~NO-ISSUE: Synchronize From Upstream Repositories~~ WIP NO-ISSUE: Synchronize From Upstream Repositories Jul 16, 2025

grokspawn changed the title ~~WIP NO-ISSUE: Synchronize From Upstream Repositories~~ WIP: NO-ISSUE: Synchronize From Upstream Repositories Jul 16, 2025

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 16, 2025

dependabot bot and others added 14 commits July 16, 2025 14:31

(ci) - Add stale config to close PRs and issues which are inactivity …

46a1dfd

…(#1681) Upstream-repository: operator-registry Upstream-commit: f8aa6761eb4ef9a33c2134bab6b59132b7258d0c

Install linux-headers in upstream-opm-builder (#1690)

6a574ea

The required linux/limits.h header is provided by the linux-headers package. Upstream-repository: operator-registry Upstream-commit: a94753239e5f3d9ac0c2dfabdba7d0cc37c8a845

updating dependencies to support k8s 1.33 (#1699)

f9b661a

Signed-off-by: Adam D. Cornett <[email protected]> Upstream-repository: operator-registry Upstream-commit: 53ad34f192cbe5265755ef825c18b0005bfba1a6

camilamacedo86 and others added 3 commits July 16, 2025 14:31

Add camilamacedo86 and tmshort as approver (openshift#428)

29bdeff

Upstream-repository: api Upstream-commit: 49ba338549099bea03f96db9902a43ace4c358d9

(ci) - Add stale config to close PRs and issues which are inactivity (o…

34fa60d

…penshift#431) Upstream-repository: api Upstream-commit: 48d8867b4e27cf90fef4b60037952a8e40a296c7

grokspawn force-pushed the k8s-bump branch from c9612b2 to 220c648 Compare July 16, 2025 19:32

acornett21 and others added 4 commits July 16, 2025 14:51

Upgrade google.golang.org/genproto/googleapis/api and indirect depend…

f0f5e6e

…encies Upstream-repository: api Upstream-commit: 435042e8d4e3ce62c792a10df470ebad1a19a5f9

pinning otelrpc version due to breaking API changes

d050372

Signed-off-by: grokspawn <[email protected]>

add openshift#276 to the api blacklist to join openshift#233

01b3319

Signed-off-by: grokspawn <[email protected]>

grokspawn force-pushed the k8s-bump branch from dea3ec6 to 01b3319 Compare July 16, 2025 19:51

grokspawn changed the title ~~WIP: NO-ISSUE: Synchronize From Upstream Repositories~~ NO-ISSUE: Synchronize From Upstream Repositories Jul 16, 2025

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 16, 2025

openshift-ci bot assigned jianzhangbjz Jul 16, 2025

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 16, 2025

openshift-ci bot assigned perdasilva Jul 17, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 17, 2025

openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Jul 18, 2025

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 18, 2025

grokspawn closed this Jul 18, 2025

grokspawn reopened this Jul 18, 2025

openshift-merge-bot bot merged commit c94eaba into openshift:main Jul 19, 2025
16 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

NO-ISSUE: Synchronize From Upstream Repositories #1039

NO-ISSUE: Synchronize From Upstream Repositories #1039

Uh oh!

grokspawn commented Jul 15, 2025 •

edited

Loading

Uh oh!

openshift-ci-robot commented Jul 15, 2025

Uh oh!

openshift-ci bot commented Jul 15, 2025

Uh oh!

grokspawn commented Jul 15, 2025

Uh oh!

grokspawn commented Jul 16, 2025

Uh oh!

grokspawn commented Jul 16, 2025

Uh oh!

grokspawn commented Jul 16, 2025 •

edited

Loading

Uh oh!

grokspawn commented Jul 17, 2025

Uh oh!

perdasilva commented Jul 17, 2025

Uh oh!

jianzhangbjz commented Jul 18, 2025

Uh oh!

jianzhangbjz commented Jul 18, 2025

Uh oh!

grokspawn commented Jul 18, 2025

Uh oh!

openshift-ci-robot commented Jul 19, 2025

Uh oh!

openshift-ci bot commented Jul 19, 2025

Uh oh!

Uh oh!

Uh oh!

NO-ISSUE: Synchronize From Upstream Repositories #1039

NO-ISSUE: Synchronize From Upstream Repositories #1039

Uh oh!

Conversation

grokspawn commented Jul 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Jul 15, 2025

Uh oh!

openshift-ci bot commented Jul 15, 2025

Uh oh!

grokspawn commented Jul 15, 2025

Uh oh!

grokspawn commented Jul 16, 2025

Uh oh!

grokspawn commented Jul 16, 2025

Uh oh!

grokspawn commented Jul 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

grokspawn commented Jul 17, 2025

Uh oh!

perdasilva commented Jul 17, 2025

Uh oh!

jianzhangbjz commented Jul 18, 2025

Uh oh!

jianzhangbjz commented Jul 18, 2025

Uh oh!

grokspawn commented Jul 18, 2025

Uh oh!

openshift-ci-robot commented Jul 19, 2025

Uh oh!

openshift-ci bot commented Jul 19, 2025

Uh oh!

Uh oh!

Uh oh!

grokspawn commented Jul 15, 2025 •

edited

Loading

grokspawn commented Jul 16, 2025 •

edited

Loading