OCPBUGS-78311, OCPBUGS-78092: Synchronize From Upstream Repositories#677
Merged
openshift-merge-bot[bot] merged 88 commits intoopenshift:mainfrom Mar 27, 2026
Merged
Conversation
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.7.4 to 9.7.5. - [Release notes](https://github.com/squidfunk/mkdocs-material/releases) - [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG) - [Commits](squidfunk/mkdocs-material@9.7.4...9.7.5) --- updated-dependencies: - dependency-name: mkdocs-material dependency-version: 9.7.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…s (#2580) * Add bundle-version and package-name annotations to CER phase objects When upgrading between bundle versions that produce identical Kubernetes manifests, the installed version status was not updated because CER phases were identical across versions, causing in-place patches instead of new revision creation. Propagate bundle-version and package-name annotations onto each rendered object within CER phases so that different bundle versions always produce distinct phases, triggering new revision creation via phase immutability. As a side benefit, every applied bundle resource now carries two annotations that immediately tell an observer which package and version it belongs to. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Address PR review feedback for CER phase annotations - Rename mergeLabelMaps to mergeStringMaps since it handles both labels and annotations - Only set bundle-version/package-name annotations when values are non-empty - Update unit test to use realistic revisionAnnotations values Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
openshift-bot
added
tide/merge-method-merge
openshift-ci-robot
added
the
jira/valid-reference
openshift-bot
added
the
approved
|
@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. |
Contributor
|
@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. |
WalkthroughConfiguration and dependency bumps, tests and e2e scenario additions, refactors to progression probe handling and probe type renames, applier/boxcutter label→annotation propagation and helper rename, cert-manager IssuerRef concrete type change, and minor Makefile/docs fixes. No public API signatures were added or removed. Changes
Estimated code review effort🎯 4 (Complex) | ⏱️ ~45 minutes ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
* Upgrade boxcutter from v0.11.0 to v0.12.0
* fix: use awk instead of cut to extract K8S_VERSION from go list output
When k8s.io/client-go has a replace directive, `go list -m` outputs
"k8s.io/client-go v1.5.2 => k8s.io/client-go v0.35.0". Using
`cut -d" " -f2` picks the original version (v1.5.2) instead of the
replacement (v0.35.0), causing kind-verify-versions to fail with
"kindest/node:v1.35 version does not match k8s vv1.5.2" when
running `make verify`.
Replace `cut` with `awk '{print $NF}'` to always select the effective
version.
* fix typo Signed-off-by: Francesco Giudici <fgiudici@redhat.com> * Update docs/tutorials/install-extension.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Signed-off-by: Francesco Giudici <fgiudici@redhat.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Bumps [requests](https://github.com/psf/requests) from 2.32.5 to 2.33.0. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](psf/requests@v2.32.5...v2.33.0) --- updated-dependencies: - dependency-name: requests dependency-version: 2.33.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…597) * 🌱 Bump github.com/cert-manager/cert-manager Bumps [github.com/cert-manager/cert-manager](https://github.com/cert-manager/cert-manager) from 1.19.4 to 1.20.0. - [Release notes](https://github.com/cert-manager/cert-manager/releases) - [Changelog](https://github.com/cert-manager/cert-manager/blob/master/RELEASE.md) - [Commits](cert-manager/cert-manager@v1.19.4...v1.20.0) --- updated-dependencies: - dependency-name: github.com/cert-manager/cert-manager dependency-version: 1.20.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Fix lint issues Signed-off-by: Todd Short <tshort@redhat.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Todd Short <tshort@redhat.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
openshift-bot
force-pushed
the
synchronize-upstream
branch
from
9ff62f1 to
b3cff11
Compare
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
🧹 Nitpick comments (1)
go.mod (1)
43-43: Clean up the k8s.io/client-go version declaration.The require block lists
k8s.io/client-go v1.5.2, which doesn't follow the typical k8s.io/client-go versioning scheme and is immediately replaced by the replace directive tov0.35.0. While the replace directive correctly resolves the version at build time, having the incorrect version in the require block is confusing. Update the require block to directly referencev0.35.0for consistency and clarity.🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@go.mod` at line 43, Update the require entry for the module k8s.io/client-go so it directly references the real version instead of the misleading v1.5.2; modify the require block entry for "k8s.io/client-go" to "v0.35.0" to match the existing replace directive and avoid confusion between the require and replace directives.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@go.mod`:
- Line 48: The go.mod entry for the dependency
pkg.package-operator.run/boxcutter incorrectly pins a non-existent v0.12.0;
update the version to the latest released v0.11.0 by changing the module version
for pkg.package-operator.run/boxcutter to v0.11.0 in go.mod and then run go get
pkg.package-operator.run/boxcutter@v0.11.0 (or go mod tidy) to regenerate go.sum
and ensure the module graph is consistent.
---
Nitpick comments:
In `@go.mod`:
- Line 43: Update the require entry for the module k8s.io/client-go so it
directly references the real version instead of the misleading v1.5.2; modify
the require block entry for "k8s.io/client-go" to "v0.35.0" to match the
existing replace directive and avoid confusion between the require and replace
directives.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: 5707c00a-9b1c-4265-901d-bdcc9e1f1c7b
⛔ Files ignored due to path filters (204)
go.sumis excluded by!**/*.sumopenshift/tests-extension/go.sumis excluded by!**/*.sumopenshift/tests-extension/vendor/github.com/go-openapi/jsonpointer/.gitignoreis excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/go-openapi/jsonpointer/.golangci.ymlis excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/go-openapi/jsonpointer/CODE_OF_CONDUCT.mdis excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/go-openapi/jsonpointer/CONTRIBUTORS.mdis excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/go-openapi/jsonpointer/README.mdis excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/go-openapi/jsonpointer/SECURITY.mdis excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/go-openapi/jsonreference/.cliff.tomlis excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/go-openapi/jsonreference/.gitignoreis excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/go-openapi/jsonreference/.golangci.ymlis excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/go-openapi/jsonreference/CODE_OF_CONDUCT.mdis excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/go-openapi/jsonreference/CONTRIBUTORS.mdis excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/go-openapi/jsonreference/NOTICEis excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/go-openapi/jsonreference/README.mdis excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/go-openapi/jsonreference/SECURITY.mdis excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/go-openapi/jsonreference/reference.gois excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/go-openapi/swag/.gitignoreis excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/go-openapi/swag/CODE_OF_CONDUCT.mdis excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/go-openapi/swag/CONTRIBUTORS.mdis excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/go-openapi/swag/README.mdis excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/go-openapi/swag/jsonutils/README.mdis excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/go-openapi/swag/mangling/BENCHMARK.mdis excluded by!**/vendor/**openshift/tests-extension/vendor/github.com/prometheus/procfs/Makefile.commonis excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/.golangci.ymlis excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/CHANGELOG.mdis excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/CONTRIBUTING.mdis excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/Makefileis excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/README.mdis excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/baggage/baggage.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/dependencies.Dockerfileis excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/internal/errorhandler/errorhandler.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/internal/global/handler.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/internal/global/state.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/metric/asyncfloat64.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/metric/asyncint64.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/metric/meter.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/metric/syncfloat64.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/metric/syncint64.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/propagation/baggage.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/propagation/trace_context.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/requirements.txtis excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/semconv/v1.39.0/httpconv/metric.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/semconv/v1.40.0/MIGRATION.mdis excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/semconv/v1.40.0/README.mdis excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/semconv/v1.40.0/attribute_group.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/semconv/v1.40.0/doc.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/semconv/v1.40.0/error_type.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/semconv/v1.40.0/exception.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/semconv/v1.40.0/schema.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/trace/auto.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/trace/trace.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/trace/tracestate.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/version.gois excluded by!**/vendor/**openshift/tests-extension/vendor/go.opentelemetry.io/otel/versions.yamlis excluded by!**/vendor/**openshift/tests-extension/vendor/golang.org/x/net/html/iter.gois excluded by!**/vendor/**openshift/tests-extension/vendor/golang.org/x/net/http2/frame.gois excluded by!**/vendor/**openshift/tests-extension/vendor/golang.org/x/net/http2/http2.gois excluded by!**/vendor/**openshift/tests-extension/vendor/golang.org/x/net/http2/server.gois excluded by!**/vendor/**openshift/tests-extension/vendor/golang.org/x/net/http2/transport.gois excluded by!**/vendor/**openshift/tests-extension/vendor/golang.org/x/net/http2/writesched.gois excluded by!**/vendor/**openshift/tests-extension/vendor/golang.org/x/net/http2/writesched_priority_rfc7540.gois excluded by!**/vendor/**openshift/tests-extension/vendor/golang.org/x/net/http2/writesched_random.gois excluded by!**/vendor/**openshift/tests-extension/vendor/golang.org/x/sys/cpu/asm_darwin_arm64_gc.sis excluded by!**/vendor/**openshift/tests-extension/vendor/golang.org/x/sys/cpu/cpu_arm64.gois excluded by!**/vendor/**openshift/tests-extension/vendor/golang.org/x/sys/cpu/cpu_darwin_arm64.gois excluded by!**/vendor/**openshift/tests-extension/vendor/golang.org/x/sys/cpu/cpu_darwin_arm64_other.gois excluded by!**/vendor/**openshift/tests-extension/vendor/golang.org/x/sys/cpu/cpu_gccgo_arm64.gois excluded by!**/vendor/**openshift/tests-extension/vendor/golang.org/x/sys/cpu/cpu_other_arm64.gois excluded by!**/vendor/**openshift/tests-extension/vendor/golang.org/x/sys/cpu/syscall_darwin_arm64_gc.gois excluded by!**/vendor/**openshift/tests-extension/vendor/golang.org/x/sys/plan9/syscall_plan9.gois excluded by!**/vendor/**openshift/tests-extension/vendor/golang.org/x/sys/unix/ztypes_linux.gois excluded by!**/vendor/**openshift/tests-extension/vendor/golang.org/x/sys/windows/aliases.gois excluded by!**/vendor/**openshift/tests-extension/vendor/golang.org/x/sys/windows/registry/key.gois excluded by!**/vendor/**openshift/tests-extension/vendor/golang.org/x/sys/windows/syscall_windows.gois excluded by!**/vendor/**openshift/tests-extension/vendor/k8s.io/utils/ptr/ptr.gois excluded by!**/vendor/**openshift/tests-extension/vendor/modules.txtis excluded by!**/vendor/**vendor/github.com/cert-manager/cert-manager/LICENSESis excluded by!vendor/**,!**/vendor/**vendor/github.com/cert-manager/cert-manager/pkg/apis/acme/v1/types.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cert-manager/cert-manager/pkg/apis/acme/v1/types_challenge.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cert-manager/cert-manager/pkg/apis/acme/v1/types_issuer.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cert-manager/cert-manager/pkg/apis/acme/v1/types_order.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1/generic_issuer.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1/types.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1/types_certificate.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1/types_certificaterequest.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1/types_issuer.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cert-manager/cert-manager/pkg/apis/meta/v1/types.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/jsonpointer/.gitignoreis excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/jsonpointer/.golangci.ymlis excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/jsonpointer/CODE_OF_CONDUCT.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/jsonpointer/CONTRIBUTORS.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/jsonpointer/README.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/jsonpointer/SECURITY.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/jsonreference/.cliff.tomlis excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/jsonreference/.gitignoreis excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/jsonreference/.golangci.ymlis excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/jsonreference/CODE_OF_CONDUCT.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/jsonreference/CONTRIBUTORS.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/jsonreference/NOTICEis excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/jsonreference/README.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/jsonreference/SECURITY.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/jsonreference/reference.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/swag/.gitignoreis excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/swag/CODE_OF_CONDUCT.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/swag/CONTRIBUTORS.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/swag/README.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/swag/jsonutils/README.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/go-openapi/swag/mangling/BENCHMARK.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/.golangci.ymlis excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/Makefile.commonis excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/cpuinfo.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/cpuinfo_armx.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/cpuinfo_loong64.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/cpuinfo_mipsx.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/cpuinfo_others.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/cpuinfo_ppcx.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/cpuinfo_riscvx.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/cpuinfo_s390x.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/cpuinfo_x86.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/fs_statfs_notype.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/fs_statfs_type.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/internal/util/sysreadfile.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/internal/util/sysreadfile_compat.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/kernel_hung.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/kernel_random.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/net_tcp.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/proc_interrupts.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/proc_maps.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/proc_smaps.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/proc_statm.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/proc_status.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/vm.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/prometheus/procfs/zoneinfo.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/.golangci.ymlis excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/CHANGELOG.mdis excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/CONTRIBUTING.mdis excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/Makefileis excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/README.mdis excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/baggage/baggage.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/dependencies.Dockerfileis excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/internal/errorhandler/errorhandler.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/internal/global/handler.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/internal/global/state.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/metric/asyncfloat64.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/metric/asyncint64.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/metric/meter.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/metric/syncfloat64.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/metric/syncint64.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/propagation/baggage.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/propagation/trace_context.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/requirements.txtis excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/semconv/v1.39.0/httpconv/metric.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/semconv/v1.40.0/MIGRATION.mdis excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/semconv/v1.40.0/README.mdis excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/semconv/v1.40.0/attribute_group.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/semconv/v1.40.0/doc.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/semconv/v1.40.0/error_type.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/semconv/v1.40.0/exception.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/semconv/v1.40.0/schema.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/trace/auto.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/trace/trace.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/trace/tracestate.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/version.gois excluded by!vendor/**,!**/vendor/**vendor/go.opentelemetry.io/otel/versions.yamlis excluded by!vendor/**,!**/vendor/**vendor/golang.org/x/net/http2/frame.gois excluded by!vendor/**,!**/vendor/**vendor/golang.org/x/net/http2/http2.gois excluded by!vendor/**,!**/vendor/**vendor/golang.org/x/net/http2/server.gois excluded by!vendor/**,!**/vendor/**vendor/golang.org/x/net/http2/transport.gois excluded by!vendor/**,!**/vendor/**vendor/golang.org/x/net/http2/writesched.gois excluded by!vendor/**,!**/vendor/**vendor/golang.org/x/net/http2/writesched_priority_rfc7540.gois excluded by!vendor/**,!**/vendor/**vendor/golang.org/x/net/http2/writesched_random.gois excluded by!vendor/**,!**/vendor/**vendor/golang.org/x/sys/cpu/asm_darwin_arm64_gc.sis excluded by!vendor/**,!**/vendor/**vendor/golang.org/x/sys/cpu/cpu_arm64.gois excluded by!vendor/**,!**/vendor/**vendor/golang.org/x/sys/cpu/cpu_darwin_arm64.gois excluded by!vendor/**,!**/vendor/**vendor/golang.org/x/sys/cpu/cpu_darwin_arm64_other.gois excluded by!vendor/**,!**/vendor/**vendor/golang.org/x/sys/cpu/cpu_gccgo_arm64.gois excluded by!vendor/**,!**/vendor/**vendor/golang.org/x/sys/cpu/cpu_other_arm64.gois excluded by!vendor/**,!**/vendor/**vendor/golang.org/x/sys/cpu/syscall_darwin_arm64_gc.gois excluded by!vendor/**,!**/vendor/**vendor/golang.org/x/sys/plan9/syscall_plan9.gois excluded by!vendor/**,!**/vendor/**vendor/golang.org/x/sys/unix/ztypes_linux.gois excluded by!vendor/**,!**/vendor/**vendor/golang.org/x/sys/windows/aliases.gois excluded by!vendor/**,!**/vendor/**vendor/golang.org/x/sys/windows/registry/key.gois excluded by!vendor/**,!**/vendor/**vendor/golang.org/x/sys/windows/syscall_windows.gois excluded by!vendor/**,!**/vendor/**vendor/k8s.io/utils/ptr/ptr.gois excluded by!vendor/**,!**/vendor/**vendor/modules.txtis excluded by!vendor/**,!**/vendor/**vendor/pkg.package-operator.run/boxcutter/boxcutter.gois excluded by!vendor/**,!**/vendor/**vendor/pkg.package-operator.run/boxcutter/machinery/objects.gois excluded by!vendor/**,!**/vendor/**vendor/pkg.package-operator.run/boxcutter/machinery/phases.gois excluded by!vendor/**,!**/vendor/**vendor/pkg.package-operator.run/boxcutter/machinery/types/options.gois excluded by!vendor/**,!**/vendor/**vendor/sigs.k8s.io/controller-runtime/pkg/client/fake/versioned_tracker.gois excluded by!vendor/**,!**/vendor/**vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/defaulter_custom.gois excluded by!vendor/**,!**/vendor/**vendor/sigs.k8s.io/gateway-api/apis/v1/backendtlspolicy_types.gois excluded by!vendor/**,!**/vendor/**vendor/sigs.k8s.io/gateway-api/apis/v1/gateway_types.gois excluded by!vendor/**,!**/vendor/**vendor/sigs.k8s.io/gateway-api/apis/v1/gatewayclass_types.gois excluded by!vendor/**,!**/vendor/**vendor/sigs.k8s.io/gateway-api/apis/v1/grpcroute_types.gois excluded by!vendor/**,!**/vendor/**vendor/sigs.k8s.io/gateway-api/apis/v1/httproute_types.gois excluded by!vendor/**,!**/vendor/**vendor/sigs.k8s.io/gateway-api/apis/v1/listenerset_types.gois excluded by!vendor/**,!**/vendor/**vendor/sigs.k8s.io/gateway-api/apis/v1/object_reference_types.gois excluded by!vendor/**,!**/vendor/**vendor/sigs.k8s.io/gateway-api/apis/v1/referencegrant_types.gois excluded by!vendor/**,!**/vendor/**vendor/sigs.k8s.io/gateway-api/apis/v1/shared_types.gois excluded by!vendor/**,!**/vendor/**vendor/sigs.k8s.io/gateway-api/apis/v1/tlsroute_types.gois excluded by!vendor/**,!**/vendor/**vendor/sigs.k8s.io/gateway-api/apis/v1/zz_generated.deepcopy.gois excluded by!vendor/**,!**/vendor/**vendor/sigs.k8s.io/gateway-api/apis/v1/zz_generated.register.gois excluded by!vendor/**,!**/vendor/**
📒 Files selected for processing (12)
Makefilecommitchecker.yamldocs/tutorials/install-extension.mdgo.modinternal/operator-controller/applier/boxcutter.gointernal/operator-controller/applier/boxcutter_test.gointernal/operator-controller/rukpak/render/certproviders/certmanager.gointernal/operator-controller/rukpak/render/certproviders/certmanager_test.goopenshift/tests-extension/go.modrequirements.txttest/e2e/features/update.featuretestdata/images/catalogs/test-catalog/v1/configs/catalog.yaml
✅ Files skipped from review due to trivial changes (5)
- requirements.txt
- docs/tutorials/install-extension.md
- commitchecker.yaml
- testdata/images/catalogs/test-catalog/v1/configs/catalog.yaml
- openshift/tests-extension/go.mod
| pkg.package-operator.run/boxcutter v0.11.0 | ||
| sigs.k8s.io/controller-runtime v0.23.1 | ||
| k8s.io/utils v0.0.0-20260319190234-28399d86e0b5 | ||
| pkg.package-operator.run/boxcutter v0.12.0 |
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
# Description: Verify boxcutter v0.12.0 API compatibility
# Check if the code compiles with the new version
go build ./internal/operator-controller/controllers/...
# Look for boxcutter API usage patterns that might be affected
rg -nP '\bmachinery\.(NewRevisionEngine|NewPhaseEngine|NewObjectEngine|NewComparator)' --type=go
rg -nP '\bboxcutter\.(NewRevisionWithOwner|WithPreviousOwners|WithProbe|NewPhase|WithObjectReconcileOptions)' --type=go
# Check for breaking changes in boxcutter release notes/changelog
curl -s https://api.github.com/repos/package-operator/boxcutter/releases | \
jq -r '.[] | select(.tag_name == "v0.12.0") | .body'Repository: openshift/operator-framework-operator-controller
Length of output: 1831
🏁 Script executed:
# Check the go.mod file content around the boxcutter dependency
cat go.mod | head -60Repository: openshift/operator-framework-operator-controller
Length of output: 2077
🌐 Web query:
boxcutter package-operator v0.12.0 release notes breaking changes
💡 Result:
No release notes or breaking changes for boxcutter package-operator v0.12.0 exist because this version has not been released. The latest release of the boxcutter library (pkg.package-operator.run/boxcutter) is v0.11.0, released on 2026-02-26. The GitHub repository https://github.com/package-operator/boxcutter confirms 18 releases with v0.11.0 as the latest, and pkg.go.dev version history lists up to v0.11.0. The main package-operator repository at https://github.com/package-operator/package-operator has releases up to around v1.19.0, but boxcutter specifically does not have v0.12.0. Last push to boxcutter repo was 2026-03-03, but no v0.12.0 tag.
Citations:
- 1: https://github.com/package-operator/boxcutter
- 2: https://pkg.go.dev/pkg.package-operator.run/boxcutter@v0.1.1
- 3: https://deps.dev/go/pkg.package-operator.run%2Fboxcutter/v0.11.0
- 4: https://pkg.go.dev/package-operator.run/pkg
Update boxcutter to v0.11.0; v0.12.0 does not exist.
The go.mod references pkg.package-operator.run/boxcutter v0.12.0, but this version has not been released. The latest available version is v0.11.0 (released 2026-02-26). This dependency specification will cause build failures. Update to v0.11.0.
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@go.mod` at line 48, The go.mod entry for the dependency
pkg.package-operator.run/boxcutter incorrectly pins a non-existent v0.12.0;
update the version to the latest released v0.11.0 by changing the module version
for pkg.package-operator.run/boxcutter to v0.11.0 in go.mod and then run go get
pkg.package-operator.run/boxcutter@v0.11.0 (or go mod tidy) to regenerate go.sum
and ensure the module graph is consistent.
Member
|
/retitle OCPBUGS-78311: Synchronize From Upstream Repositories |
openshift-ci
bot
changed the title
openshift-ci-robot
added
the
jira/invalid-bug
|
@openshift-bot: This pull request references Jira Issue OCPBUGS-78311, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. 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. |
Member
|
/jira refresh |
openshift-ci-robot
added
jira/valid-bug
|
@jianzhangbjz: This pull request references Jira Issue OCPBUGS-78311, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Jira (jiazha@redhat.com), skipping review request. 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. |
Member
|
Verify https://redhat.atlassian.net/browse/OCPBUGS-78311 failed. Details as follows. Hi @pedjak , could you help look at it? Thanks!
launch 4.22,openshift/operator-framework-operator-controller#677 aws
jiazha-mac:~ jiazha$ oc get clusterversion
NAME VERSION AVAILABLE PROGRESSING SINCE STATUS
version 4.22.0-0-2026-03-26-005534-test-ci-ln-t9vxgit-latest True False 36m Cluster version is 4.22.0-0-2026-03-26-005534-test-ci-ln-t9vxgit-latest
jiazha-mac:~ jiazha$ oc create -f cc-learn.yaml
clustercatalog.olm.operatorframework.io/jian-operators created
jiazha-mac:~ jiazha$ oc new-project test2
...
jiazha-mac:~ jiazha$ oc create -f ce-learn.yaml
serviceaccount/learn-operator2 created
jiazha-mac:~ jiazha$ oc get clusterextension
NAME INSTALLED BUNDLE VERSION INSTALLED PROGRESSING AGE
extension-learn-operator learn-operator.v0.0.1 0.0.1 True True 2m3s
jiazha-mac:~ jiazha$ oc patch clusterextension/extension-learn-operator -p '{"spec": {"source": {"catalog": {"version": "v0.0.2"}}}}' --type=merge
clusterextension.olm.operatorframework.io/extension-learn-operator patched
jiazha-mac:~ jiazha$ oc get clusterextension
NAME INSTALLED BUNDLE VERSION INSTALLED PROGRESSING AGE
extension-learn-operator learn-operator.v0.0.2 0.0.2 True True 2m51s
status:
install:
bundle:
name: my-operator.v0.0.1
version: 0.0.1Details: jiazha-mac:~ jiazha$ oc patch clusterextension/extension-learn-operator -p '{"spec": {"source": {"catalog": {"version": "v0.0.3"}}}}' --type=merge
clusterextension.olm.operatorframework.io/extension-learn-operator patched
jiazha-mac:~ jiazha$ oc get clusterextension
NAME INSTALLED BUNDLE VERSION INSTALLED PROGRESSING AGE
extension-learn-operator learn-operator.v0.0.1 0.0.1 True True 3m41s
jiazha-mac:~ jiazha$ oc get clusterextension extension-learn-operator -o yaml
apiVersion: olm.operatorframework.io/v1
kind: ClusterExtension
metadata:
creationTimestamp: "2026-03-26T02:28:42Z"
finalizers:
- olm.operatorframework.io/cleanup-unpack-cache
- olm.operatorframework.io/cleanup-contentmanager-cache
generation: 3
name: extension-learn-operator
resourceVersion: "42318"
uid: 448dbd0b-5b7f-44c4-8e80-a99e17c6c6c2
spec:
namespace: test2
serviceAccount:
name: learn-operator2
source:
catalog:
channels:
- beta
packageName: learn
selector: {}
upgradeConstraintPolicy: CatalogProvided
version: v0.0.3
sourceType: Catalog
status:
conditions:
- lastTransitionTime: "2026-03-26T02:32:18Z"
message: 'deprecation status unknown: catalog data unavailable'
observedGeneration: 3
reason: DeprecationStatusUnknown
status: Unknown
type: Deprecated
- lastTransitionTime: "2026-03-26T02:32:18Z"
message: 'deprecation status unknown: catalog data unavailable'
observedGeneration: 3
reason: DeprecationStatusUnknown
status: Unknown
type: PackageDeprecated
- lastTransitionTime: "2026-03-26T02:32:18Z"
message: 'deprecation status unknown: catalog data unavailable'
observedGeneration: 3
reason: DeprecationStatusUnknown
status: Unknown
type: ChannelDeprecated
- lastTransitionTime: "2026-03-26T02:32:18Z"
message: 'deprecation status unknown: catalog data unavailable'
observedGeneration: 3
reason: DeprecationStatusUnknown
status: Unknown
type: BundleDeprecated
- lastTransitionTime: "2026-03-26T02:28:42Z"
message: 'error upgrading from currently installed version "0.0.1": no bundles
found for package "learn" matching version "v0.0.3" in channels [beta]'
observedGeneration: 3
reason: Retrying
status: "True"
type: Progressing
- lastTransitionTime: "2026-03-26T02:29:56Z"
message: Installed bundle quay.io/olmqe/learn-operator-bundle@sha256:6e413b8f119d7d5555160c99ccbf17a21c560b4bbed034bd0a1d3fbf539e5fa3
successfully
observedGeneration: 3
reason: Succeeded
status: "True"
type: Installed
install:
bundle:
name: learn-operator.v0.0.1
version: 0.0.1Expected results: The ClusterExtension status should reflect the new version: status:
install:
bundle:
name: my-operator.v0.0.2
version: 0.0.2 |
openshift-bot
changed the title
openshift-bot
force-pushed
the
synchronize-upstream
branch
from
b3cff11 to
7309ed5
Compare
Member
|
/retitle OCPBUGS-78311: Synchronize From Upstream Repositories |
openshift-ci
bot
changed the title
openshift-ci-robot
added
the
jira/valid-bug
|
@openshift-bot: This pull request references Jira Issue OCPBUGS-78311, which is valid. 3 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Jira (jiazha@redhat.com), skipping review request. 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. |
Contributor
|
@openshift-bot: The following test 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. |
Contributor
|
/retitle OCPBUGS-78311, OCPBUGS-78092: Synchronize From Upstream Repositories |
openshift-ci
bot
changed the title
openshift-ci-robot
added
jira/severity-moderate
|
@openshift-bot: This pull request references Jira Issue OCPBUGS-78311, which is valid. 3 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Jira (jiazha@redhat.com), skipping review request. The bug has been updated to refer to the pull request using the external bug tracker. This pull request references Jira Issue OCPBUGS-78092, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. 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. |
Contributor
|
verify OCPBUGS-78092 success |
Contributor
|
/jira refresh |
openshift-ci-robot
added
jira/valid-bug
|
@Xia-Zhao-rh: This pull request references Jira Issue OCPBUGS-78311, which is valid. 3 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Jira (jiazha@redhat.com), skipping review request. This pull request references Jira Issue OCPBUGS-78092, which is valid. 3 validation(s) were run on this bug
Requesting review from QA contact: 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. |
Contributor
@jianzhangbjz the catalog needs to be fixed |
Member
|
That's expected. More discusion on Slack: https://redhat-internal.slack.com/archives/C06KP34REFJ/p1774597629457469?thread_ts=1774572279.103759&cid=C06KP34REFJ |
Contributor
|
/lgtm |
Contributor
|
/retest-required |
Member
|
Although OCPBUGS-78311 verification failed, I will verify this PR to unblock the Upstream/Downstream sync. |
Member
|
/verified by @jianzhangbjz |
openshift-ci-robot
added
the
verified
|
@jianzhangbjz: This PR has been marked as verified by 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-merge-bot
bot
merged commit 251d9b0
into
openshift:main
14 of 15 checks passed
|
@openshift-bot: Jira Issue OCPBUGS-78311: Some pull requests linked via external trackers have merged: The following pull request, linked via external tracker, has not merged: All associated pull requests must be merged or unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with Jira Issue OCPBUGS-78311 has not been moved to the MODIFIED state. This PR is marked as verified. If the remaining PRs listed above are marked as verified before merging, the issue will automatically be moved to VERIFIED after all of the changes from the PRs are available in an accepted nightly payload. Jira Issue Verification Checks: Jira Issue OCPBUGS-78092 Jira Issue OCPBUGS-78092 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓 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. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
16 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The downstream repository has been updated with the following following upstream commits:
The
vendor/directory has been updated and the following commits were carried:@catalogd-updateThis 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