Compare commits

...

3 Commits

Author SHA1 Message Date
Kubernetes Publisher
e1112d3f46 Update dependencies to v0.33.0-alpha.2 tag 2025-02-18 20:09:42 +00:00
Kubernetes Publisher
8ab9f14766 Merge pull request #129341 from pohly/log-client-go-watch
client-go watch: context support

Kubernetes-commit: a02fe24385a36f43e96844e19c438cc4097704ef
2025-02-07 13:34:27 +00:00
Patrick Ohly
144c6b454a client-go informers: provide ListWatch *WithContext variants
For compatibility reasons, the old functions without the ctx parameter still
get generated, now with context.Background instead of context.TODO. In practice
that code won't be used by the client-go reflector code because it prefers
the *WithContext functions, but it cannot be ruled out that some other code
only supports the old fields.

Kubernetes-commit: 8cc74e8a266e1042be1c60adfa3091852036f48a
2024-12-09 16:04:52 +01:00
3 changed files with 26 additions and 14 deletions

8
go.mod
View File

@@ -10,10 +10,10 @@ godebug winsymlink=0
require (
golang.org/x/time v0.7.0
k8s.io/api v0.0.0-20250117201903-3bed2589d43a
k8s.io/apimachinery v0.0.0-20250117041610-45d29dc4d66f
k8s.io/client-go v0.0.0-20250122202702-3617101e66f4
k8s.io/code-generator v0.0.0-20250122204510-e7e5741e3a3e
k8s.io/api v0.33.0-alpha.2
k8s.io/apimachinery v0.33.0-alpha.2
k8s.io/client-go v0.33.0-alpha.2
k8s.io/code-generator v0.33.0-alpha.2
k8s.io/klog/v2 v2.130.1
)

16
go.sum
View File

@@ -138,14 +138,14 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
k8s.io/api v0.0.0-20250117201903-3bed2589d43a h1:U5ELuHIj+ewCrRs1t07FA4dqy6VOUAgUwBoC05dRcwQ=
k8s.io/api v0.0.0-20250117201903-3bed2589d43a/go.mod h1:YGB38orWxSXzMXdSPGWLOwrcumsaTbYPKy3dnT0HbRs=
k8s.io/apimachinery v0.0.0-20250117041610-45d29dc4d66f h1:kdbiV3iKvyIwzB+22TrgOu/F7Tkl3xTFpburE5oKTHU=
k8s.io/apimachinery v0.0.0-20250117041610-45d29dc4d66f/go.mod h1:h8DnJz4KNjkQsP8iFir+s3sSBEK3Iy43bfB2gFjSR+A=
k8s.io/client-go v0.0.0-20250122202702-3617101e66f4 h1:xEqcyaLRJMnWmMRy1yVsW4of/JrSxFROJMg9V66ZyWE=
k8s.io/client-go v0.0.0-20250122202702-3617101e66f4/go.mod h1:G8sOEVwZqHVpyrVUYvWytjfcjz2Ws2OHUy4I2vxxU4Q=
k8s.io/code-generator v0.0.0-20250122204510-e7e5741e3a3e h1:H92t33xtke3PDA7mX4ptU2RbBCutE0wRPIj8BA2V6Gs=
k8s.io/code-generator v0.0.0-20250122204510-e7e5741e3a3e/go.mod h1:2Jft/f/DzlqotKMWVJZ18CvpxKZzxiUVxxiFEcKggLs=
k8s.io/api v0.33.0-alpha.2 h1:0EhG38vbUqxIFLdNoyWi7vpoWfIqypz+kYOesOS0seg=
k8s.io/api v0.33.0-alpha.2/go.mod h1:xqTmcffjYs340Ds0pke7EM5Ed8tWU6mRXHdGu78XXps=
k8s.io/apimachinery v0.33.0-alpha.2 h1:DygfxErwn1BHm5ACt87l3YhlX7rKyRg3QOgrkdNGa7o=
k8s.io/apimachinery v0.33.0-alpha.2/go.mod h1:pvurfgWU15pkR11HFlMI9tdxY59XU+Wzo22Rx2iSD+g=
k8s.io/client-go v0.33.0-alpha.2 h1:iFmpko03B4j5wfkzQZbxiC+pMeHIKpiTL6U97B6b7Wg=
k8s.io/client-go v0.33.0-alpha.2/go.mod h1:zOG/aYwfl4yULRRV7xXJQ0kJZ5BRfT9uxHneAB3/Jvw=
k8s.io/code-generator v0.33.0-alpha.2 h1:Z6hvtFnW/hH6Qk4sK3S+PZv4qCdjwp39Y4Nr1ixzVZU=
k8s.io/code-generator v0.33.0-alpha.2/go.mod h1:0YEqUsi2NXovjqegsiU6gTMKQI+6gtklGfdWyS5d+PM=
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4=
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

View File

@@ -62,13 +62,25 @@ func NewFilteredFooInformer(client versioned.Interface, namespace string, resync
if tweakListOptions != nil {
tweakListOptions(&options)
}
return client.SamplecontrollerV1alpha1().Foos(namespace).List(context.TODO(), options)
return client.SamplecontrollerV1alpha1().Foos(namespace).List(context.Background(), options)
},
WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil {
tweakListOptions(&options)
}
return client.SamplecontrollerV1alpha1().Foos(namespace).Watch(context.TODO(), options)
return client.SamplecontrollerV1alpha1().Foos(namespace).Watch(context.Background(), options)
},
ListWithContextFunc: func(ctx context.Context, options v1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil {
tweakListOptions(&options)
}
return client.SamplecontrollerV1alpha1().Foos(namespace).List(ctx, options)
},
WatchFuncWithContext: func(ctx context.Context, options v1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil {
tweakListOptions(&options)
}
return client.SamplecontrollerV1alpha1().Foos(namespace).Watch(ctx, options)
},
},
&apissamplecontrollerv1alpha1.Foo{},