Skip to content

Commit 5d18b52

Browse files
Merge pull request #130084 from richabanker/automated-cherry-pick-of-#128430-upstream-release-1.31
Automated cherry pick of #128430: do not install handler for '/metrics/slis' endpoint using sync.Once Kubernetes-commit: f165a1dc466701756eb0c5ca9ad05f58d6086da0
1 parent 17efbda commit 5d18b52

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
@@ -26,7 +26,7 @@ require (
2626
golang.org/x/sys v0.21.0
2727
gopkg.in/yaml.v2 v2.4.0
2828
k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe
29-
k8s.io/client-go v0.0.0-20240801004130-5e3e8ea98fe9
29+
k8s.io/client-go v0.0.0-20250122203833-8eaec8fb352c
3030
k8s.io/klog/v2 v2.130.1
3131
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
3232
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
@@ -76,7 +76,7 @@ require (
7676
google.golang.org/protobuf v1.34.2 // indirect
7777
gopkg.in/inf.v0 v0.9.1 // indirect
7878
gopkg.in/yaml.v3 v3.0.1 // indirect
79-
k8s.io/api v0.0.0-20240801003428-382a0912e579 // indirect
79+
k8s.io/api v0.0.0-20240827081448-46f6230a4e83 // indirect
8080
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
8181
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
8282
sigs.k8s.io/yaml v1.4.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,12 +204,12 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
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-20240801003428-382a0912e579 h1:pElFtnw6/eJb1SLes+tbAqfL/7IezesSZ1bLTO+b2UE=
208-
k8s.io/api v0.0.0-20240801003428-382a0912e579/go.mod h1:sSxNOmsgxkyv9k7Nu9ysVYNCkTkTemOgz4HxbATSKDQ=
207+
k8s.io/api v0.0.0-20240827081448-46f6230a4e83 h1:EHuPy/62w9Llhp491zNknjEuET9oMPQPPSAatwaM2NA=
208+
k8s.io/api v0.0.0-20240827081448-46f6230a4e83/go.mod h1:sSxNOmsgxkyv9k7Nu9ysVYNCkTkTemOgz4HxbATSKDQ=
209209
k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe h1:lt6b7CTEYMgUTCGIZrATyWMZTQThE+qIQq5YTCbpMVQ=
210210
k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
211-
k8s.io/client-go v0.0.0-20240801004130-5e3e8ea98fe9 h1:FtksMSsr8nNBmsSXlqvs3hPE/7BJ5wI/mJYjGypoEtk=
212-
k8s.io/client-go v0.0.0-20240801004130-5e3e8ea98fe9/go.mod h1:2bbCJ3Sd+yFlCoexz86XNKsJ8hBFUVTeHsjEhrODbfE=
211+
k8s.io/client-go v0.0.0-20250122203833-8eaec8fb352c h1:2KWIT9nRYHqRPUnJ7hPiWNRnvZjM29KezMf1jJHmS9w=
212+
k8s.io/client-go v0.0.0-20250122203833-8eaec8fb352c/go.mod h1:Ej+MeavJjLACzTBTUQxDzM/jq+XTcmChX/4PvmdDc9o=
213213
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
214214
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
215215
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=

0 commit comments

Comments
 (0)