NO-ISSUE: Synchronize From Upstream Repositories#1268
NO-ISSUE: Synchronize From Upstream Repositories#1268openshift-bot wants to merge 27 commits intoopenshift:mainfrom
Conversation
|
@openshift-bot: This pull request explicitly references no jira issue. DetailsIn response to this:
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: GitHub didn't allow me to request PR reviews from the following users: openshift/openshift-team-operator-framework. Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs. DetailsIn response to this:
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. |
|
[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 DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
1 similar comment
|
[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 DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
WalkthroughBatched dependency version upgrades across multiple go.mod files, migration to Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.79.2 to 1.79.3. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.79.2...v1.79.3) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-version: 1.79.3 dependency-type: direct:production ... 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: d3bdbba3d98845d405589ebcbf85e045f3f28e69
* 🌱 Bump the k8s-dependencies group with 8 updates Bumps the k8s-dependencies group with 8 updates: | Package | From | To | | --- | --- | --- | | [k8s.io/api](https://github.com/kubernetes/api) | `0.35.2` | `0.35.3` | | [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.35.2` | `0.35.3` | | [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) | `0.35.2` | `0.35.3` | | [k8s.io/apiserver](https://github.com/kubernetes/apiserver) | `0.35.2` | `0.35.3` | | [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.35.2` | `0.35.3` | | [k8s.io/code-generator](https://github.com/kubernetes/code-generator) | `0.35.2` | `0.35.3` | | [k8s.io/component-base](https://github.com/kubernetes/component-base) | `0.35.2` | `0.35.3` | | [k8s.io/kube-aggregator](https://github.com/kubernetes/kube-aggregator) | `0.35.2` | `0.35.3` | Updates `k8s.io/api` from 0.35.2 to 0.35.3 - [Commits](kubernetes/api@v0.35.2...v0.35.3) Updates `k8s.io/apiextensions-apiserver` from 0.35.2 to 0.35.3 - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](kubernetes/apiextensions-apiserver@v0.35.2...v0.35.3) Updates `k8s.io/apimachinery` from 0.35.2 to 0.35.3 - [Commits](kubernetes/apimachinery@v0.35.2...v0.35.3) Updates `k8s.io/apiserver` from 0.35.2 to 0.35.3 - [Commits](kubernetes/apiserver@v0.35.2...v0.35.3) Updates `k8s.io/client-go` from 0.35.2 to 0.35.3 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.35.2...v0.35.3) Updates `k8s.io/code-generator` from 0.35.2 to 0.35.3 - [Commits](kubernetes/code-generator@v0.35.2...v0.35.3) Updates `k8s.io/component-base` from 0.35.2 to 0.35.3 - [Commits](kubernetes/component-base@v0.35.2...v0.35.3) Updates `k8s.io/kube-aggregator` from 0.35.2 to 0.35.3 - [Commits](kubernetes/kube-aggregator@v0.35.2...v0.35.3) --- updated-dependencies: - dependency-name: k8s.io/api dependency-version: 0.35.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/apiextensions-apiserver dependency-version: 0.35.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/apimachinery dependency-version: 0.35.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/apiserver dependency-version: 0.35.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/client-go dependency-version: 0.35.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/code-generator dependency-version: 0.35.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/component-base dependency-version: 0.35.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/kube-aggregator dependency-version: 0.35.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] <[email protected]> * Update generated clientset code Remove deprecated comment from NewSimpleClientset in generated fake clientsets. Co-Authored-By: Claude Sonnet 4.6 <[email protected]> Signed-off-by: Todd Short <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Todd Short <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Claude Sonnet 4.6 <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: bd369caeac9e86b1c12d17d27b0b7169bec3ccd9
…3801) Migrate all direct klog v1 imports to klog/v2 and bump to v2.140.0 which includes the fix for kubernetes/klog#212. Opt into the new klog behavior by setting -legacy_stderr_threshold_behavior=false so that -stderrthreshold is honored even when -logtostderr=true (the default). Set stderrthreshold=INFO to preserve backward-compatible behavior while allowing users to override it to WARNING or ERROR to reduce stderr noise. Also wire klog flags into pflag.CommandLine in cmd/olm so that klog flags (like -v, -stderrthreshold) are actually accessible from the command line. Fix klog v1→v2 API incompatibility: klog.V() returns Verbose struct in v2, not bool — use .Enabled() for conditional checks. Fixes #2131 Ref: kubernetes/klog#212, kubernetes/klog#432 Signed-off-by: Pierluigi Lenoci <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: ee4cd40bc126bf4d0701a7784fd4340303439e0f
``` go get github.com/operator-framework/[email protected] go get github.com/operator-framework/[email protected] go mod tidy go mod version ``` Signed-off-by: Todd Short <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 15860d35092cfabbb178028a8c6790ca04fa7aa2
Bumps the k8s-dependencies group with 4 updates: [k8s.io/api](https://github.com/kubernetes/api), [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver), [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) and [k8s.io/client-go](https://github.com/kubernetes/client-go). Updates `k8s.io/api` from 0.35.1 to 0.35.2 - [Commits](kubernetes/api@v0.35.1...v0.35.2) Updates `k8s.io/apiextensions-apiserver` from 0.35.1 to 0.35.2 - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](kubernetes/apiextensions-apiserver@v0.35.1...v0.35.2) Updates `k8s.io/apimachinery` from 0.35.1 to 0.35.2 - [Commits](kubernetes/apimachinery@v0.35.1...v0.35.2) Updates `k8s.io/client-go` from 0.35.1 to 0.35.2 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.35.1...v0.35.2) --- updated-dependencies: - dependency-name: k8s.io/api dependency-version: 0.35.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/apiextensions-apiserver dependency-version: 0.35.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/apimachinery dependency-version: 0.35.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/client-go dependency-version: 0.35.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies ... 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: 9d741cf4e920924debddcccf5e8e5751bb285da7
Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 3 to 4. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](docker/setup-qemu-action@v3...v4) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... 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: 55c930db11882c8a728526d84219de9788819b59
Bumps [docker/login-action](https://github.com/docker/login-action) from 3 to 4. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](docker/login-action@v3...v4) --- updated-dependencies: - dependency-name: docker/login-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... 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: 94b054ae0c3c039298486dd103c85b900d965829
…925) Bumps the k8s-dependencies group with 1 update: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime). Updates `sigs.k8s.io/controller-runtime` from 0.23.1 to 0.23.3 - [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.23.1...v0.23.3) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-runtime dependency-version: 0.23.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies ... 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: 536c5b9c8755a056e411ad1154c9b1b79a059dc1
Bumps [github.com/docker/cli](https://github.com/docker/cli) from 29.2.1+incompatible to 29.3.0+incompatible. - [Commits](docker/cli@v29.2.1...v29.3.0) --- updated-dependencies: - dependency-name: github.com/docker/cli dependency-version: 29.3.0+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: 833a6e0b795b0bed17bac3b7a78dabaee08acfb3
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3 to 4. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](docker/setup-buildx-action@v3...v4) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... 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: 7a90179744b0936bf3d2bf302bab1216dfdd70ed
Bumps the golang-x-deps group with 2 updates: [golang.org/x/sync](https://github.com/golang/sync) and [golang.org/x/sys](https://github.com/golang/sys). Updates `golang.org/x/sync` from 0.19.0 to 0.20.0 - [Commits](golang/sync@v0.19.0...v0.20.0) Updates `golang.org/x/sys` from 0.41.0 to 0.42.0 - [Commits](golang/sys@v0.41.0...v0.42.0) --- updated-dependencies: - dependency-name: golang.org/x/sync dependency-version: 0.20.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: golang-x-deps - dependency-name: golang.org/x/sys dependency-version: 0.42.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: golang-x-deps ... 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: b1ae733bf02b8cafe2e6a30b06c850899331bcef
…6 (#1929) Bumps [github.com/grpc-ecosystem/grpc-health-probe](https://github.com/grpc-ecosystem/grpc-health-probe) from 0.4.45 to 0.4.46. - [Release notes](https://github.com/grpc-ecosystem/grpc-health-probe/releases) - [Commits](grpc-ecosystem/grpc-health-probe@v0.4.45...0.4.46) --- updated-dependencies: - dependency-name: github.com/grpc-ecosystem/grpc-health-probe dependency-version: 0.4.46 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: bb56aad4a8517a9e0a64f519ad9efcd13bf23996
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.79.1 to 1.79.2. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.79.1...v1.79.2) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-version: 1.79.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: 41e3619ea065e1b84a78a17385c87f20df67eb2e
Bumps the golang-x-deps group with 2 updates: [golang.org/x/mod](https://github.com/golang/mod) and [golang.org/x/text](https://github.com/golang/text). Updates `golang.org/x/mod` from 0.33.0 to 0.34.0 - [Commits](golang/mod@v0.33.0...v0.34.0) Updates `golang.org/x/text` from 0.34.0 to 0.35.0 - [Release notes](https://github.com/golang/text/releases) - [Commits](golang/text@v0.34.0...v0.35.0) --- updated-dependencies: - dependency-name: golang.org/x/mod dependency-version: 0.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: golang-x-deps - dependency-name: golang.org/x/text dependency-version: 0.35.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: golang-x-deps ... 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: 4fef65290eca5c9de6db5d78e097ae623b4f40c5
…sues" (#1898) Upstream-repository: operator-registry Upstream-commit: d47604f44d1276c06efa16932187c9a686579fc2
Bumps [github.com/mattn/go-sqlite3](https://github.com/mattn/go-sqlite3) from 1.14.34 to 1.14.37. - [Release notes](https://github.com/mattn/go-sqlite3/releases) - [Commits](mattn/go-sqlite3@v1.14.34...v1.14.37) --- updated-dependencies: - dependency-name: github.com/mattn/go-sqlite3 dependency-version: 1.14.37 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: 8ef7f3069bbc674e5c93b211eb662a6275623513
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.79.2 to 1.79.3. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.79.2...v1.79.3) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-version: 1.79.3 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: 6ea0f3902d58c501b1585af588ea57c3c329073f
Bumps the k8s-dependencies group with 4 updates: [k8s.io/api](https://github.com/kubernetes/api), [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver), [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) and [k8s.io/client-go](https://github.com/kubernetes/client-go). Updates `k8s.io/api` from 0.35.2 to 0.35.3 - [Commits](kubernetes/api@v0.35.2...v0.35.3) Updates `k8s.io/apiextensions-apiserver` from 0.35.2 to 0.35.3 - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](kubernetes/apiextensions-apiserver@v0.35.2...v0.35.3) Updates `k8s.io/apimachinery` from 0.35.2 to 0.35.3 - [Commits](kubernetes/apimachinery@v0.35.2...v0.35.3) Updates `k8s.io/client-go` from 0.35.2 to 0.35.3 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.35.2...v0.35.3) --- updated-dependencies: - dependency-name: k8s.io/api dependency-version: 0.35.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/apiextensions-apiserver dependency-version: 0.35.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/apimachinery dependency-version: 0.35.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/client-go dependency-version: 0.35.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies ... 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: d1d3906bd67bbe9aa08ff93c3c619de13b515a94
…7 (#1937) Bumps [github.com/grpc-ecosystem/grpc-health-probe](https://github.com/grpc-ecosystem/grpc-health-probe) from 0.4.46 to 0.4.47. - [Release notes](https://github.com/grpc-ecosystem/grpc-health-probe/releases) - [Commits](grpc-ecosystem/grpc-health-probe@v0.4.46...v0.4.47) --- updated-dependencies: - dependency-name: github.com/grpc-ecosystem/grpc-health-probe dependency-version: 0.4.47 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: 2aade625a1930824b971b68dea4ce0554e6f8fc8
Bumps [github.com/docker/cli](https://github.com/docker/cli) from 29.3.0+incompatible to 29.3.1+incompatible. - [Commits](docker/cli@v29.3.0...v29.3.1) --- updated-dependencies: - dependency-name: github.com/docker/cli dependency-version: 29.3.1+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: 7b22611f3f9f15b3a8477da4ea19fc0d1aee29a9
* render package-level info from channel head in semver template Signed-off-by: grokspawn <[email protected]> * add test Signed-off-by: grokspawn <[email protected]> --------- Signed-off-by: grokspawn <[email protected]> Upstream-repository: operator-registry Upstream-commit: 2095729b2418de4c548c6e1aefd824b80f5842f6
Bumps [github.com/operator-framework/api](https://github.com/operator-framework/api) from 0.41.0 to 0.42.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.41.0...v0.42.0) --- updated-dependencies: - dependency-name: github.com/operator-framework/api dependency-version: 0.42.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: 070a649e39d3a594faa4db296f54ddb538468301
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 5 to 6. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](codecov/codecov-action@v5...v6) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... 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: 21f9b559ff5c7574b36a9e21ff1c9875ae967de2
Bumps the k8s-dependencies group with 4 updates: [k8s.io/api](https://github.com/kubernetes/api), [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver), [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) and [k8s.io/client-go](https://github.com/kubernetes/client-go). Updates `k8s.io/api` from 0.35.1 to 0.35.2 - [Commits](kubernetes/api@v0.35.1...v0.35.2) Updates `k8s.io/apiextensions-apiserver` from 0.35.1 to 0.35.2 - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](kubernetes/apiextensions-apiserver@v0.35.1...v0.35.2) Updates `k8s.io/apimachinery` from 0.35.1 to 0.35.2 - [Commits](kubernetes/apimachinery@v0.35.1...v0.35.2) Updates `k8s.io/client-go` from 0.35.1 to 0.35.2 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.35.1...v0.35.2) --- updated-dependencies: - dependency-name: k8s.io/api dependency-version: 0.35.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/apiextensions-apiserver dependency-version: 0.35.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/apimachinery dependency-version: 0.35.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/client-go dependency-version: 0.35.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: api Upstream-commit: 8653fdad74e27e942bc95c277a32eecd79baffb3
…enshift#480) Bumps the k8s-dependencies group with 1 update: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime). Updates `sigs.k8s.io/controller-runtime` from 0.23.1 to 0.23.3 - [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.23.1...v0.23.3) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-runtime dependency-version: 0.23.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: api Upstream-commit: 2b3f0881755f21efb48ce421a26c63d0f3239785
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.78.0 to 1.79.3. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.78.0...v1.79.3) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-version: 1.79.3 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: api Upstream-commit: aae9a89b96e04bc905d5a2fe052886fa42bfa971
Bumps the k8s-dependencies group with 4 updates: [k8s.io/api](https://github.com/kubernetes/api), [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver), [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) and [k8s.io/client-go](https://github.com/kubernetes/client-go). Updates `k8s.io/api` from 0.35.2 to 0.35.3 - [Commits](kubernetes/api@v0.35.2...v0.35.3) Updates `k8s.io/apiextensions-apiserver` from 0.35.2 to 0.35.3 - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](kubernetes/apiextensions-apiserver@v0.35.2...v0.35.3) Updates `k8s.io/apimachinery` from 0.35.2 to 0.35.3 - [Commits](kubernetes/apimachinery@v0.35.2...v0.35.3) Updates `k8s.io/client-go` from 0.35.2 to 0.35.3 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.35.2...v0.35.3) --- updated-dependencies: - dependency-name: k8s.io/api dependency-version: 0.35.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/apiextensions-apiserver dependency-version: 0.35.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/apimachinery dependency-version: 0.35.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/client-go dependency-version: 0.35.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: api Upstream-commit: 3b53b73a2db5e3f023c6ba3430a3368d638dfe93
657c406 to
af45a99
Compare
|
/lgtm |
There was a problem hiding this comment.
🧹 Nitpick comments (1)
staging/operator-registry/alpha/template/semver/semver.go (1)
438-480: Prefer package lookup by name instead of fixed index.Line 470 and Line 475 currently write to
cfg.Packages[0]. Using the package matched bysv.pkg(or by the selected channel’s package) would make this more robust ifcfg.Packagesever contains multiple entries.♻️ Proposed refactor
func (sv *SemverTemplateData) populatePackageMetadata(cfg *declcfg.DeclarativeConfig) { if len(cfg.Packages) == 0 { return } + + packageIdx := slices.IndexFunc(cfg.Packages, func(p declcfg.Package) bool { + return p.Name == sv.pkg + }) + if packageIdx == -1 { + return + } // Find the default channel channelIdx := slices.IndexFunc(cfg.Channels, func(ch declcfg.Channel) bool { return ch.Name == sv.defaultChannel }) @@ // Extract and set description if desc, err := csv.GetDescription(); err == nil && desc != "" { - cfg.Packages[0].Description = desc + cfg.Packages[packageIdx].Description = desc } // Extract and set icon if icons, err := csv.GetIcons(); err == nil && len(icons) > 0 { - cfg.Packages[0].Icon = &declcfg.Icon{ + cfg.Packages[packageIdx].Icon = &declcfg.Icon{ Data: icons[0].Base64data, MediaType: icons[0].MediaType, } } }🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@staging/operator-registry/alpha/template/semver/semver.go` around lines 438 - 480, The method SemverTemplateData.populatePackageMetadata currently writes metadata to cfg.Packages[0]; change this to locate the correct package by name (preferably sv.pkg) before mutating it. Use slices.IndexFunc on cfg.Packages to find the package whose Name == sv.pkg (or, if sv.pkg is empty, derive the package name associated with the selected/default channel) and store that index (e.g., pkgIdx); if not found, return; then assign Description and Icon to cfg.Packages[pkgIdx] instead of cfg.Packages[0]. Ensure you reference sv.defaultChannel, channelIdx, headBundleName and the parsed csv when implementing the lookup and assignments.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Nitpick comments:
In `@staging/operator-registry/alpha/template/semver/semver.go`:
- Around line 438-480: The method SemverTemplateData.populatePackageMetadata
currently writes metadata to cfg.Packages[0]; change this to locate the correct
package by name (preferably sv.pkg) before mutating it. Use slices.IndexFunc on
cfg.Packages to find the package whose Name == sv.pkg (or, if sv.pkg is empty,
derive the package name associated with the selected/default channel) and store
that index (e.g., pkgIdx); if not found, return; then assign Description and
Icon to cfg.Packages[pkgIdx] instead of cfg.Packages[0]. Ensure you reference
sv.defaultChannel, channelIdx, headBundleName and the parsed csv when
implementing the lookup and assignments.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: a57e60cc-c8e9-4194-a64e-22b74290c3eb
⛔ Files ignored due to path filters (62)
go.sumis excluded by!**/*.sumstaging/api/go.sumis excluded by!**/*.sumstaging/operator-lifecycle-manager/go.sumis excluded by!**/*.sumstaging/operator-registry/.bingo/golangci-lint.sumis excluded by!**/*.sumstaging/operator-registry/go.sumis excluded by!**/*.sumvendor/github.com/docker/cli/cli/config/configfile/file.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/grpc-ecosystem/grpc-health-probe/main.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/mattn/go-sqlite3/sqlite3-binding.cis excluded by!vendor/**,!**/vendor/**vendor/github.com/mattn/go-sqlite3/sqlite3-binding.his excluded by!vendor/**,!**/vendor/**vendor/github.com/mattn/go-sqlite3/sqlite3.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/mattn/go-sqlite3/sqlite3_opt_serialize.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-lifecycle-manager/cmd/olm/main.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-lifecycle-manager/cmd/package-server/main.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/event/event.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/kubernetes/pkg/registry/rbac/validation/rule.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/kubernetes/plugin/pkg/auth/authorizer/rbac/rbac.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient/apiservice.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient/clusterrole.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient/clusterrolebinding.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient/configmap.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient/customresources.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient/deployment.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient/networkpolicy.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient/role.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient/rolebinding.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient/secret.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient/service.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient/serviceaccount.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-registry/alpha/declcfg/model_to_declcfg.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-registry/alpha/model/model.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-registry/alpha/template/semver/semver.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-registry/pkg/cache/pkgs.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-registry/pkg/lib/bundle/validate.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-registry/pkg/lib/registry/registry.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-registry/pkg/registry/conversion.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-registry/pkg/sqlite/migrations/migrations.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/operator-framework/operator-registry/pkg/sqlite/query.gois excluded by!vendor/**,!**/vendor/**vendor/google.golang.org/grpc/internal/envconfig/envconfig.gois excluded by!vendor/**,!**/vendor/**vendor/google.golang.org/grpc/server.gois excluded by!vendor/**,!**/vendor/**vendor/google.golang.org/grpc/version.gois excluded by!vendor/**,!**/vendor/**vendor/k8s.io/client-go/kubernetes/fake/clientset_generated.gois excluded by!vendor/**,!**/vendor/**vendor/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_clientset.gois excluded by!vendor/**,!**/vendor/**vendor/k8s.io/klog/.travis.ymlis excluded by!vendor/**,!**/vendor/**vendor/k8s.io/klog/CONTRIBUTING.mdis excluded by!vendor/**,!**/vendor/**vendor/k8s.io/klog/LICENSEis excluded by!vendor/**,!**/vendor/**vendor/k8s.io/klog/OWNERSis excluded by!vendor/**,!**/vendor/**vendor/k8s.io/klog/README.mdis excluded by!vendor/**,!**/vendor/**vendor/k8s.io/klog/RELEASE.mdis excluded by!vendor/**,!**/vendor/**vendor/k8s.io/klog/SECURITY_CONTACTSis excluded by!vendor/**,!**/vendor/**vendor/k8s.io/klog/code-of-conduct.mdis excluded by!vendor/**,!**/vendor/**vendor/k8s.io/klog/klog.gois excluded by!vendor/**,!**/vendor/**vendor/k8s.io/klog/klog_file.gois excluded by!vendor/**,!**/vendor/**vendor/k8s.io/klog/v2/README.mdis excluded by!vendor/**,!**/vendor/**vendor/k8s.io/klog/v2/internal/serialize/keyvalues.gois excluded by!vendor/**,!**/vendor/**vendor/k8s.io/klog/v2/internal/serialize/keyvalues_no_slog.gois excluded by!vendor/**,!**/vendor/**vendor/k8s.io/klog/v2/internal/serialize/keyvalues_slog.gois excluded by!vendor/**,!**/vendor/**vendor/k8s.io/klog/v2/klog.gois excluded by!vendor/**,!**/vendor/**vendor/k8s.io/klog/v2/klogr.gois excluded by!vendor/**,!**/vendor/**vendor/k8s.io/klog/v2/klogr_slog.gois excluded by!vendor/**,!**/vendor/**vendor/k8s.io/klog/v2/textlogger/options.gois excluded by!vendor/**,!**/vendor/**vendor/k8s.io/klog/v2/textlogger/textlogger.gois excluded by!vendor/**,!**/vendor/**vendor/modules.txtis excluded by!vendor/**,!**/vendor/**
📒 Files selected for processing (43)
go.modstaging/api/go.modstaging/operator-lifecycle-manager/cmd/olm/main.gostaging/operator-lifecycle-manager/cmd/package-server/main.gostaging/operator-lifecycle-manager/go.modstaging/operator-lifecycle-manager/pkg/api/client/clientset/versioned/fake/clientset_generated.gostaging/operator-lifecycle-manager/pkg/lib/event/event.gostaging/operator-lifecycle-manager/pkg/lib/kubernetes/pkg/registry/rbac/validation/rule.gostaging/operator-lifecycle-manager/pkg/lib/kubernetes/plugin/pkg/auth/authorizer/rbac/rbac.gostaging/operator-lifecycle-manager/pkg/lib/operatorclient/apiservice.gostaging/operator-lifecycle-manager/pkg/lib/operatorclient/clusterrole.gostaging/operator-lifecycle-manager/pkg/lib/operatorclient/clusterrolebinding.gostaging/operator-lifecycle-manager/pkg/lib/operatorclient/configmap.gostaging/operator-lifecycle-manager/pkg/lib/operatorclient/customresources.gostaging/operator-lifecycle-manager/pkg/lib/operatorclient/deployment.gostaging/operator-lifecycle-manager/pkg/lib/operatorclient/networkpolicy.gostaging/operator-lifecycle-manager/pkg/lib/operatorclient/role.gostaging/operator-lifecycle-manager/pkg/lib/operatorclient/rolebinding.gostaging/operator-lifecycle-manager/pkg/lib/operatorclient/secret.gostaging/operator-lifecycle-manager/pkg/lib/operatorclient/service.gostaging/operator-lifecycle-manager/pkg/lib/operatorclient/serviceaccount.gostaging/operator-lifecycle-manager/pkg/package-server/client/clientset/internalversion/fake/clientset_generated.gostaging/operator-lifecycle-manager/pkg/package-server/client/clientset/versioned/fake/clientset_generated.gostaging/operator-registry/.bingo/Variables.mkstaging/operator-registry/.bingo/golangci-lint.modstaging/operator-registry/.bingo/variables.envstaging/operator-registry/.github/workflows/goreleaser.yamlstaging/operator-registry/.github/workflows/unit.yamlstaging/operator-registry/alpha/declcfg/model_to_declcfg.gostaging/operator-registry/alpha/model/model.gostaging/operator-registry/alpha/template/semver/semver.gostaging/operator-registry/alpha/template/semver/semver_test.gostaging/operator-registry/go.modstaging/operator-registry/pkg/cache/pkgs.gostaging/operator-registry/pkg/lib/bundle/validate.gostaging/operator-registry/pkg/lib/registry/registry.gostaging/operator-registry/pkg/lib/validation/bundle_test.gostaging/operator-registry/pkg/registry/bundle_test.gostaging/operator-registry/pkg/registry/conversion.gostaging/operator-registry/pkg/registry/populator_test.gostaging/operator-registry/pkg/registry/registry_to_model_test.gostaging/operator-registry/pkg/sqlite/migrations/migrations.gostaging/operator-registry/pkg/sqlite/query.go
💤 Files with no reviewable changes (3)
- staging/operator-lifecycle-manager/pkg/package-server/client/clientset/internalversion/fake/clientset_generated.go
- staging/operator-lifecycle-manager/pkg/api/client/clientset/versioned/fake/clientset_generated.go
- staging/operator-lifecycle-manager/pkg/package-server/client/clientset/versioned/fake/clientset_generated.go
✅ Files skipped from review due to trivial changes (23)
- staging/operator-registry/alpha/model/model.go
- staging/operator-lifecycle-manager/pkg/lib/operatorclient/rolebinding.go
- staging/operator-lifecycle-manager/pkg/lib/operatorclient/apiservice.go
- staging/operator-lifecycle-manager/pkg/lib/operatorclient/customresources.go
- staging/operator-lifecycle-manager/pkg/lib/kubernetes/pkg/registry/rbac/validation/rule.go
- staging/operator-registry/pkg/lib/bundle/validate.go
- staging/operator-lifecycle-manager/pkg/lib/operatorclient/secret.go
- staging/operator-registry/pkg/registry/conversion.go
- staging/operator-registry/.github/workflows/unit.yaml
- staging/operator-lifecycle-manager/pkg/lib/operatorclient/configmap.go
- staging/operator-registry/pkg/registry/bundle_test.go
- staging/operator-registry/pkg/cache/pkgs.go
- staging/operator-registry/.bingo/golangci-lint.mod
- staging/operator-registry/pkg/lib/registry/registry.go
- staging/operator-registry/alpha/declcfg/model_to_declcfg.go
- staging/operator-registry/pkg/lib/validation/bundle_test.go
- staging/operator-registry/.github/workflows/goreleaser.yaml
- staging/operator-registry/pkg/sqlite/query.go
- staging/operator-registry/.bingo/variables.env
- staging/operator-registry/pkg/sqlite/migrations/migrations.go
- staging/operator-registry/pkg/registry/populator_test.go
- staging/operator-lifecycle-manager/go.mod
- staging/operator-registry/go.mod
🚧 Files skipped from review as they are similar to previous changes (1)
- go.mod
|
@openshift-bot: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:
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-framework