Skip to content

Commit 286f9b0

Browse files
committed
[vendor] pin k8s.io/kube-openapi to d90c4fd18f59
Explicitly pin k8s.io/kube-openapi to a commit prior to the structured-merge-diff v6 migration, ensuring only v4 appears in the graph to remove the v4/v6 type collision inside k8s.io/apimachinery managed fields code.
1 parent f90a4d0 commit 286f9b0

File tree

14 files changed

+523
-1014
lines changed

14 files changed

+523
-1014
lines changed

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ replace (
88
// fix CVE-2025-30204 transitive deps still using older v4. Remove once `go mod graph` shows only 4.5.2 or higher
99
github.com/golang-jwt/jwt/v4 => github.com/golang-jwt/jwt/v4 v4.5.2
1010
github.com/golang-jwt/jwt/v5 => github.com/golang-jwt/jwt/v5 v5.2.2
11+
12+
// pin kube-openapi to pre structured-merge-diff/v6 to resolve apimachinery type mismatch
13+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250628140032-d90c4fd18f59
1114
)
1215

1316
require (
@@ -157,5 +160,4 @@ require (
157160
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
158161
sigs.k8s.io/randfill v1.0.0 // indirect
159162
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
160-
sigs.k8s.io/structured-merge-diff/v6 v6.2.0 // indirect
161163
)

go.sum

Lines changed: 187 additions & 34 deletions
Large diffs are not rendered by default.

vendor/k8s.io/kube-openapi/pkg/schemaconv/openapi.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kube-openapi/pkg/schemaconv/proto_models.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kube-openapi/pkg/schemaconv/smd.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)