OCPBUGS-78311, OCPBUGS-78092: Synchronize From Upstream Repositories #677
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| expectedMergeBase: 253feaef5babbdabfb4b63d1cb3a60455947be3a | ||
| upstreamBranch: main | ||
| upstreamOrg: operator-framework | ||
| upstreamRepo: operator-controller |
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
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -6,7 +6,7 @@ require ( | |||||
| github.com/BurntSushi/toml v1.6.0 | ||||||
| github.com/Masterminds/semver/v3 v3.4.0 | ||||||
| github.com/blang/semver/v4 v4.0.0 | ||||||
| github.com/cert-manager/cert-manager v1.20.0 | ||||||
| github.com/containerd/containerd v1.7.30 | ||||||
| github.com/cucumber/godog v0.15.1 | ||||||
| github.com/evanphx/json-patch v5.9.11+incompatible | ||||||
|
|
@@ -33,20 +33,20 @@ require ( | |||||
| golang.org/x/exp v0.0.0-20260209203927-2842357ff358 | ||||||
| golang.org/x/mod v0.34.0 | ||||||
| golang.org/x/sync v0.20.0 | ||||||
| golang.org/x/tools v0.43.0 | ||||||
| helm.sh/helm/v3 v3.20.1 | ||||||
| k8s.io/api v0.35.3 | ||||||
| k8s.io/apiextensions-apiserver v0.35.3 | ||||||
| k8s.io/apimachinery v0.35.3 | ||||||
| k8s.io/apiserver v0.35.2 | ||||||
| k8s.io/cli-runtime v0.35.1 | ||||||
| k8s.io/client-go v1.5.2 | ||||||
|
There was a problem hiding this comment. 🧩 Analysis chain🏁 Script executed: #!/bin/bash
set -euo pipefail
echo "client-go require line:"
rg -nP '^\s*k8s\.io/client-go\s+v' go.mod
echo
echo "client-go replace line:"
rg -nP '^replace\s+k8s\.io/client-go\s+=>\s+k8s\.io/client-go\s+v' go.mod
echo
echo "Published versions check:"
curl -fsSL 'https://proxy.golang.org/k8s.io/client-go/@v/list' | rg -n '^(v1\.5\.2|v0\.35\.0|v0\.35\.1|v0\.35\.2|v0\.35\.3)$' || trueRepository: openshift/operator-framework-operator-controller Length of output: 311 Align Line 43 requires Proposed fix- k8s.io/client-go v1.5.2
+ k8s.io/client-go v0.35.0📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||
| k8s.io/component-base v0.35.2 | ||||||
| k8s.io/klog/v2 v2.140.0 | ||||||
| k8s.io/kubernetes v1.35.0 | ||||||
| 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:
💡 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:
Update boxcutter to v0.11.0; v0.12.0 does not exist. The go.mod references 🤖 Prompt for AI Agents |
||||||
| sigs.k8s.io/controller-runtime v0.23.3 | ||||||
| sigs.k8s.io/controller-tools v0.20.1 | ||||||
| sigs.k8s.io/crdify v0.5.0 | ||||||
| sigs.k8s.io/structured-merge-diff/v6 v6.3.2 | ||||||
|
|
@@ -55,7 +55,7 @@ require ( | |||||
|
|
||||||
| require ( | ||||||
| k8s.io/component-helpers v0.35.0 // indirect | ||||||
| k8s.io/kube-openapi v0.0.0-20260319004828-5883c5ee87b9 // indirect | ||||||
| ) | ||||||
|
|
||||||
| require ( | ||||||
|
|
@@ -115,20 +115,20 @@ require ( | |||||
| github.com/go-gorp/gorp/v3 v3.1.0 // indirect | ||||||
| github.com/go-jose/go-jose/v4 v4.1.3 // indirect | ||||||
| github.com/go-logr/stdr v1.2.2 // indirect | ||||||
| github.com/go-openapi/jsonpointer v0.22.5 // indirect | ||||||
| github.com/go-openapi/jsonreference v0.21.5 // indirect | ||||||
| github.com/go-openapi/swag v0.25.5 // indirect | ||||||
| github.com/go-openapi/swag/cmdutils v0.25.5 // indirect | ||||||
| github.com/go-openapi/swag/conv v0.25.5 // indirect | ||||||
| github.com/go-openapi/swag/fileutils v0.25.5 // indirect | ||||||
| github.com/go-openapi/swag/jsonname v0.25.5 // indirect | ||||||
| github.com/go-openapi/swag/jsonutils v0.25.5 // indirect | ||||||
| github.com/go-openapi/swag/loading v0.25.5 // indirect | ||||||
| github.com/go-openapi/swag/mangling v0.25.5 // indirect | ||||||
| github.com/go-openapi/swag/netutils v0.25.5 // indirect | ||||||
| github.com/go-openapi/swag/stringutils v0.25.5 // indirect | ||||||
| github.com/go-openapi/swag/typeutils v0.25.5 // indirect | ||||||
| github.com/go-openapi/swag/yamlutils v0.25.5 // indirect | ||||||
| github.com/go-sql-driver/mysql v1.9.2 // indirect | ||||||
| github.com/gobuffalo/flect v1.0.3 // indirect | ||||||
| github.com/gobwas/glob v0.2.3 // indirect | ||||||
|
|
@@ -193,7 +193,7 @@ require ( | |||||
| github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect | ||||||
| github.com/proglottis/gpgme v0.1.6 // indirect | ||||||
| github.com/prometheus/client_model v0.6.2 // indirect | ||||||
| github.com/prometheus/procfs v0.20.1 // indirect | ||||||
| github.com/rubenv/sql-migrate v1.8.1 // indirect | ||||||
| github.com/russross/blackfriday/v2 v2.1.0 // indirect | ||||||
| github.com/secure-systems-lab/go-securesystemslib v0.10.0 // indirect | ||||||
|
|
@@ -215,28 +215,28 @@ require ( | |||||
| go.opencensus.io v0.24.0 // indirect | ||||||
| go.opentelemetry.io/auto/sdk v1.2.1 // indirect | ||||||
| go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect | ||||||
| go.opentelemetry.io/otel v1.42.0 // indirect | ||||||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect | ||||||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 // indirect | ||||||
| go.opentelemetry.io/otel/metric v1.42.0 // indirect | ||||||
| go.opentelemetry.io/otel/sdk v1.40.0 // indirect | ||||||
| go.opentelemetry.io/otel/trace v1.42.0 // indirect | ||||||
| go.opentelemetry.io/proto/otlp v1.9.0 // indirect | ||||||
| go.podman.io/common v0.67.0 // indirect | ||||||
| go.podman.io/storage v1.62.0 // indirect | ||||||
| go.yaml.in/yaml/v2 v2.4.4 // indirect | ||||||
| go.yaml.in/yaml/v3 v3.0.4 // indirect | ||||||
| golang.org/x/crypto v0.49.0 // indirect | ||||||
| golang.org/x/net v0.52.0 // indirect | ||||||
| golang.org/x/oauth2 v0.36.0 // indirect | ||||||
| golang.org/x/sys v0.42.0 // indirect | ||||||
| golang.org/x/term v0.41.0 // indirect | ||||||
| golang.org/x/text v0.35.0 // indirect | ||||||
| golang.org/x/time v0.15.0 // indirect | ||||||
| gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect | ||||||
| google.golang.org/genproto v0.0.0-20260209200024-4cfbd4190f57 // indirect | ||||||
| google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 // indirect | ||||||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20260217215200-42d3e9bedb6d // indirect | ||||||
| google.golang.org/grpc v1.79.3 // indirect | ||||||
| google.golang.org/protobuf v1.36.11 // indirect | ||||||
| gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect | ||||||
|
|
@@ -245,10 +245,10 @@ require ( | |||||
| gopkg.in/yaml.v2 v2.4.0 // indirect | ||||||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||||||
| k8s.io/controller-manager v0.33.2 // indirect | ||||||
| k8s.io/kubectl v0.35.1 // indirect | ||||||
| oras.land/oras-go/v2 v2.6.0 // indirect | ||||||
| sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect | ||||||
| sigs.k8s.io/gateway-api v1.5.0 // indirect | ||||||
| sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect | ||||||
| sigs.k8s.io/kustomize/api v0.21.1 // indirect | ||||||
| sigs.k8s.io/kustomize/kyaml v0.21.1 // indirect | ||||||
|
|
||||||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Preserve deprecated aliases for the renamed
ProbeTypeconstants.These identifiers are exported from
api/v1, so removingProbeTypeFieldCondition/ProbeTypeFieldEqualis a source-breaking change for Go consumers even though the serialized values stay the same.Compatibility-friendly fix
🤖 Prompt for AI Agents