Skip to content

Commit 65c4a35

Browse files
committed
[vendor] drop pinned kube-openapi
no longer need to pin kube-openapi, structured-merge-diff/v6 is fully compatible with k8s 1.34 apimachinery
1 parent 04c3bf3 commit 65c4a35

File tree

14 files changed

+35
-1503
lines changed

14 files changed

+35
-1503
lines changed

go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ 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
1411
)
1512

1613
require (
@@ -157,6 +154,5 @@ require (
157154
sigs.k8s.io/kustomize/api v0.19.0 // indirect
158155
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
159156
sigs.k8s.io/randfill v1.0.0 // indirect
160-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
161157
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
162158
)

go.sum

Lines changed: 30 additions & 192 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)