From b136e9eb2b56038b3d93d89da42a7345c1d47fa6 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Mon, 27 Jan 2020 18:19:44 -0800 Subject: [PATCH] refactor Kubernetes-commit: d55d6175f8e2cfdab0b79aac72046a652c2eb515 --- discovery/discovery_client.go | 13 +++++++------ dynamic/simple.go | 19 ++++++++++--------- .../v1/tokenreview_expansion.go | 2 +- .../v1beta1/tokenreview_expansion.go | 2 +- .../v1/localsubjectaccessreview_expansion.go | 2 +- .../v1/selfsubjectaccessreview_expansion.go | 2 +- .../v1/selfsubjectrulesreview_expansion.go | 2 +- .../v1/subjectaccessreview_expansion.go | 2 +- .../localsubjectaccessreview_expansion.go | 2 +- .../selfsubjectaccessreview_expansion.go | 2 +- .../selfsubjectrulesreview_expansion.go | 2 +- .../v1beta1/subjectaccessreview_expansion.go | 2 +- .../certificatesigningrequest_expansion.go | 4 +++- kubernetes/typed/core/v1/event_expansion.go | 9 +++++---- .../typed/core/v1/namespace_expansion.go | 8 ++++++-- kubernetes/typed/core/v1/node_expansion.go | 6 ++++-- kubernetes/typed/core/v1/pod_expansion.go | 8 +++++--- .../typed/core/v1/serviceaccount_expansion.go | 4 +++- .../typed/events/v1beta1/event_expansion.go | 7 ++++--- .../v1beta1/deployment_expansion.go | 8 ++++++-- .../policy/v1beta1/eviction_expansion.go | 4 +++- metadata/metadata.go | 13 +++++++------ scale/client.go | 7 ++++--- tools/cache/listwatch.go | 6 ++++-- 24 files changed, 81 insertions(+), 55 deletions(-) diff --git a/discovery/discovery_client.go b/discovery/discovery_client.go index 5d89457c..dc12f9a2 100644 --- a/discovery/discovery_client.go +++ b/discovery/discovery_client.go @@ -17,6 +17,7 @@ limitations under the License. package discovery import ( + "context" "encoding/json" "fmt" "net/url" @@ -155,7 +156,7 @@ func apiVersionsToAPIGroup(apiVersions *metav1.APIVersions) (apiGroup metav1.API func (d *DiscoveryClient) ServerGroups() (apiGroupList *metav1.APIGroupList, err error) { // Get the groupVersions exposed at /api v := &metav1.APIVersions{} - err = d.restClient.Get().AbsPath(d.LegacyPrefix).Do().Into(v) + err = d.restClient.Get().AbsPath(d.LegacyPrefix).Do(context.TODO()).Into(v) apiGroup := metav1.APIGroup{} if err == nil && len(v.Versions) != 0 { apiGroup = apiVersionsToAPIGroup(v) @@ -166,7 +167,7 @@ func (d *DiscoveryClient) ServerGroups() (apiGroupList *metav1.APIGroupList, err // Get the groupVersions exposed at /apis apiGroupList = &metav1.APIGroupList{} - err = d.restClient.Get().AbsPath("/apis").Do().Into(apiGroupList) + err = d.restClient.Get().AbsPath("/apis").Do(context.TODO()).Into(apiGroupList) if err != nil && !errors.IsNotFound(err) && !errors.IsForbidden(err) { return nil, err } @@ -196,7 +197,7 @@ func (d *DiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (r resources = &metav1.APIResourceList{ GroupVersion: groupVersion, } - err = d.restClient.Get().AbsPath(url.String()).Do().Into(resources) + err = d.restClient.Get().AbsPath(url.String()).Do(context.TODO()).Into(resources) if err != nil { // ignore 403 or 404 error to be compatible with an v1.0 server. if groupVersion == "v1" && (errors.IsNotFound(err) || errors.IsForbidden(err)) { @@ -405,7 +406,7 @@ func ServerPreferredNamespacedResources(d DiscoveryInterface) ([]*metav1.APIReso // ServerVersion retrieves and parses the server's version (git version). func (d *DiscoveryClient) ServerVersion() (*version.Info, error) { - body, err := d.restClient.Get().AbsPath("/version").Do().Raw() + body, err := d.restClient.Get().AbsPath("/version").Do(context.TODO()).Raw() if err != nil { return nil, err } @@ -419,12 +420,12 @@ func (d *DiscoveryClient) ServerVersion() (*version.Info, error) { // OpenAPISchema fetches the open api schema using a rest client and parses the proto. func (d *DiscoveryClient) OpenAPISchema() (*openapi_v2.Document, error) { - data, err := d.restClient.Get().AbsPath("/openapi/v2").SetHeader("Accept", mimePb).Do().Raw() + data, err := d.restClient.Get().AbsPath("/openapi/v2").SetHeader("Accept", mimePb).Do(context.TODO()).Raw() if err != nil { if errors.IsForbidden(err) || errors.IsNotFound(err) || errors.IsNotAcceptable(err) { // single endpoint not found/registered in old server, try to fetch old endpoint // TODO: remove this when kubectl/client-go don't work with 1.9 server - data, err = d.restClient.Get().AbsPath("/swagger-2.0.0.pb-v1").Do().Raw() + data, err = d.restClient.Get().AbsPath("/swagger-2.0.0.pb-v1").Do(context.TODO()).Raw() if err != nil { return nil, err } diff --git a/dynamic/simple.go b/dynamic/simple.go index 8a026788..d61504b9 100644 --- a/dynamic/simple.go +++ b/dynamic/simple.go @@ -17,6 +17,7 @@ limitations under the License. package dynamic import ( + "context" "fmt" "k8s.io/apimachinery/pkg/api/meta" @@ -111,7 +112,7 @@ func (c *dynamicResourceClient) Create(obj *unstructured.Unstructured, opts meta AbsPath(append(c.makeURLSegments(name), subresources...)...). Body(outBytes). SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1). - Do() + Do(context.TODO()) if err := result.Error(); err != nil { return nil, err } @@ -146,7 +147,7 @@ func (c *dynamicResourceClient) Update(obj *unstructured.Unstructured, opts meta AbsPath(append(c.makeURLSegments(name), subresources...)...). Body(outBytes). SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1). - Do() + Do(context.TODO()) if err := result.Error(); err != nil { return nil, err } @@ -182,7 +183,7 @@ func (c *dynamicResourceClient) UpdateStatus(obj *unstructured.Unstructured, opt AbsPath(append(c.makeURLSegments(name), "status")...). Body(outBytes). SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1). - Do() + Do(context.TODO()) if err := result.Error(); err != nil { return nil, err } @@ -214,7 +215,7 @@ func (c *dynamicResourceClient) Delete(name string, opts *metav1.DeleteOptions, Delete(). AbsPath(append(c.makeURLSegments(name), subresources...)...). Body(deleteOptionsByte). - Do() + Do(context.TODO()) return result.Error() } @@ -232,7 +233,7 @@ func (c *dynamicResourceClient) DeleteCollection(opts *metav1.DeleteOptions, lis AbsPath(c.makeURLSegments("")...). Body(deleteOptionsByte). SpecificallyVersionedParams(&listOptions, dynamicParameterCodec, versionV1). - Do() + Do(context.TODO()) return result.Error() } @@ -240,7 +241,7 @@ func (c *dynamicResourceClient) Get(name string, opts metav1.GetOptions, subreso if len(name) == 0 { return nil, fmt.Errorf("name is required") } - result := c.client.client.Get().AbsPath(append(c.makeURLSegments(name), subresources...)...).SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1).Do() + result := c.client.client.Get().AbsPath(append(c.makeURLSegments(name), subresources...)...).SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1).Do(context.TODO()) if err := result.Error(); err != nil { return nil, err } @@ -256,7 +257,7 @@ func (c *dynamicResourceClient) Get(name string, opts metav1.GetOptions, subreso } func (c *dynamicResourceClient) List(opts metav1.ListOptions) (*unstructured.UnstructuredList, error) { - result := c.client.client.Get().AbsPath(c.makeURLSegments("")...).SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1).Do() + result := c.client.client.Get().AbsPath(c.makeURLSegments("")...).SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1).Do(context.TODO()) if err := result.Error(); err != nil { return nil, err } @@ -283,7 +284,7 @@ func (c *dynamicResourceClient) Watch(opts metav1.ListOptions) (watch.Interface, opts.Watch = true return c.client.client.Get().AbsPath(c.makeURLSegments("")...). SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1). - Watch() + Watch(context.TODO()) } func (c *dynamicResourceClient) Patch(name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (*unstructured.Unstructured, error) { @@ -295,7 +296,7 @@ func (c *dynamicResourceClient) Patch(name string, pt types.PatchType, data []by AbsPath(append(c.makeURLSegments(name), subresources...)...). Body(data). SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1). - Do() + Do(context.TODO()) if err := result.Error(); err != nil { return nil, err } diff --git a/kubernetes/typed/authentication/v1/tokenreview_expansion.go b/kubernetes/typed/authentication/v1/tokenreview_expansion.go index 8a21b7c7..3f6d39a3 100644 --- a/kubernetes/typed/authentication/v1/tokenreview_expansion.go +++ b/kubernetes/typed/authentication/v1/tokenreview_expansion.go @@ -37,7 +37,7 @@ func (c *tokenReviews) CreateContext(ctx context.Context, tokenReview *authentic Context(ctx). Resource("tokenreviews"). Body(tokenReview). - Do(). + Do(context.TODO()). Into(result) return } diff --git a/kubernetes/typed/authentication/v1beta1/tokenreview_expansion.go b/kubernetes/typed/authentication/v1beta1/tokenreview_expansion.go index 0476b173..0a45799e 100644 --- a/kubernetes/typed/authentication/v1beta1/tokenreview_expansion.go +++ b/kubernetes/typed/authentication/v1beta1/tokenreview_expansion.go @@ -37,7 +37,7 @@ func (c *tokenReviews) CreateContext(ctx context.Context, tokenReview *authentic Context(ctx). Resource("tokenreviews"). Body(tokenReview). - Do(). + Do(context.TODO()). Into(result) return } diff --git a/kubernetes/typed/authorization/v1/localsubjectaccessreview_expansion.go b/kubernetes/typed/authorization/v1/localsubjectaccessreview_expansion.go index 9836308b..9b8cb28d 100644 --- a/kubernetes/typed/authorization/v1/localsubjectaccessreview_expansion.go +++ b/kubernetes/typed/authorization/v1/localsubjectaccessreview_expansion.go @@ -38,7 +38,7 @@ func (c *localSubjectAccessReviews) CreateContext(ctx context.Context, sar *auth Namespace(c.ns). Resource("localsubjectaccessreviews"). Body(sar). - Do(). + Do(context.TODO()). Into(result) return } diff --git a/kubernetes/typed/authorization/v1/selfsubjectaccessreview_expansion.go b/kubernetes/typed/authorization/v1/selfsubjectaccessreview_expansion.go index 916e5b43..74cb2d4a 100644 --- a/kubernetes/typed/authorization/v1/selfsubjectaccessreview_expansion.go +++ b/kubernetes/typed/authorization/v1/selfsubjectaccessreview_expansion.go @@ -37,7 +37,7 @@ func (c *selfSubjectAccessReviews) CreateContext(ctx context.Context, sar *autho Context(ctx). Resource("selfsubjectaccessreviews"). Body(sar). - Do(). + Do(context.TODO()). Into(result) return } diff --git a/kubernetes/typed/authorization/v1/selfsubjectrulesreview_expansion.go b/kubernetes/typed/authorization/v1/selfsubjectrulesreview_expansion.go index 365282ed..4b09b1d6 100644 --- a/kubernetes/typed/authorization/v1/selfsubjectrulesreview_expansion.go +++ b/kubernetes/typed/authorization/v1/selfsubjectrulesreview_expansion.go @@ -37,7 +37,7 @@ func (c *selfSubjectRulesReviews) CreateContext(ctx context.Context, srr *author Context(ctx). Resource("selfsubjectrulesreviews"). Body(srr). - Do(). + Do(context.TODO()). Into(result) return } diff --git a/kubernetes/typed/authorization/v1/subjectaccessreview_expansion.go b/kubernetes/typed/authorization/v1/subjectaccessreview_expansion.go index 927544f1..1e55b880 100644 --- a/kubernetes/typed/authorization/v1/subjectaccessreview_expansion.go +++ b/kubernetes/typed/authorization/v1/subjectaccessreview_expansion.go @@ -38,7 +38,7 @@ func (c *subjectAccessReviews) CreateContext(ctx context.Context, sar *authoriza Context(ctx). Resource("subjectaccessreviews"). Body(sar). - Do(). + Do(context.TODO()). Into(result) return } diff --git a/kubernetes/typed/authorization/v1beta1/localsubjectaccessreview_expansion.go b/kubernetes/typed/authorization/v1beta1/localsubjectaccessreview_expansion.go index 148cf628..9c74505b 100644 --- a/kubernetes/typed/authorization/v1beta1/localsubjectaccessreview_expansion.go +++ b/kubernetes/typed/authorization/v1beta1/localsubjectaccessreview_expansion.go @@ -38,7 +38,7 @@ func (c *localSubjectAccessReviews) CreateContext(ctx context.Context, sar *auth Namespace(c.ns). Resource("localsubjectaccessreviews"). Body(sar). - Do(). + Do(context.TODO()). Into(result) return } diff --git a/kubernetes/typed/authorization/v1beta1/selfsubjectaccessreview_expansion.go b/kubernetes/typed/authorization/v1beta1/selfsubjectaccessreview_expansion.go index 6edead0e..5c4b3611 100644 --- a/kubernetes/typed/authorization/v1beta1/selfsubjectaccessreview_expansion.go +++ b/kubernetes/typed/authorization/v1beta1/selfsubjectaccessreview_expansion.go @@ -37,7 +37,7 @@ func (c *selfSubjectAccessReviews) CreateContext(ctx context.Context, sar *autho Context(ctx). Resource("selfsubjectaccessreviews"). Body(sar). - Do(). + Do(context.TODO()). Into(result) return } diff --git a/kubernetes/typed/authorization/v1beta1/selfsubjectrulesreview_expansion.go b/kubernetes/typed/authorization/v1beta1/selfsubjectrulesreview_expansion.go index a459d5c3..a8d3a41d 100644 --- a/kubernetes/typed/authorization/v1beta1/selfsubjectrulesreview_expansion.go +++ b/kubernetes/typed/authorization/v1beta1/selfsubjectrulesreview_expansion.go @@ -37,7 +37,7 @@ func (c *selfSubjectRulesReviews) CreateContext(ctx context.Context, srr *author Context(ctx). Resource("selfsubjectrulesreviews"). Body(srr). - Do(). + Do(context.TODO()). Into(result) return } diff --git a/kubernetes/typed/authorization/v1beta1/subjectaccessreview_expansion.go b/kubernetes/typed/authorization/v1beta1/subjectaccessreview_expansion.go index 7072e29c..69d7b739 100644 --- a/kubernetes/typed/authorization/v1beta1/subjectaccessreview_expansion.go +++ b/kubernetes/typed/authorization/v1beta1/subjectaccessreview_expansion.go @@ -38,7 +38,7 @@ func (c *subjectAccessReviews) CreateContext(ctx context.Context, sar *authoriza Context(ctx). Resource("subjectaccessreviews"). Body(sar). - Do(). + Do(context.TODO()). Into(result) return } diff --git a/kubernetes/typed/certificates/v1beta1/certificatesigningrequest_expansion.go b/kubernetes/typed/certificates/v1beta1/certificatesigningrequest_expansion.go index c63b8063..dd954bb1 100644 --- a/kubernetes/typed/certificates/v1beta1/certificatesigningrequest_expansion.go +++ b/kubernetes/typed/certificates/v1beta1/certificatesigningrequest_expansion.go @@ -17,6 +17,8 @@ limitations under the License. package v1beta1 import ( + "context" + certificates "k8s.io/api/certificates/v1beta1" ) @@ -31,7 +33,7 @@ func (c *certificateSigningRequests) UpdateApproval(certificateSigningRequest *c Name(certificateSigningRequest.Name). Body(certificateSigningRequest). SubResource("approval"). - Do(). + Do(context.TODO()). Into(result) return } diff --git a/kubernetes/typed/core/v1/event_expansion.go b/kubernetes/typed/core/v1/event_expansion.go index 5a82afa4..7377ef5d 100644 --- a/kubernetes/typed/core/v1/event_expansion.go +++ b/kubernetes/typed/core/v1/event_expansion.go @@ -17,9 +17,10 @@ limitations under the License. package v1 import ( + "context" "fmt" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/runtime" @@ -54,7 +55,7 @@ func (e *events) CreateWithEventNamespace(event *v1.Event) (*v1.Event, error) { NamespaceIfScoped(event.Namespace, len(event.Namespace) > 0). Resource("events"). Body(event). - Do(). + Do(context.TODO()). Into(result) return result, err } @@ -71,7 +72,7 @@ func (e *events) UpdateWithEventNamespace(event *v1.Event) (*v1.Event, error) { Resource("events"). Name(event.Name). Body(event). - Do(). + Do(context.TODO()). Into(result) return result, err } @@ -91,7 +92,7 @@ func (e *events) PatchWithEventNamespace(incompleteEvent *v1.Event, data []byte) Resource("events"). Name(incompleteEvent.Name). Body(data). - Do(). + Do(context.TODO()). Into(result) return result, err } diff --git a/kubernetes/typed/core/v1/namespace_expansion.go b/kubernetes/typed/core/v1/namespace_expansion.go index 17effe29..63482ace 100644 --- a/kubernetes/typed/core/v1/namespace_expansion.go +++ b/kubernetes/typed/core/v1/namespace_expansion.go @@ -16,7 +16,11 @@ limitations under the License. package v1 -import "k8s.io/api/core/v1" +import ( + "context" + + v1 "k8s.io/api/core/v1" +) // The NamespaceExpansion interface allows manually adding extra methods to the NamespaceInterface. type NamespaceExpansion interface { @@ -26,6 +30,6 @@ type NamespaceExpansion interface { // Finalize takes the representation of a namespace to update. Returns the server's representation of the namespace, and an error, if it occurs. func (c *namespaces) Finalize(namespace *v1.Namespace) (result *v1.Namespace, err error) { result = &v1.Namespace{} - err = c.client.Put().Resource("namespaces").Name(namespace.Name).SubResource("finalize").Body(namespace).Do().Into(result) + err = c.client.Put().Resource("namespaces").Name(namespace.Name).SubResource("finalize").Body(namespace).Do(context.TODO()).Into(result) return } diff --git a/kubernetes/typed/core/v1/node_expansion.go b/kubernetes/typed/core/v1/node_expansion.go index 5db29c3f..1df46ed5 100644 --- a/kubernetes/typed/core/v1/node_expansion.go +++ b/kubernetes/typed/core/v1/node_expansion.go @@ -17,7 +17,9 @@ limitations under the License. package v1 import ( - "k8s.io/api/core/v1" + "context" + + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" ) @@ -37,7 +39,7 @@ func (c *nodes) PatchStatus(nodeName string, data []byte) (*v1.Node, error) { Name(nodeName). SubResource("status"). Body(data). - Do(). + Do(context.TODO()). Into(result) return result, err } diff --git a/kubernetes/typed/core/v1/pod_expansion.go b/kubernetes/typed/core/v1/pod_expansion.go index ed876be8..e385adf5 100644 --- a/kubernetes/typed/core/v1/pod_expansion.go +++ b/kubernetes/typed/core/v1/pod_expansion.go @@ -17,7 +17,9 @@ limitations under the License. package v1 import ( - "k8s.io/api/core/v1" + "context" + + v1 "k8s.io/api/core/v1" policy "k8s.io/api/policy/v1beta1" "k8s.io/client-go/kubernetes/scheme" restclient "k8s.io/client-go/rest" @@ -32,11 +34,11 @@ type PodExpansion interface { // Bind applies the provided binding to the named pod in the current namespace (binding.Namespace is ignored). func (c *pods) Bind(binding *v1.Binding) error { - return c.client.Post().Namespace(c.ns).Resource("pods").Name(binding.Name).SubResource("binding").Body(binding).Do().Error() + return c.client.Post().Namespace(c.ns).Resource("pods").Name(binding.Name).SubResource("binding").Body(binding).Do(context.TODO()).Error() } func (c *pods) Evict(eviction *policy.Eviction) error { - return c.client.Post().Namespace(c.ns).Resource("pods").Name(eviction.Name).SubResource("eviction").Body(eviction).Do().Error() + return c.client.Post().Namespace(c.ns).Resource("pods").Name(eviction.Name).SubResource("eviction").Body(eviction).Do(context.TODO()).Error() } // Get constructs a request for getting the logs for a pod diff --git a/kubernetes/typed/core/v1/serviceaccount_expansion.go b/kubernetes/typed/core/v1/serviceaccount_expansion.go index eaf643f1..956a9878 100644 --- a/kubernetes/typed/core/v1/serviceaccount_expansion.go +++ b/kubernetes/typed/core/v1/serviceaccount_expansion.go @@ -17,6 +17,8 @@ limitations under the License. package v1 import ( + "context" + authenticationv1 "k8s.io/api/authentication/v1" ) @@ -35,7 +37,7 @@ func (c *serviceAccounts) CreateToken(name string, tr *authenticationv1.TokenReq SubResource("token"). Name(name). Body(tr). - Do(). + Do(context.TODO()). Into(result) return result, err } diff --git a/kubernetes/typed/events/v1beta1/event_expansion.go b/kubernetes/typed/events/v1beta1/event_expansion.go index 312ee428..e0ae41df 100644 --- a/kubernetes/typed/events/v1beta1/event_expansion.go +++ b/kubernetes/typed/events/v1beta1/event_expansion.go @@ -17,6 +17,7 @@ limitations under the License. package v1beta1 import ( + "context" "fmt" "k8s.io/api/events/v1beta1" @@ -51,7 +52,7 @@ func (e *events) CreateWithEventNamespace(event *v1beta1.Event) (*v1beta1.Event, NamespaceIfScoped(event.Namespace, len(event.Namespace) > 0). Resource("events"). Body(event). - Do(). + Do(context.TODO()). Into(result) return result, err } @@ -72,7 +73,7 @@ func (e *events) UpdateWithEventNamespace(event *v1beta1.Event) (*v1beta1.Event, Resource("events"). Name(event.Name). Body(event). - Do(). + Do(context.TODO()). Into(result) return result, err } @@ -92,7 +93,7 @@ func (e *events) PatchWithEventNamespace(event *v1beta1.Event, data []byte) (*v1 Resource("events"). Name(event.Name). Body(data). - Do(). + Do(context.TODO()). Into(result) return result, err } diff --git a/kubernetes/typed/extensions/v1beta1/deployment_expansion.go b/kubernetes/typed/extensions/v1beta1/deployment_expansion.go index 24734be6..1b3df8c0 100644 --- a/kubernetes/typed/extensions/v1beta1/deployment_expansion.go +++ b/kubernetes/typed/extensions/v1beta1/deployment_expansion.go @@ -16,7 +16,11 @@ limitations under the License. package v1beta1 -import "k8s.io/api/extensions/v1beta1" +import ( + "context" + + "k8s.io/api/extensions/v1beta1" +) // The DeploymentExpansion interface allows manually adding extra methods to the DeploymentInterface. type DeploymentExpansion interface { @@ -25,5 +29,5 @@ type DeploymentExpansion interface { // Rollback applied the provided DeploymentRollback to the named deployment in the current namespace. func (c *deployments) Rollback(deploymentRollback *v1beta1.DeploymentRollback) error { - return c.client.Post().Namespace(c.ns).Resource("deployments").Name(deploymentRollback.Name).SubResource("rollback").Body(deploymentRollback).Do().Error() + return c.client.Post().Namespace(c.ns).Resource("deployments").Name(deploymentRollback.Name).SubResource("rollback").Body(deploymentRollback).Do(context.TODO()).Error() } diff --git a/kubernetes/typed/policy/v1beta1/eviction_expansion.go b/kubernetes/typed/policy/v1beta1/eviction_expansion.go index 40bad265..9fd2eb8f 100644 --- a/kubernetes/typed/policy/v1beta1/eviction_expansion.go +++ b/kubernetes/typed/policy/v1beta1/eviction_expansion.go @@ -17,6 +17,8 @@ limitations under the License. package v1beta1 import ( + "context" + policy "k8s.io/api/policy/v1beta1" ) @@ -33,6 +35,6 @@ func (c *evictions) Evict(eviction *policy.Eviction) error { Name(eviction.Name). SubResource("eviction"). Body(eviction). - Do(). + Do(context.TODO()). Error() } diff --git a/metadata/metadata.go b/metadata/metadata.go index a94fe7a4..55cce295 100644 --- a/metadata/metadata.go +++ b/metadata/metadata.go @@ -17,6 +17,7 @@ limitations under the License. package metadata import ( + "context" "encoding/json" "fmt" "time" @@ -135,7 +136,7 @@ func (c *client) Delete(name string, opts *metav1.DeleteOptions, subresources .. Delete(). AbsPath(append(c.makeURLSegments(name), subresources...)...). Body(deleteOptionsByte). - Do() + Do(context.TODO()) return result.Error() } @@ -154,7 +155,7 @@ func (c *client) DeleteCollection(opts *metav1.DeleteOptions, listOptions metav1 AbsPath(c.makeURLSegments("")...). Body(deleteOptionsByte). SpecificallyVersionedParams(&listOptions, dynamicParameterCodec, versionV1). - Do() + Do(context.TODO()) return result.Error() } @@ -166,7 +167,7 @@ func (c *client) Get(name string, opts metav1.GetOptions, subresources ...string result := c.client.client.Get().AbsPath(append(c.makeURLSegments(name), subresources...)...). SetHeader("Accept", "application/vnd.kubernetes.protobuf;as=PartialObjectMetadata;g=meta.k8s.io;v=v1,application/json;as=PartialObjectMetadata;g=meta.k8s.io;v=v1,application/json"). SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1). - Do() + Do(context.TODO()) if err := result.Error(); err != nil { return nil, err } @@ -202,7 +203,7 @@ func (c *client) List(opts metav1.ListOptions) (*metav1.PartialObjectMetadataLis result := c.client.client.Get().AbsPath(c.makeURLSegments("")...). SetHeader("Accept", "application/vnd.kubernetes.protobuf;as=PartialObjectMetadataList;g=meta.k8s.io;v=v1,application/json;as=PartialObjectMetadataList;g=meta.k8s.io;v=v1,application/json"). SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1). - Do() + Do(context.TODO()) if err := result.Error(); err != nil { return nil, err } @@ -242,7 +243,7 @@ func (c *client) Watch(opts metav1.ListOptions) (watch.Interface, error) { SetHeader("Accept", "application/vnd.kubernetes.protobuf;as=PartialObjectMetadata;g=meta.k8s.io;v=v1,application/json;as=PartialObjectMetadata;g=meta.k8s.io;v=v1,application/json"). SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1). Timeout(timeout). - Watch() + Watch(context.TODO()) } // Patch modifies the named resource in the specified scope (namespace or cluster). @@ -256,7 +257,7 @@ func (c *client) Patch(name string, pt types.PatchType, data []byte, opts metav1 Body(data). SetHeader("Accept", "application/vnd.kubernetes.protobuf;as=PartialObjectMetadata;g=meta.k8s.io;v=v1,application/json;as=PartialObjectMetadata;g=meta.k8s.io;v=v1,application/json"). SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1). - Do() + Do(context.TODO()) if err := result.Error(); err != nil { return nil, err } diff --git a/scale/client.go b/scale/client.go index 17519345..26febcb8 100644 --- a/scale/client.go +++ b/scale/client.go @@ -17,6 +17,7 @@ limitations under the License. package scale import ( + "context" "fmt" autoscaling "k8s.io/api/autoscaling/v1" @@ -154,7 +155,7 @@ func (c *namespacedScaleClient) Get(resource schema.GroupResource, name string) Resource(gvr.Resource). Name(name). SubResource("scale"). - Do() + Do(context.TODO()) if err := result.Error(); err != nil { return nil, err } @@ -196,7 +197,7 @@ func (c *namespacedScaleClient) Update(resource schema.GroupResource, scale *aut Name(scale.Name). SubResource("scale"). Body(scaleUpdateBytes). - Do() + Do(context.TODO()) if err := result.Error(); err != nil { // propagate "raw" error from the API // this allows callers to interpret underlying Reason field @@ -216,7 +217,7 @@ func (c *namespacedScaleClient) Patch(gvr schema.GroupVersionResource, name stri Name(name). SubResource("scale"). Body(data). - Do() + Do(context.TODO()) if err := result.Error(); err != nil { return nil, err } diff --git a/tools/cache/listwatch.go b/tools/cache/listwatch.go index 10a15203..10b7e651 100644 --- a/tools/cache/listwatch.go +++ b/tools/cache/listwatch.go @@ -17,6 +17,8 @@ limitations under the License. package cache import ( + "context" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/runtime" @@ -82,7 +84,7 @@ func NewFilteredListWatchFromClient(c Getter, resource string, namespace string, Namespace(namespace). Resource(resource). VersionedParams(&options, metav1.ParameterCodec). - Do(). + Do(context.TODO()). Get() } watchFunc := func(options metav1.ListOptions) (watch.Interface, error) { @@ -92,7 +94,7 @@ func NewFilteredListWatchFromClient(c Getter, resource string, namespace string, Namespace(namespace). Resource(resource). VersionedParams(&options, metav1.ParameterCodec). - Watch() + Watch(context.TODO()) } return &ListWatch{ListFunc: listFunc, WatchFunc: watchFunc} }