Skip to content

Commit 4c03427

Browse files
committed
client-go: add context/options to expansions methods
1 parent f52cbea commit 4c03427

File tree

10 files changed

+46
-24
lines changed

10 files changed

+46
-24
lines changed

staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/certificatesigningrequest_expansion.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,23 @@ import (
2020
"context"
2121

2222
certificates "k8s.io/api/certificates/v1beta1"
23+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
24+
scheme "k8s.io/client-go/kubernetes/scheme"
2325
)
2426

2527
type CertificateSigningRequestExpansion interface {
26-
UpdateApproval(certificateSigningRequest *certificates.CertificateSigningRequest) (result *certificates.CertificateSigningRequest, err error)
28+
UpdateApproval(ctx context.Context, certificateSigningRequest *certificates.CertificateSigningRequest, opts metav1.UpdateOptions) (result *certificates.CertificateSigningRequest, err error)
2729
}
2830

29-
func (c *certificateSigningRequests) UpdateApproval(certificateSigningRequest *certificates.CertificateSigningRequest) (result *certificates.CertificateSigningRequest, err error) {
31+
func (c *certificateSigningRequests) UpdateApproval(ctx context.Context, certificateSigningRequest *certificates.CertificateSigningRequest, opts metav1.UpdateOptions) (result *certificates.CertificateSigningRequest, err error) {
3032
result = &certificates.CertificateSigningRequest{}
3133
err = c.client.Put().
3234
Resource("certificatesigningrequests").
3335
Name(certificateSigningRequest.Name).
36+
VersionedParams(&opts, scheme.ParameterCodec).
3437
Body(certificateSigningRequest).
3538
SubResource("approval").
36-
Do(context.TODO()).
39+
Do(ctx).
3740
Into(result)
3841
return
3942
}

staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake/fake_certificatesigningrequest_expansion.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@ limitations under the License.
1717
package fake
1818

1919
import (
20+
"context"
21+
2022
certificates "k8s.io/api/certificates/v1beta1"
23+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2124
core "k8s.io/client-go/testing"
2225
)
2326

24-
func (c *FakeCertificateSigningRequests) UpdateApproval(certificateSigningRequest *certificates.CertificateSigningRequest) (result *certificates.CertificateSigningRequest, err error) {
27+
func (c *FakeCertificateSigningRequests) UpdateApproval(ctx context.Context, certificateSigningRequest *certificates.CertificateSigningRequest, opts metav1.UpdateOptions) (result *certificates.CertificateSigningRequest, err error) {
2528
obj, err := c.Fake.
2629
Invokes(core.NewRootUpdateSubresourceAction(certificatesigningrequestsResource, "approval", certificateSigningRequest), &certificates.CertificateSigningRequest{})
2730
if obj == nil {

staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_namespace_expansion.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@ limitations under the License.
1717
package fake
1818

1919
import (
20+
"context"
21+
2022
"k8s.io/api/core/v1"
23+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2124
core "k8s.io/client-go/testing"
2225
)
2326

24-
func (c *FakeNamespaces) Finalize(namespace *v1.Namespace) (*v1.Namespace, error) {
27+
func (c *FakeNamespaces) Finalize(ctx context.Context, namespace *v1.Namespace, opts metav1.UpdateOptions) (*v1.Namespace, error) {
2528
action := core.CreateActionImpl{}
2629
action.Verb = "create"
2730
action.Resource = namespacesResource

staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_pod_expansion.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,16 @@ limitations under the License.
1717
package fake
1818

1919
import (
20+
"context"
21+
2022
"k8s.io/api/core/v1"
2123
policy "k8s.io/api/policy/v1beta1"
24+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2225
restclient "k8s.io/client-go/rest"
2326
core "k8s.io/client-go/testing"
2427
)
2528

26-
func (c *FakePods) Bind(binding *v1.Binding) error {
29+
func (c *FakePods) Bind(ctx context.Context, binding *v1.Binding, opts metav1.CreateOptions) error {
2730
action := core.CreateActionImpl{}
2831
action.Verb = "create"
2932
action.Namespace = binding.Namespace
@@ -57,7 +60,7 @@ func (c *FakePods) GetLogs(name string, opts *v1.PodLogOptions) *restclient.Requ
5760
return &restclient.Request{}
5861
}
5962

60-
func (c *FakePods) Evict(eviction *policy.Eviction) error {
63+
func (c *FakePods) Evict(ctx context.Context, eviction *policy.Eviction) error {
6164
action := core.CreateActionImpl{}
6265
action.Verb = "create"
6366
action.Namespace = c.ns

staging/src/k8s.io/client-go/kubernetes/typed/core/v1/namespace_expansion.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,18 @@ import (
2020
"context"
2121

2222
v1 "k8s.io/api/core/v1"
23+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
24+
scheme "k8s.io/client-go/kubernetes/scheme"
2325
)
2426

2527
// The NamespaceExpansion interface allows manually adding extra methods to the NamespaceInterface.
2628
type NamespaceExpansion interface {
27-
Finalize(item *v1.Namespace) (*v1.Namespace, error)
29+
Finalize(ctx context.Context, item *v1.Namespace, opts metav1.UpdateOptions) (*v1.Namespace, error)
2830
}
2931

3032
// Finalize takes the representation of a namespace to update. Returns the server's representation of the namespace, and an error, if it occurs.
31-
func (c *namespaces) Finalize(namespace *v1.Namespace) (result *v1.Namespace, err error) {
33+
func (c *namespaces) Finalize(ctx context.Context, namespace *v1.Namespace, opts metav1.UpdateOptions) (result *v1.Namespace, err error) {
3234
result = &v1.Namespace{}
33-
err = c.client.Put().Resource("namespaces").Name(namespace.Name).SubResource("finalize").Body(namespace).Do(context.TODO()).Into(result)
35+
err = c.client.Put().Resource("namespaces").Name(namespace.Name).VersionedParams(&opts, scheme.ParameterCodec).SubResource("finalize").Body(namespace).Do(ctx).Into(result)
3436
return
3537
}

staging/src/k8s.io/client-go/kubernetes/typed/core/v1/pod_expansion.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,25 @@ import (
2121

2222
v1 "k8s.io/api/core/v1"
2323
policy "k8s.io/api/policy/v1beta1"
24+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2425
"k8s.io/client-go/kubernetes/scheme"
2526
restclient "k8s.io/client-go/rest"
2627
)
2728

2829
// The PodExpansion interface allows manually adding extra methods to the PodInterface.
2930
type PodExpansion interface {
30-
Bind(binding *v1.Binding) error
31-
Evict(eviction *policy.Eviction) error
31+
Bind(ctx context.Context, binding *v1.Binding, opts metav1.CreateOptions) error
32+
Evict(ctx context.Context, eviction *policy.Eviction) error
3233
GetLogs(name string, opts *v1.PodLogOptions) *restclient.Request
3334
}
3435

3536
// Bind applies the provided binding to the named pod in the current namespace (binding.Namespace is ignored).
36-
func (c *pods) Bind(binding *v1.Binding) error {
37-
return c.client.Post().Namespace(c.ns).Resource("pods").Name(binding.Name).SubResource("binding").Body(binding).Do(context.TODO()).Error()
37+
func (c *pods) Bind(ctx context.Context, binding *v1.Binding, opts metav1.CreateOptions) error {
38+
return c.client.Post().Namespace(c.ns).Resource("pods").Name(binding.Name).VersionedParams(&opts, scheme.ParameterCodec).SubResource("binding").Body(binding).Do(ctx).Error()
3839
}
3940

40-
func (c *pods) Evict(eviction *policy.Eviction) error {
41-
return c.client.Post().Namespace(c.ns).Resource("pods").Name(eviction.Name).SubResource("eviction").Body(eviction).Do(context.TODO()).Error()
41+
func (c *pods) Evict(ctx context.Context, eviction *policy.Eviction) error {
42+
return c.client.Post().Namespace(c.ns).Resource("pods").Name(eviction.Name).SubResource("eviction").Body(eviction).Do(ctx).Error()
4243
}
4344

4445
// Get constructs a request for getting the logs for a pod

staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/deployment_expansion.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@ import (
2020
"context"
2121

2222
"k8s.io/api/extensions/v1beta1"
23+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
24+
scheme "k8s.io/client-go/kubernetes/scheme"
2325
)
2426

2527
// The DeploymentExpansion interface allows manually adding extra methods to the DeploymentInterface.
2628
type DeploymentExpansion interface {
27-
Rollback(*v1beta1.DeploymentRollback) error
29+
Rollback(context.Context, *v1beta1.DeploymentRollback, metav1.CreateOptions) error
2830
}
2931

3032
// Rollback applied the provided DeploymentRollback to the named deployment in the current namespace.
31-
func (c *deployments) Rollback(deploymentRollback *v1beta1.DeploymentRollback) error {
32-
return c.client.Post().Namespace(c.ns).Resource("deployments").Name(deploymentRollback.Name).SubResource("rollback").Body(deploymentRollback).Do(context.TODO()).Error()
33+
func (c *deployments) Rollback(ctx context.Context, deploymentRollback *v1beta1.DeploymentRollback, opts metav1.CreateOptions) error {
34+
return c.client.Post().Namespace(c.ns).Resource("deployments").Name(deploymentRollback.Name).VersionedParams(&opts, scheme.ParameterCodec).SubResource("rollback").Body(deploymentRollback).Do(ctx).Error()
3335
}

staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_deployment_expansion.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@ limitations under the License.
1717
package fake
1818

1919
import (
20+
"context"
21+
2022
"k8s.io/api/extensions/v1beta1"
23+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2124
core "k8s.io/client-go/testing"
2225
)
2326

24-
func (c *FakeDeployments) Rollback(deploymentRollback *v1beta1.DeploymentRollback) error {
27+
func (c *FakeDeployments) Rollback(ctx context.Context, deploymentRollback *v1beta1.DeploymentRollback, opts metav1.CreateOptions) error {
2528
action := core.CreateActionImpl{}
2629
action.Verb = "create"
2730
action.Resource = deploymentsResource

staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/eviction_expansion.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ import (
2424

2525
// The EvictionExpansion interface allows manually adding extra methods to the ScaleInterface.
2626
type EvictionExpansion interface {
27-
Evict(eviction *policy.Eviction) error
27+
Evict(ctx context.Context, eviction *policy.Eviction) error
2828
}
2929

30-
func (c *evictions) Evict(eviction *policy.Eviction) error {
30+
func (c *evictions) Evict(ctx context.Context, eviction *policy.Eviction) error {
3131
return c.client.Post().
3232
AbsPath("/api/v1").
3333
Namespace(eviction.Namespace).
3434
Resource("pods").
3535
Name(eviction.Name).
3636
SubResource("eviction").
3737
Body(eviction).
38-
Do(context.TODO()).
38+
Do(ctx).
3939
Error()
4040
}

staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/fake_eviction_expansion.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ limitations under the License.
1717
package fake
1818

1919
import (
20+
"context"
21+
2022
policy "k8s.io/api/policy/v1beta1"
2123
"k8s.io/apimachinery/pkg/runtime/schema"
2224
core "k8s.io/client-go/testing"
2325
)
2426

25-
func (c *FakeEvictions) Evict(eviction *policy.Eviction) error {
27+
func (c *FakeEvictions) Evict(ctx context.Context, eviction *policy.Eviction) error {
2628
action := core.CreateActionImpl{}
2729
action.Verb = "create"
2830
action.Namespace = c.ns

0 commit comments

Comments
 (0)