Skip to content

Commit 8618ec8

Browse files
Merge pull request #130079 from yongruilin/compatibility-remove-reset
[compatibility version] Avoid resetting config when adding flags Kubernetes-commit: 076c7b0b657a5df734884aa2015e07b0e04c7781
1 parent 6720141 commit 8618ec8

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
go.opentelemetry.io/otel/trace v1.33.0
2828
go.uber.org/zap v1.27.0
2929
golang.org/x/sys v0.30.0
30-
k8s.io/apimachinery v0.0.0-20250319052758-7e8c77e774c9
30+
k8s.io/apimachinery v0.0.0-20250319092800-e8a77bd768fd
3131
k8s.io/client-go v0.0.0-20250319053412-169f1af1bf07
3232
k8s.io/klog/v2 v2.130.1
3333
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
@@ -79,7 +79,7 @@ require (
7979
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
8080
gopkg.in/inf.v0 v0.9.1 // indirect
8181
gopkg.in/yaml.v3 v3.0.1 // indirect
82-
k8s.io/api v0.0.0-20250319053034-feb95d943ada // indirect
82+
k8s.io/api v0.0.0-20250319173043-fc83166ea9db // indirect
8383
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
8484
sigs.k8s.io/randfill v1.0.0 // indirect
8585
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,10 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
204204
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
205205
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
206206
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
207-
k8s.io/api v0.0.0-20250319053034-feb95d943ada h1:jkgp/vD+5CoL2n17AMKQ3g3ELsKmn+zBDXqwvpPvmXw=
208-
k8s.io/api v0.0.0-20250319053034-feb95d943ada/go.mod h1:MsIjX9SIqRiiwfw1r0s0lMHaMw6jhSX8h4VjblK393I=
209-
k8s.io/apimachinery v0.0.0-20250319052758-7e8c77e774c9 h1:vw/UFDFjwXc5W6nMCOUmIaFX19fkQ720CygFuZOS9jM=
210-
k8s.io/apimachinery v0.0.0-20250319052758-7e8c77e774c9/go.mod h1:D2UW665TVSpInyOuG6C+PMtC1MZheP0KQz65UPQEiI4=
207+
k8s.io/api v0.0.0-20250319173043-fc83166ea9db h1:x+vYK/B3vjbtoBztfSz0rXHiGAMmVgEeqO1HtBGkxuo=
208+
k8s.io/api v0.0.0-20250319173043-fc83166ea9db/go.mod h1:JO0tyTI0qSXXaGVhLdqwfi3RMbS2g9hcYvzBmZP5wVk=
209+
k8s.io/apimachinery v0.0.0-20250319092800-e8a77bd768fd h1:KoXgjwEokLM8o95kMxowg5vp5iQ4v46Kk+zobsqeTgU=
210+
k8s.io/apimachinery v0.0.0-20250319092800-e8a77bd768fd/go.mod h1:D2UW665TVSpInyOuG6C+PMtC1MZheP0KQz65UPQEiI4=
211211
k8s.io/client-go v0.0.0-20250319053412-169f1af1bf07 h1:UmlJkL72Xyrfs30rqXWtVUcjV15AeOggxctLIiKuNsE=
212212
k8s.io/client-go v0.0.0-20250319053412-169f1af1bf07/go.mod h1:a4HxhGqHxxHlQQTrtis+Srk1+UsPuKeUlZtQAYq34bU=
213213
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

0 commit comments

Comments
 (0)