Skip to content

Commit

Permalink
Merge pull request #123693 from mengqiy/automated-cherry-pick-of-#123…
Browse files Browse the repository at this point in the history
…532-upstream-release-1.29

Automated cherry pick of #123532: Prevent watch cache starvation, by moving its watch to

Kubernetes-commit: b607e4e35cf98d3206d84fef6373d4d168245020
  • Loading branch information
k8s-publishing-bot committed Mar 8, 2024
1 parent b9037e3 commit 1b4c9af
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ require (
google.golang.org/protobuf v1.31.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1
gopkg.in/square/go-jose.v2 v2.6.0
k8s.io/api v0.0.0-20240110173429-a48c0a49b1dc
k8s.io/api v0.0.0-20240209025148-f5eca0431ee2
k8s.io/apimachinery v0.0.0-20240110172605-dc7e034c8647
k8s.io/client-go v0.0.0-20240110175813-baea19d6e81c
k8s.io/component-base v0.0.0-20240110180938-aca7dbbf0e34
k8s.io/component-base v0.0.0-20240209134822-e8f624c76367
k8s.io/klog/v2 v2.110.1
k8s.io/kms v0.0.0-20240110181705-7d9c51ea7c86
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
Expand Down Expand Up @@ -126,9 +126,9 @@ require (
)

replace (
k8s.io/api => k8s.io/api v0.0.0-20240110173429-a48c0a49b1dc
k8s.io/api => k8s.io/api v0.0.0-20240209025148-f5eca0431ee2
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240110172605-dc7e034c8647
k8s.io/client-go => k8s.io/client-go v0.0.0-20240110175813-baea19d6e81c
k8s.io/component-base => k8s.io/component-base v0.0.0-20240110180938-aca7dbbf0e34
k8s.io/component-base => k8s.io/component-base v0.0.0-20240209134822-e8f624c76367
k8s.io/kms => k8s.io/kms v0.0.0-20240110181705-7d9c51ea7c86
)
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -397,14 +397,14 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20240110173429-a48c0a49b1dc h1:z2Ii/wAgmsfREj444+Z0jFzHslm+Ep/M0pxUqonXMkw=
k8s.io/api v0.0.0-20240110173429-a48c0a49b1dc/go.mod h1:JS1rn0RBc46vCh2T2+zcnx+oNtvh+pDndpURdiWnHNc=
k8s.io/api v0.0.0-20240209025148-f5eca0431ee2 h1:SalYyqp9fvQyZ64OIop5pLm+DH7HaHrAVWzy/QqOPTo=
k8s.io/api v0.0.0-20240209025148-f5eca0431ee2/go.mod h1:JS1rn0RBc46vCh2T2+zcnx+oNtvh+pDndpURdiWnHNc=
k8s.io/apimachinery v0.0.0-20240110172605-dc7e034c8647 h1:SfqmT8ezTnkZc9G0t8b4s6+Z6zT/rMKhZm9yQq5wG+U=
k8s.io/apimachinery v0.0.0-20240110172605-dc7e034c8647/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU=
k8s.io/client-go v0.0.0-20240110175813-baea19d6e81c h1:S8iocBcKfLfrC9VQy38QMJeChfF3B5QwJKsNrA9MI0Q=
k8s.io/client-go v0.0.0-20240110175813-baea19d6e81c/go.mod h1:6kNfSLAoK7xQAWeKaZ62IQvDSLEls0B+w4UQJccyOeA=
k8s.io/component-base v0.0.0-20240110180938-aca7dbbf0e34 h1:dGBVEkULEOyERqI12TR5vriGxcFV7jEXeAY3gPebsqI=
k8s.io/component-base v0.0.0-20240110180938-aca7dbbf0e34/go.mod h1:Wt46TJNo8i4c5R2cr11/VAtT2H4FMiUYOPvLDF1VNLI=
k8s.io/component-base v0.0.0-20240209134822-e8f624c76367 h1:Q4SaLmQN3GqolvuSDFCLzleahOH9h0Y7dsxNpq5YDbw=
k8s.io/component-base v0.0.0-20240209134822-e8f624c76367/go.mod h1:s4r3xv/3wbRDAnNz5xknR/iov2c/3lOCAK34CuK2JWE=
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
k8s.io/kms v0.0.0-20240110181705-7d9c51ea7c86 h1:z/xBbZa3arvKiJAZhjeBHPEyZCI5Wa6wKV+6ezOjnro=
Expand Down

0 comments on commit 1b4c9af

Please sign in to comment.