github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #88910 from liggitt/metadata-context

Browse Source 
Metadata client: plumb context
This commit is contained in:
Kubernetes Prow Robot 2020-03-06 13:18:04 -08:00 committed by GitHub
commit f52cbea102
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 69 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/controller/garbagecollector/garbagecollector.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package garbagecollector package garbagecollector
import ( import (
"context"
"fmt" "fmt"
"reflect" "reflect"
"sync" "sync"
@ -347,7 +348,7 @@ func (gc *GarbageCollector) isDangling(reference metav1.OwnerReference, item *no
// TODO: It's only necessary to talk to the API server if the owner node // TODO: It's only necessary to talk to the API server if the owner node
// is a "virtual" node. The local graph could lag behind the real // is a "virtual" node. The local graph could lag behind the real
// status, but in practice, the difference is small. // status, but in practice, the difference is small.
owner, err = gc.metadataClient.Resource(resource).Namespace(resourceDefaultNamespace(namespaced, item.identity.Namespace)).Get(reference.Name, metav1.GetOptions{}) owner, err = gc.metadataClient.Resource(resource).Namespace(resourceDefaultNamespace(namespaced, item.identity.Namespace)).Get(context.TODO(), reference.Name, metav1.GetOptions{})
switch { switch {
case errors.IsNotFound(err): case errors.IsNotFound(err):
gc.absentOwnerCache.Add(reference.UID) gc.absentOwnerCache.Add(reference.UID)

7
pkg/controller/garbagecollector/operations.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package garbagecollector package garbagecollector
import ( import (
"context"
"encoding/json" "encoding/json"
"fmt" "fmt"
@ -56,7 +57,7 @@ func (gc *GarbageCollector) deleteObject(item objectReference, policy *metav1.De
uid := item.UID uid := item.UID
preconditions := metav1.Preconditions{UID: &uid} preconditions := metav1.Preconditions{UID: &uid}
deleteOptions := metav1.DeleteOptions{Preconditions: &preconditions, PropagationPolicy: policy} deleteOptions := metav1.DeleteOptions{Preconditions: &preconditions, PropagationPolicy: policy}
return gc.metadataClient.Resource(resource).Namespace(resourceDefaultNamespace(namespaced, item.Namespace)).Delete(item.Name, &deleteOptions) return gc.metadataClient.Resource(resource).Namespace(resourceDefaultNamespace(namespaced, item.Namespace)).Delete(context.TODO(), item.Name, deleteOptions)
} }
func (gc *GarbageCollector) getObject(item objectReference) (*metav1.PartialObjectMetadata, error) { func (gc *GarbageCollector) getObject(item objectReference) (*metav1.PartialObjectMetadata, error) {
@ -64,7 +65,7 @@ func (gc *GarbageCollector) getObject(item objectReference) (*metav1.PartialObje
if err != nil { if err != nil {
return nil, err return nil, err
} }
return gc.metadataClient.Resource(resource).Namespace(resourceDefaultNamespace(namespaced, item.Namespace)).Get(item.Name, metav1.GetOptions{}) return gc.metadataClient.Resource(resource).Namespace(resourceDefaultNamespace(namespaced, item.Namespace)).Get(context.TODO(), item.Name, metav1.GetOptions{})
} }
func (gc *GarbageCollector) patchObject(item objectReference, patch []byte, pt types.PatchType) (*metav1.PartialObjectMetadata, error) { func (gc *GarbageCollector) patchObject(item objectReference, patch []byte, pt types.PatchType) (*metav1.PartialObjectMetadata, error) {
@ -72,7 +73,7 @@ func (gc *GarbageCollector) patchObject(item objectReference, patch []byte, pt t
if err != nil { if err != nil {
return nil, err return nil, err
} }
return gc.metadataClient.Resource(resource).Namespace(resourceDefaultNamespace(namespaced, item.Namespace)).Patch(item.Name, pt, patch, metav1.PatchOptions{}) return gc.metadataClient.Resource(resource).Namespace(resourceDefaultNamespace(namespaced, item.Namespace)).Patch(context.TODO(), item.Name, pt, patch, metav1.PatchOptions{})
} }
func (gc *GarbageCollector) removeFinalizer(owner *node, targetFinalizer string) error { func (gc *GarbageCollector) removeFinalizer(owner *node, targetFinalizer string) error {

5
pkg/controller/garbagecollector/patch.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package garbagecollector package garbagecollector
import ( import (
"context"
"encoding/json" "encoding/json"
"fmt" "fmt"
@ -67,7 +68,7 @@ func (gc *GarbageCollector) getMetadata(apiVersion, kind, namespace, name string
m, ok := gc.dependencyGraphBuilder.monitors[apiResource] m, ok := gc.dependencyGraphBuilder.monitors[apiResource]
if !ok || m == nil { if !ok || m == nil {
// If local cache doesn't exist for mapping.Resource, send a GET request to API server // If local cache doesn't exist for mapping.Resource, send a GET request to API server
return gc.metadataClient.Resource(apiResource).Namespace(namespace).Get(name, metav1.GetOptions{}) return gc.metadataClient.Resource(apiResource).Namespace(namespace).Get(context.TODO(), name, metav1.GetOptions{})
} }
key := name key := name
if len(namespace) != 0 { if len(namespace) != 0 {
@ -79,7 +80,7 @@ func (gc *GarbageCollector) getMetadata(apiVersion, kind, namespace, name string
} }
if !exist { if !exist {
// If local cache doesn't contain the object, send a GET request to API server // If local cache doesn't contain the object, send a GET request to API server
return gc.metadataClient.Resource(apiResource).Namespace(namespace).Get(name, metav1.GetOptions{}) return gc.metadataClient.Resource(apiResource).Namespace(namespace).Get(context.TODO(), name, metav1.GetOptions{})
} }
obj, ok := raw.(runtime.Object) obj, ok := raw.(runtime.Object)
if !ok { if !ok {

10
pkg/controller/namespace/deletion/namespaced_resources_deleter.go
View File

@ -318,8 +318,8 @@ func (d *namespacedResourcesDeleter) deleteCollection(gvr schema.GroupVersionRes
// resource deletions generically. it will ensure all resources in the namespace are purged prior to releasing // resource deletions generically. it will ensure all resources in the namespace are purged prior to releasing
// namespace itself. // namespace itself.
background := metav1.DeletePropagationBackground background := metav1.DeletePropagationBackground
opts := &metav1.DeleteOptions{PropagationPolicy: &background} opts := metav1.DeleteOptions{PropagationPolicy: &background}
err := d.metadataClient.Resource(gvr).Namespace(namespace).DeleteCollection(opts, metav1.ListOptions{}) err := d.metadataClient.Resource(gvr).Namespace(namespace).DeleteCollection(context.TODO(), opts, metav1.ListOptions{})
if err == nil { if err == nil {
return true, nil return true, nil
@ -355,7 +355,7 @@ func (d *namespacedResourcesDeleter) listCollection(gvr schema.GroupVersionResou
return nil, false, nil return nil, false, nil
} }
partialList, err := d.metadataClient.Resource(gvr).Namespace(namespace).List(metav1.ListOptions{}) partialList, err := d.metadataClient.Resource(gvr).Namespace(namespace).List(context.TODO(), metav1.ListOptions{})
if err == nil { if err == nil {
return partialList, true, nil return partialList, true, nil
} }
@ -388,8 +388,8 @@ func (d *namespacedResourcesDeleter) deleteEachItem(gvr schema.GroupVersionResou
} }
for _, item := range unstructuredList.Items { for _, item := range unstructuredList.Items {
background := metav1.DeletePropagationBackground background := metav1.DeletePropagationBackground
opts := &metav1.DeleteOptions{PropagationPolicy: &background} opts := metav1.DeleteOptions{PropagationPolicy: &background}
if err = d.metadataClient.Resource(gvr).Namespace(namespace).Delete(item.GetName(), opts); err != nil && !errors.IsNotFound(err) && !errors.IsMethodNotSupported(err) { if err = d.metadataClient.Resource(gvr).Namespace(namespace).Delete(context.TODO(), item.GetName(), opts); err != nil && !errors.IsNotFound(err) && !errors.IsMethodNotSupported(err) {
return err return err
} }
} }

13
staging/src/k8s.io/client-go/metadata/fake/simple.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package fake package fake
import ( import (
"context"
"fmt" "fmt"
"strings" "strings"
@ -214,7 +215,7 @@ func (c *metadataResourceClient) UpdateStatus(obj *metav1.PartialObjectMetadata,
} }
// Delete records the object deletion and processes it via the reactor. // Delete records the object deletion and processes it via the reactor.
func (c *metadataResourceClient) Delete(name string, opts *metav1.DeleteOptions, subresources ...string) error { func (c *metadataResourceClient) Delete(ctx context.Context, name string, opts metav1.DeleteOptions, subresources ...string) error {
var err error var err error
switch { switch {
case len(c.namespace) == 0 && len(subresources) == 0: case len(c.namespace) == 0 && len(subresources) == 0:
@ -238,7 +239,7 @@ func (c *metadataResourceClient) Delete(name string, opts *metav1.DeleteOptions,
} }
// DeleteCollection records the object collection deletion and processes it via the reactor. // DeleteCollection records the object collection deletion and processes it via the reactor.
func (c *metadataResourceClient) DeleteCollection(opts *metav1.DeleteOptions, listOptions metav1.ListOptions) error { func (c *metadataResourceClient) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOptions metav1.ListOptions) error {
var err error var err error
switch { switch {
case len(c.namespace) == 0: case len(c.namespace) == 0:
@ -255,7 +256,7 @@ func (c *metadataResourceClient) DeleteCollection(opts *metav1.DeleteOptions, li
} }
// Get records the object retrieval and processes it via the reactor. // Get records the object retrieval and processes it via the reactor.
func (c *metadataResourceClient) Get(name string, opts metav1.GetOptions, subresources ...string) (*metav1.PartialObjectMetadata, error) { func (c *metadataResourceClient) Get(ctx context.Context, name string, opts metav1.GetOptions, subresources ...string) (*metav1.PartialObjectMetadata, error) {
var uncastRet runtime.Object var uncastRet runtime.Object
var err error var err error
switch { switch {
@ -290,7 +291,7 @@ func (c *metadataResourceClient) Get(name string, opts metav1.GetOptions, subres
} }
// List records the object deletion and processes it via the reactor. // List records the object deletion and processes it via the reactor.
func (c *metadataResourceClient) List(opts metav1.ListOptions) (*metav1.PartialObjectMetadataList, error) { func (c *metadataResourceClient) List(ctx context.Context, opts metav1.ListOptions) (*metav1.PartialObjectMetadataList, error) {
var obj runtime.Object var obj runtime.Object
var err error var err error
switch { switch {
@ -337,7 +338,7 @@ func (c *metadataResourceClient) List(opts metav1.ListOptions) (*metav1.PartialO
return list, nil return list, nil
} }
func (c *metadataResourceClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { func (c *metadataResourceClient) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) {
switch { switch {
case len(c.namespace) == 0: case len(c.namespace) == 0:
return c.client.Fake. return c.client.Fake.
@ -353,7 +354,7 @@ func (c *metadataResourceClient) Watch(opts metav1.ListOptions) (watch.Interface
} }
// Patch records the object patch and processes it via the reactor. // Patch records the object patch and processes it via the reactor.
func (c *metadataResourceClient) Patch(name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (*metav1.PartialObjectMetadata, error) { func (c *metadataResourceClient) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (*metav1.PartialObjectMetadata, error) {
var uncastRet runtime.Object var uncastRet runtime.Object
var err error var err error
switch { switch {

5
staging/src/k8s.io/client-go/metadata/fake/simple_test.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package fake package fake
import ( import (
"context"
"fmt" "fmt"
"testing" "testing"
@ -72,7 +73,7 @@ func TestList(t *testing.T) {
newPartialObjectMetadata("group/version", "TheKind", "ns-foo", "name-baz"), newPartialObjectMetadata("group/version", "TheKind", "ns-foo", "name-baz"),
newPartialObjectMetadata("group2/version", "TheKind", "ns-foo", "name2-baz"), newPartialObjectMetadata("group2/version", "TheKind", "ns-foo", "name2-baz"),
) )
listFirst, err := client.Resource(schema.GroupVersionResource{Group: "group", Version: "version", Resource: "thekinds"}).List(metav1.ListOptions{}) listFirst, err := client.Resource(schema.GroupVersionResource{Group: "group", Version: "version", Resource: "thekinds"}).List(context.TODO(), metav1.ListOptions{})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -100,7 +101,7 @@ func (tc *patchTestCase) runner(t *testing.T) {
client := NewSimpleMetadataClient(scheme, tc.object) client := NewSimpleMetadataClient(scheme, tc.object)
resourceInterface := client.Resource(schema.GroupVersionResource{Group: testGroup, Version: testVersion, Resource: testResource}).Namespace(testNamespace) resourceInterface := client.Resource(schema.GroupVersionResource{Group: testGroup, Version: testVersion, Resource: testResource}).Namespace(testNamespace)
got, recErr := resourceInterface.Patch(testName, tc.patchType, tc.patchBytes, metav1.PatchOptions{}) got, recErr := resourceInterface.Patch(context.TODO(), testName, tc.patchType, tc.patchBytes, metav1.PatchOptions{})
if err := tc.verifyErr(recErr); err != nil { if err := tc.verifyErr(recErr); err != nil {
t.Error(err) t.Error(err)

14
staging/src/k8s.io/client-go/metadata/interface.go
View File

@ -17,6 +17,8 @@ limitations under the License.
package metadata package metadata
import ( import (
"context"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
@ -32,12 +34,12 @@ type Interface interface {
// ResourceInterface contains the set of methods that may be invoked on objects by their metadata. // ResourceInterface contains the set of methods that may be invoked on objects by their metadata.
// Update is not supported by the server, but Patch can be used for the actions Update would handle. // Update is not supported by the server, but Patch can be used for the actions Update would handle.
type ResourceInterface interface { type ResourceInterface interface {
Delete(name string, options *metav1.DeleteOptions, subresources ...string) error Delete(ctx context.Context, name string, options metav1.DeleteOptions, subresources ...string) error
DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error DeleteCollection(ctx context.Context, options metav1.DeleteOptions, listOptions metav1.ListOptions) error
Get(name string, options metav1.GetOptions, subresources ...string) (*metav1.PartialObjectMetadata, error) Get(ctx context.Context, name string, options metav1.GetOptions, subresources ...string) (*metav1.PartialObjectMetadata, error)
List(opts metav1.ListOptions) (*metav1.PartialObjectMetadataList, error) List(ctx context.Context, opts metav1.ListOptions) (*metav1.PartialObjectMetadataList, error)
Watch(opts metav1.ListOptions) (watch.Interface, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, options metav1.PatchOptions, subresources ...string) (*metav1.PartialObjectMetadata, error) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, options metav1.PatchOptions, subresources ...string) (*metav1.PartialObjectMetadata, error)
} }
// Getter handles both namespaced and non-namespaced resource types consistently. // Getter handles both namespaced and non-namespaced resource types consistently.

34
staging/src/k8s.io/client-go/metadata/metadata.go
View File

@ -120,14 +120,11 @@ func (c *client) Namespace(ns string) ResourceInterface {
} }
// Delete removes the provided resource from the server. // Delete removes the provided resource from the server.
func (c *client) Delete(name string, opts *metav1.DeleteOptions, subresources ...string) error { func (c *client) Delete(ctx context.Context, name string, opts metav1.DeleteOptions, subresources ...string) error {
if len(name) == 0 { if len(name) == 0 {
return fmt.Errorf("name is required") return fmt.Errorf("name is required")
} }
if opts == nil { deleteOptionsByte, err := runtime.Encode(deleteOptionsCodec.LegacyCodec(schema.GroupVersion{Version: "v1"}), &opts)
opts = &metav1.DeleteOptions{}
}
deleteOptionsByte, err := runtime.Encode(deleteOptionsCodec.LegacyCodec(schema.GroupVersion{Version: "v1"}), opts)
if err != nil { if err != nil {
return err return err
} }
@ -136,16 +133,13 @@ func (c *client) Delete(name string, opts *metav1.DeleteOptions, subresources ..
Delete(). Delete().
AbsPath(append(c.makeURLSegments(name), subresources...)...). AbsPath(append(c.makeURLSegments(name), subresources...)...).
Body(deleteOptionsByte). Body(deleteOptionsByte).
Do(context.TODO()) Do(ctx)
return result.Error() return result.Error()
} }
// DeleteCollection triggers deletion of all resources in the specified scope (namespace or cluster). // DeleteCollection triggers deletion of all resources in the specified scope (namespace or cluster).
func (c *client) DeleteCollection(opts *metav1.DeleteOptions, listOptions metav1.ListOptions) error { func (c *client) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOptions metav1.ListOptions) error {
if opts == nil { deleteOptionsByte, err := runtime.Encode(deleteOptionsCodec.LegacyCodec(schema.GroupVersion{Version: "v1"}), &opts)
opts = &metav1.DeleteOptions{}
}
deleteOptionsByte, err := runtime.Encode(deleteOptionsCodec.LegacyCodec(schema.GroupVersion{Version: "v1"}), opts)
if err != nil { if err != nil {
return err return err
} }
@ -155,19 +149,19 @@ func (c *client) DeleteCollection(opts *metav1.DeleteOptions, listOptions metav1
AbsPath(c.makeURLSegments("")...). AbsPath(c.makeURLSegments("")...).
Body(deleteOptionsByte). Body(deleteOptionsByte).
SpecificallyVersionedParams(&listOptions, dynamicParameterCodec, versionV1). SpecificallyVersionedParams(&listOptions, dynamicParameterCodec, versionV1).
Do(context.TODO()) Do(ctx)
return result.Error() return result.Error()
} }
// Get returns the resource with name from the specified scope (namespace or cluster). // Get returns the resource with name from the specified scope (namespace or cluster).
func (c *client) Get(name string, opts metav1.GetOptions, subresources ...string) (*metav1.PartialObjectMetadata, error) { func (c *client) Get(ctx context.Context, name string, opts metav1.GetOptions, subresources ...string) (*metav1.PartialObjectMetadata, error) {
if len(name) == 0 { if len(name) == 0 {
return nil, fmt.Errorf("name is required") return nil, fmt.Errorf("name is required")
} }
result := c.client.client.Get().AbsPath(append(c.makeURLSegments(name), subresources...)...). 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"). 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). SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1).
Do(context.TODO()) Do(ctx)
if err := result.Error(); err != nil { if err := result.Error(); err != nil {
return nil, err return nil, err
} }
@ -199,11 +193,11 @@ func (c *client) Get(name string, opts metav1.GetOptions, subresources ...string
} }
// List returns all resources within the specified scope (namespace or cluster). // List returns all resources within the specified scope (namespace or cluster).
func (c *client) List(opts metav1.ListOptions) (*metav1.PartialObjectMetadataList, error) { func (c *client) List(ctx context.Context, opts metav1.ListOptions) (*metav1.PartialObjectMetadataList, error) {
result := c.client.client.Get().AbsPath(c.makeURLSegments("")...). 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"). 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). SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1).
Do(context.TODO()) Do(ctx)
if err := result.Error(); err != nil { if err := result.Error(); err != nil {
return nil, err return nil, err
} }
@ -232,7 +226,7 @@ func (c *client) List(opts metav1.ListOptions) (*metav1.PartialObjectMetadataLis
} }
// Watch finds all changes to the resources in the specified scope (namespace or cluster). // Watch finds all changes to the resources in the specified scope (namespace or cluster).
func (c *client) Watch(opts metav1.ListOptions) (watch.Interface, error) { func (c *client) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) {
var timeout time.Duration var timeout time.Duration
if opts.TimeoutSeconds != nil { if opts.TimeoutSeconds != nil {
timeout = time.Duration(*opts.TimeoutSeconds) * time.Second timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
@ -243,11 +237,11 @@ 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"). 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). SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1).
Timeout(timeout). Timeout(timeout).
Watch(context.TODO()) Watch(ctx)
} }
// Patch modifies the named resource in the specified scope (namespace or cluster). // Patch modifies the named resource in the specified scope (namespace or cluster).
func (c *client) Patch(name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (*metav1.PartialObjectMetadata, error) { func (c *client) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (*metav1.PartialObjectMetadata, error) {
if len(name) == 0 { if len(name) == 0 {
return nil, fmt.Errorf("name is required") return nil, fmt.Errorf("name is required")
} }
@ -257,7 +251,7 @@ func (c *client) Patch(name string, pt types.PatchType, data []byte, opts metav1
Body(data). 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"). 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). SpecificallyVersionedParams(&opts, dynamicParameterCodec, versionV1).
Do(context.TODO()) Do(ctx)
if err := result.Error(); err != nil { if err := result.Error(); err != nil {
return nil, err return nil, err
} }

11
staging/src/k8s.io/client-go/metadata/metadata_test.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package metadata package metadata
import ( import (
"context"
"encoding/json" "encoding/json"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
@ -72,7 +73,7 @@ func TestClient(t *testing.T) {
}) })
}, },
want: func(t *testing.T, client *Client) { want: func(t *testing.T, client *Client) {
obj, err := client.Resource(gvr).Namespace("ns").Get("name", metav1.GetOptions{}) obj, err := client.Resource(gvr).Namespace("ns").Get(context.TODO(), "name", metav1.GetOptions{})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -120,7 +121,7 @@ func TestClient(t *testing.T) {
}) })
}, },
want: func(t *testing.T, client *Client) { want: func(t *testing.T, client *Client) {
objs, err := client.Resource(gvr).Namespace("ns").List(metav1.ListOptions{}) objs, err := client.Resource(gvr).Namespace("ns").List(context.TODO(), metav1.ListOptions{})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -162,7 +163,7 @@ func TestClient(t *testing.T) {
}) })
}, },
want: func(t *testing.T, client *Client) { want: func(t *testing.T, client *Client) {
obj, err := client.Resource(gvr).Namespace("ns").Get("name", metav1.GetOptions{}) obj, err := client.Resource(gvr).Namespace("ns").Get(context.TODO(), "name", metav1.GetOptions{})
if err == nil || !runtime.IsMissingKind(err) { if err == nil || !runtime.IsMissingKind(err) {
t.Fatal(err) t.Fatal(err)
} }
@ -191,7 +192,7 @@ func TestClient(t *testing.T) {
}) })
}, },
want: func(t *testing.T, client *Client) { want: func(t *testing.T, client *Client) {
obj, err := client.Resource(gvr).Namespace("ns").Get("name", metav1.GetOptions{}) obj, err := client.Resource(gvr).Namespace("ns").Get(context.TODO(), "name", metav1.GetOptions{})
if err == nil || !runtime.IsMissingVersion(err) { if err == nil || !runtime.IsMissingVersion(err) {
t.Fatal(err) t.Fatal(err)
} }
@ -219,7 +220,7 @@ func TestClient(t *testing.T) {
}) })
}, },
want: func(t *testing.T, client *Client) { want: func(t *testing.T, client *Client) {
obj, err := client.Resource(gvr).Namespace("ns").Get("name", metav1.GetOptions{}) obj, err := client.Resource(gvr).Namespace("ns").Get(context.TODO(), "name", metav1.GetOptions{})
if err == nil || !strings.Contains(err.Error(), "object does not appear to match the ObjectMeta schema") { if err == nil || !strings.Contains(err.Error(), "object does not appear to match the ObjectMeta schema") {
t.Fatal(err) t.Fatal(err)
} }

5
staging/src/k8s.io/client-go/metadata/metadatainformer/informer.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package metadatainformer package metadatainformer
import ( import (
"context"
"sync" "sync"
"time" "time"
@ -124,13 +125,13 @@ func NewFilteredMetadataInformer(client metadata.Interface, gvr schema.GroupVers
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.Resource(gvr).Namespace(namespace).List(options) return client.Resource(gvr).Namespace(namespace).List(context.TODO(), options)
}, },
WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.Resource(gvr).Namespace(namespace).Watch(options) return client.Resource(gvr).Namespace(namespace).Watch(context.TODO(), options)
}, },
}, },
&metav1.PartialObjectMetadata{}, &metav1.PartialObjectMetadata{},

2
staging/src/k8s.io/client-go/metadata/metadatainformer/informer_test.go
View File

@ -103,7 +103,7 @@ func TestMetadataSharedInformerFactory(t *testing.T) {
gvr: schema.GroupVersionResource{Group: "extensions", Version: "v1beta1", Resource: "deployments"}, gvr: schema.GroupVersionResource{Group: "extensions", Version: "v1beta1", Resource: "deployments"},
existingObj: newPartialObjectMetadata("extensions/v1beta1", "Deployment", "ns-foo", "name-foo"), existingObj: newPartialObjectMetadata("extensions/v1beta1", "Deployment", "ns-foo", "name-foo"),
trigger: func(gvr schema.GroupVersionResource, ns string, fakeClient *fake.FakeMetadataClient, testObject *metav1.PartialObjectMetadata) *metav1.PartialObjectMetadata { trigger: func(gvr schema.GroupVersionResource, ns string, fakeClient *fake.FakeMetadataClient, testObject *metav1.PartialObjectMetadata) *metav1.PartialObjectMetadata {
err := fakeClient.Resource(gvr).Namespace(ns).Delete(testObject.GetName(), &metav1.DeleteOptions{}) err := fakeClient.Resource(gvr).Namespace(ns).Delete(context.TODO(), testObject.GetName(), metav1.DeleteOptions{})
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }

26
test/integration/apiserver/apiserver_test.go
View File

@ -547,7 +547,7 @@ func TestMetadataClient(t *testing.T) {
}) })
client := metadata.NewForConfigOrDie(cfg).Resource(v1.SchemeGroupVersion.WithResource("services")) client := metadata.NewForConfigOrDie(cfg).Resource(v1.SchemeGroupVersion.WithResource("services"))
items, err := client.Namespace(ns).List(metav1.ListOptions{}) items, err := client.Namespace(ns).List(context.TODO(), metav1.ListOptions{})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -566,7 +566,7 @@ func TestMetadataClient(t *testing.T) {
} }
wrapper.resp = nil wrapper.resp = nil
item, err := client.Namespace(ns).Get("test-1", metav1.GetOptions{}) item, err := client.Namespace(ns).Get(context.TODO(), "test-1", metav1.GetOptions{})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -577,7 +577,7 @@ func TestMetadataClient(t *testing.T) {
t.Fatalf("unexpected response: %#v", wrapper.resp) t.Fatalf("unexpected response: %#v", wrapper.resp)
} }
item, err = client.Namespace(ns).Patch("test-1", types.MergePatchType, []byte(`{"metadata":{"annotations":{"foo":"baz"}}}`), metav1.PatchOptions{}) item, err = client.Namespace(ns).Patch(context.TODO(), "test-1", types.MergePatchType, []byte(`{"metadata":{"annotations":{"foo":"baz"}}}`), metav1.PatchOptions{})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -585,11 +585,11 @@ func TestMetadataClient(t *testing.T) {
t.Fatalf("unexpected object: %#v", item) t.Fatalf("unexpected object: %#v", item)
} }
if err := client.Namespace(ns).Delete("test-1", &metav1.DeleteOptions{Preconditions: &metav1.Preconditions{UID: &item.UID}}); err != nil { if err := client.Namespace(ns).Delete(context.TODO(), "test-1", metav1.DeleteOptions{Preconditions: &metav1.Preconditions{UID: &item.UID}}); err != nil {
t.Fatal(err) t.Fatal(err)
} }
if _, err := client.Namespace(ns).Get("test-1", metav1.GetOptions{}); !apierrors.IsNotFound(err) { if _, err := client.Namespace(ns).Get(context.TODO(), "test-1", metav1.GetOptions{}); !apierrors.IsNotFound(err) {
t.Fatal(err) t.Fatal(err)
} }
}, },
@ -624,7 +624,7 @@ func TestMetadataClient(t *testing.T) {
}) })
client := metadata.NewForConfigOrDie(cfg).Resource(crdGVR) client := metadata.NewForConfigOrDie(cfg).Resource(crdGVR)
items, err := client.Namespace(ns).List(metav1.ListOptions{}) items, err := client.Namespace(ns).List(context.TODO(), metav1.ListOptions{})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -643,7 +643,7 @@ func TestMetadataClient(t *testing.T) {
} }
wrapper.resp = nil wrapper.resp = nil
item, err := client.Namespace(ns).Get("test-1", metav1.GetOptions{}) item, err := client.Namespace(ns).Get(context.TODO(), "test-1", metav1.GetOptions{})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -654,7 +654,7 @@ func TestMetadataClient(t *testing.T) {
t.Fatalf("unexpected response: %#v", wrapper.resp) t.Fatalf("unexpected response: %#v", wrapper.resp)
} }
item, err = client.Namespace(ns).Patch("test-1", types.MergePatchType, []byte(`{"metadata":{"annotations":{"foo":"baz"}}}`), metav1.PatchOptions{}) item, err = client.Namespace(ns).Patch(context.TODO(), "test-1", types.MergePatchType, []byte(`{"metadata":{"annotations":{"foo":"baz"}}}`), metav1.PatchOptions{})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -662,10 +662,10 @@ func TestMetadataClient(t *testing.T) {
t.Fatalf("unexpected object: %#v", item) t.Fatalf("unexpected object: %#v", item)
} }
if err := client.Namespace(ns).Delete("test-1", &metav1.DeleteOptions{Preconditions: &metav1.Preconditions{UID: &item.UID}}); err != nil { if err := client.Namespace(ns).Delete(context.TODO(), "test-1", metav1.DeleteOptions{Preconditions: &metav1.Preconditions{UID: &item.UID}}); err != nil {
t.Fatal(err) t.Fatal(err)
} }
if _, err := client.Namespace(ns).Get("test-1", metav1.GetOptions{}); !apierrors.IsNotFound(err) { if _, err := client.Namespace(ns).Get(context.TODO(), "test-1", metav1.GetOptions{}); !apierrors.IsNotFound(err) {
t.Fatal(err) t.Fatal(err)
} }
}, },
@ -690,7 +690,7 @@ func TestMetadataClient(t *testing.T) {
}) })
client := metadata.NewForConfigOrDie(cfg).Resource(v1.SchemeGroupVersion.WithResource("services")) client := metadata.NewForConfigOrDie(cfg).Resource(v1.SchemeGroupVersion.WithResource("services"))
w, err := client.Namespace(ns).Watch(metav1.ListOptions{ResourceVersion: svc.ResourceVersion, Watch: true}) w, err := client.Namespace(ns).Watch(context.TODO(), metav1.ListOptions{ResourceVersion: svc.ResourceVersion, Watch: true})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -747,7 +747,7 @@ func TestMetadataClient(t *testing.T) {
cfg := metadata.ConfigFor(config) cfg := metadata.ConfigFor(config)
client := metadata.NewForConfigOrDie(cfg).Resource(crdGVR) client := metadata.NewForConfigOrDie(cfg).Resource(crdGVR)
patched, err := client.Namespace(ns).Patch("test-2", types.MergePatchType, []byte(`{"metadata":{"annotations":{"test":"1"}}}`), metav1.PatchOptions{}) patched, err := client.Namespace(ns).Patch(context.TODO(), "test-2", types.MergePatchType, []byte(`{"metadata":{"annotations":{"test":"1"}}}`), metav1.PatchOptions{})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -762,7 +762,7 @@ func TestMetadataClient(t *testing.T) {
}) })
client = metadata.NewForConfigOrDie(cfg).Resource(crdGVR) client = metadata.NewForConfigOrDie(cfg).Resource(crdGVR)
w, err := client.Namespace(ns).Watch(metav1.ListOptions{ResourceVersion: cr.GetResourceVersion(), Watch: true}) w, err := client.Namespace(ns).Watch(context.TODO(), metav1.ListOptions{ResourceVersion: cr.GetResourceVersion(), Watch: true})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }