Skip to content

Commit d745a63

Browse files
Merge pull request #136355 from enj/enj/i/tls_cache_gc
Add GC to client-go TLS cache Kubernetes-commit: bf1abbf2e987883ffacaaf6f84218bcbfd444876
2 parents c2576b4 + f5a19ce commit d745a63

3 files changed

Lines changed: 11 additions & 20 deletions

File tree

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ require (
4848
gopkg.in/evanphx/json-patch.v4 v4.13.0
4949
gopkg.in/go-jose/go-jose.v2 v2.6.3
5050
gopkg.in/natefinch/lumberjack.v2 v2.2.1
51-
k8s.io/api v0.0.0-20260318195839-1ee4dbfb376b
51+
k8s.io/api v0.0.0-20260318235847-50328df638da
5252
k8s.io/apimachinery v0.0.0-20260318195418-729062d58854
53-
k8s.io/client-go v0.0.0-20260318200515-2fb6b9cac00d
54-
k8s.io/component-base v0.0.0-20260318202210-7dbe9af30685
53+
k8s.io/client-go v0.0.0-20260319042609-9b29e67df10f
54+
k8s.io/component-base v0.0.0-20260319050627-1cffdcd67621
5555
k8s.io/klog/v2 v2.140.0
5656
k8s.io/kms v0.0.0-20260306083908-2d26e8225029
5757
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -285,14 +285,14 @@ gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYs
285285
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
286286
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
287287
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
288-
k8s.io/api v0.0.0-20260318195839-1ee4dbfb376b h1:vJ68uqHpPb2e0gBRYOYD1iKivPg5rq9ERpcClN5tbb4=
289-
k8s.io/api v0.0.0-20260318195839-1ee4dbfb376b/go.mod h1:Me8XWRAAY/34t+2YTLQeaWCLaH9DHxkNCTqVHMwo3lg=
288+
k8s.io/api v0.0.0-20260318235847-50328df638da h1:+OhUIVeMDF6qQp4PDPxIr/UYNKjbekhGfmM+wDDJvzU=
289+
k8s.io/api v0.0.0-20260318235847-50328df638da/go.mod h1:Me8XWRAAY/34t+2YTLQeaWCLaH9DHxkNCTqVHMwo3lg=
290290
k8s.io/apimachinery v0.0.0-20260318195418-729062d58854 h1:iuI2iZc7u7hgHcDS8SzYRurcIo3ltRh4MnFkCTYmV2c=
291291
k8s.io/apimachinery v0.0.0-20260318195418-729062d58854/go.mod h1:Fjag9BypDOzB4sV3iuZaNeDsRkf89asmbm8aWLerfeU=
292-
k8s.io/client-go v0.0.0-20260318200515-2fb6b9cac00d h1:wv5Exy6raJKPU7z/RTL1YdmG9NwPUK278bVoKBHSqPM=
293-
k8s.io/client-go v0.0.0-20260318200515-2fb6b9cac00d/go.mod h1:mf77bUzodHL0yca+gF00nbK520hrX7O6P8U/SN9re7Y=
294-
k8s.io/component-base v0.0.0-20260318202210-7dbe9af30685 h1:4W9YaIVCx1y/6wmKZqi14aWAzK5X80W1krDyGdpF8gI=
295-
k8s.io/component-base v0.0.0-20260318202210-7dbe9af30685/go.mod h1:KTVK0cWIXbzPc5TVe5Sn8aGIgy1KIjjXSdFf+Xg17Zk=
292+
k8s.io/client-go v0.0.0-20260319042609-9b29e67df10f h1:4AJVgnvHYJhk0SBrJm++aUv/QMPVyXuTdAsso7iJrpc=
293+
k8s.io/client-go v0.0.0-20260319042609-9b29e67df10f/go.mod h1:wGuxJ0LXrOufGvuN0eT+RQEDRc+iVvgkZhRlD5EEAqY=
294+
k8s.io/component-base v0.0.0-20260319050627-1cffdcd67621 h1:5JzqQMpbtnpwHvT7EUljki7GOZGaw3PE723mJemUgzs=
295+
k8s.io/component-base v0.0.0-20260319050627-1cffdcd67621/go.mod h1:GUragzpgqSsR/1oQoW1XUDoTUC+6QwsVyDvacoiP0j0=
296296
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
297297
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
298298
k8s.io/kms v0.0.0-20260306083908-2d26e8225029 h1:ecgsDBcUtfTizBHfJ311Ag6xXvLmdn3sFwW0tN6gV40=

pkg/util/proxy/streamtranslator_test.go

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -971,20 +971,11 @@ func v4WriteStatusFunc(stream io.Writer) func(status *apierrors.StatusError) err
971971
}
972972
}
973973

974-
func fakeTransport() (*http.Transport, error) {
974+
func fakeTransport() (http.RoundTripper, error) {
975975
cfg := &transport.Config{
976976
TLS: transport.TLSConfig{
977977
Insecure: true,
978-
CAFile: "",
979978
},
980979
}
981-
rt, err := transport.New(cfg)
982-
if err != nil {
983-
return nil, err
984-
}
985-
t, ok := rt.(*http.Transport)
986-
if !ok {
987-
return nil, fmt.Errorf("unknown transport type: %T", rt)
988-
}
989-
return t, nil
980+
return transport.New(cfg)
990981
}

0 commit comments

Comments
 (0)