Skip to content

Commit 04a72d5

Browse files
liggittliggitt
committed
client-go metadata: update callers
1 parent cb4ee93 commit 04a72d5

File tree

5 files changed

+27
-24
lines changed

5 files changed

+27
-24
lines changed

‎pkg/controller/garbagecollector/garbagecollector.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package garbagecollector
1818

1919
import (
20+
"context"
2021
"fmt"
2122
"reflect"
2223
"sync"
@@ -347,7 +348,7 @@ func (gc *GarbageCollector) isDangling(reference metav1.OwnerReference, item *no
347348
// TODO: It's only necessary to talk to the API server if the owner node
348349
// is a "virtual" node. The local graph could lag behind the real
349350
// status, but in practice, the difference is small.
350-
owner, err = gc.metadataClient.Resource(resource).Namespace(resourceDefaultNamespace(namespaced, item.identity.Namespace)).Get(reference.Name, metav1.GetOptions{})
351+
owner, err = gc.metadataClient.Resource(resource).Namespace(resourceDefaultNamespace(namespaced, item.identity.Namespace)).Get(context.TODO(), reference.Name, metav1.GetOptions{})
351352
switch {
352353
case errors.IsNotFound(err):
353354
gc.absentOwnerCache.Add(reference.UID)

‎pkg/controller/garbagecollector/operations.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package garbagecollector
1818

1919
import (
20+
"context"
2021
"encoding/json"
2122
"fmt"
2223

@@ -56,23 +57,23 @@ func (gc *GarbageCollector) deleteObject(item objectReference, policy *metav1.De
5657
uid := item.UID
5758
preconditions := metav1.Preconditions{UID: &uid}
5859
deleteOptions := metav1.DeleteOptions{Preconditions: &preconditions, PropagationPolicy: policy}
59-
return gc.metadataClient.Resource(resource).Namespace(resourceDefaultNamespace(namespaced, item.Namespace)).Delete(item.Name, &deleteOptions)
60+
return gc.metadataClient.Resource(resource).Namespace(resourceDefaultNamespace(namespaced, item.Namespace)).Delete(context.TODO(), item.Name, deleteOptions)
6061
}
6162

6263
func (gc *GarbageCollector) getObject(item objectReference) (*metav1.PartialObjectMetadata, error) {
6364
resource, namespaced, err := gc.apiResource(item.APIVersion, item.Kind)
6465
if err != nil {
6566
return nil, err
6667
}
67-
return gc.metadataClient.Resource(resource).Namespace(resourceDefaultNamespace(namespaced, item.Namespace)).Get(item.Name, metav1.GetOptions{})
68+
return gc.metadataClient.Resource(resource).Namespace(resourceDefaultNamespace(namespaced, item.Namespace)).Get(context.TODO(), item.Name, metav1.GetOptions{})
6869
}
6970

7071
func (gc *GarbageCollector) patchObject(item objectReference, patch []byte, pt types.PatchType) (*metav1.PartialObjectMetadata, error) {
7172
resource, namespaced, err := gc.apiResource(item.APIVersion, item.Kind)
7273
if err != nil {
7374
return nil, err
7475
}
75-
return gc.metadataClient.Resource(resource).Namespace(resourceDefaultNamespace(namespaced, item.Namespace)).Patch(item.Name, pt, patch, metav1.PatchOptions{})
76+
return gc.metadataClient.Resource(resource).Namespace(resourceDefaultNamespace(namespaced, item.Namespace)).Patch(context.TODO(), item.Name, pt, patch, metav1.PatchOptions{})
7677
}
7778

7879
func (gc *GarbageCollector) removeFinalizer(owner *node, targetFinalizer string) error {

‎pkg/controller/garbagecollector/patch.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package garbagecollector
1818

1919
import (
20+
"context"
2021
"encoding/json"
2122
"fmt"
2223

@@ -67,7 +68,7 @@ func (gc *GarbageCollector) getMetadata(apiVersion, kind, namespace, name string
6768
m, ok := gc.dependencyGraphBuilder.monitors[apiResource]
6869
if !ok || m == nil {
6970
// If local cache doesn't exist for mapping.Resource, send a GET request to API server
70-
return gc.metadataClient.Resource(apiResource).Namespace(namespace).Get(name, metav1.GetOptions{})
71+
return gc.metadataClient.Resource(apiResource).Namespace(namespace).Get(context.TODO(), name, metav1.GetOptions{})
7172
}
7273
key := name
7374
if len(namespace) != 0 {
@@ -79,7 +80,7 @@ func (gc *GarbageCollector) getMetadata(apiVersion, kind, namespace, name string
7980
}
8081
if !exist {
8182
// If local cache doesn't contain the object, send a GET request to API server
82-
return gc.metadataClient.Resource(apiResource).Namespace(namespace).Get(name, metav1.GetOptions{})
83+
return gc.metadataClient.Resource(apiResource).Namespace(namespace).Get(context.TODO(), name, metav1.GetOptions{})
8384
}
8485
obj, ok := raw.(runtime.Object)
8586
if !ok {

‎pkg/controller/namespace/deletion/namespaced_resources_deleter.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,8 @@ func (d *namespacedResourcesDeleter) deleteCollection(gvr schema.GroupVersionRes
318318
// resource deletions generically. it will ensure all resources in the namespace are purged prior to releasing
319319
// namespace itself.
320320
background := metav1.DeletePropagationBackground
321-
opts := &metav1.DeleteOptions{PropagationPolicy: &background}
322-
err := d.metadataClient.Resource(gvr).Namespace(namespace).DeleteCollection(opts, metav1.ListOptions{})
321+
opts := metav1.DeleteOptions{PropagationPolicy: &background}
322+
err := d.metadataClient.Resource(gvr).Namespace(namespace).DeleteCollection(context.TODO(), opts, metav1.ListOptions{})
323323

324324
if err == nil {
325325
return true, nil
@@ -355,7 +355,7 @@ func (d *namespacedResourcesDeleter) listCollection(gvr schema.GroupVersionResou
355355
return nil, false, nil
356356
}
357357

358-
partialList, err := d.metadataClient.Resource(gvr).Namespace(namespace).List(metav1.ListOptions{})
358+
partialList, err := d.metadataClient.Resource(gvr).Namespace(namespace).List(context.TODO(), metav1.ListOptions{})
359359
if err == nil {
360360
return partialList, true, nil
361361
}
@@ -388,8 +388,8 @@ func (d *namespacedResourcesDeleter) deleteEachItem(gvr schema.GroupVersionResou
388388
}
389389
for _, item := range unstructuredList.Items {
390390
background := metav1.DeletePropagationBackground
391-
opts := &metav1.DeleteOptions{PropagationPolicy: &background}
392-
if err = d.metadataClient.Resource(gvr).Namespace(namespace).Delete(item.GetName(), opts); err != nil && !errors.IsNotFound(err) && !errors.IsMethodNotSupported(err) {
391+
opts := metav1.DeleteOptions{PropagationPolicy: &background}
392+
if err = d.metadataClient.Resource(gvr).Namespace(namespace).Delete(context.TODO(), item.GetName(), opts); err != nil && !errors.IsNotFound(err) && !errors.IsMethodNotSupported(err) {
393393
return err
394394
}
395395
}

‎test/integration/apiserver/apiserver_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ func TestMetadataClient(t *testing.T) {
547547
})
548548

549549
client := metadata.NewForConfigOrDie(cfg).Resource(v1.SchemeGroupVersion.WithResource("services"))
550-
items, err := client.Namespace(ns).List(metav1.ListOptions{})
550+
items, err := client.Namespace(ns).List(context.TODO(), metav1.ListOptions{})
551551
if err != nil {
552552
t.Fatal(err)
553553
}
@@ -566,7 +566,7 @@ func TestMetadataClient(t *testing.T) {
566566
}
567567
wrapper.resp = nil
568568

569-
item, err := client.Namespace(ns).Get("test-1", metav1.GetOptions{})
569+
item, err := client.Namespace(ns).Get(context.TODO(), "test-1", metav1.GetOptions{})
570570
if err != nil {
571571
t.Fatal(err)
572572
}
@@ -577,19 +577,19 @@ func TestMetadataClient(t *testing.T) {
577577
t.Fatalf("unexpected response: %#v", wrapper.resp)
578578
}
579579

580-
item, err = client.Namespace(ns).Patch("test-1", types.MergePatchType, []byte(`{"metadata":{"annotations":{"foo":"baz"}}}`), metav1.PatchOptions{})
580+
item, err = client.Namespace(ns).Patch(context.TODO(), "test-1", types.MergePatchType, []byte(`{"metadata":{"annotations":{"foo":"baz"}}}`), metav1.PatchOptions{})
581581
if err != nil {
582582
t.Fatal(err)
583583
}
584584
if item.Annotations["foo"] != "baz" {
585585
t.Fatalf("unexpected object: %#v", item)
586586
}
587587

588-
if err := client.Namespace(ns).Delete("test-1", &metav1.DeleteOptions{Preconditions: &metav1.Preconditions{UID: &item.UID}}); err != nil {
588+
if err := client.Namespace(ns).Delete(context.TODO(), "test-1", metav1.DeleteOptions{Preconditions: &metav1.Preconditions{UID: &item.UID}}); err != nil {
589589
t.Fatal(err)
590590
}
591591

592-
if _, err := client.Namespace(ns).Get("test-1", metav1.GetOptions{}); !apierrors.IsNotFound(err) {
592+
if _, err := client.Namespace(ns).Get(context.TODO(), "test-1", metav1.GetOptions{}); !apierrors.IsNotFound(err) {
593593
t.Fatal(err)
594594
}
595595
},
@@ -624,7 +624,7 @@ func TestMetadataClient(t *testing.T) {
624624
})
625625

626626
client := metadata.NewForConfigOrDie(cfg).Resource(crdGVR)
627-
items, err := client.Namespace(ns).List(metav1.ListOptions{})
627+
items, err := client.Namespace(ns).List(context.TODO(), metav1.ListOptions{})
628628
if err != nil {
629629
t.Fatal(err)
630630
}
@@ -643,7 +643,7 @@ func TestMetadataClient(t *testing.T) {
643643
}
644644
wrapper.resp = nil
645645

646-
item, err := client.Namespace(ns).Get("test-1", metav1.GetOptions{})
646+
item, err := client.Namespace(ns).Get(context.TODO(), "test-1", metav1.GetOptions{})
647647
if err != nil {
648648
t.Fatal(err)
649649
}
@@ -654,18 +654,18 @@ func TestMetadataClient(t *testing.T) {
654654
t.Fatalf("unexpected response: %#v", wrapper.resp)
655655
}
656656

657-
item, err = client.Namespace(ns).Patch("test-1", types.MergePatchType, []byte(`{"metadata":{"annotations":{"foo":"baz"}}}`), metav1.PatchOptions{})
657+
item, err = client.Namespace(ns).Patch(context.TODO(), "test-1", types.MergePatchType, []byte(`{"metadata":{"annotations":{"foo":"baz"}}}`), metav1.PatchOptions{})
658658
if err != nil {
659659
t.Fatal(err)
660660
}
661661
if item.Annotations["foo"] != "baz" {
662662
t.Fatalf("unexpected object: %#v", item)
663663
}
664664

665-
if err := client.Namespace(ns).Delete("test-1", &metav1.DeleteOptions{Preconditions: &metav1.Preconditions{UID: &item.UID}}); err != nil {
665+
if err := client.Namespace(ns).Delete(context.TODO(), "test-1", metav1.DeleteOptions{Preconditions: &metav1.Preconditions{UID: &item.UID}}); err != nil {
666666
t.Fatal(err)
667667
}
668-
if _, err := client.Namespace(ns).Get("test-1", metav1.GetOptions{}); !apierrors.IsNotFound(err) {
668+
if _, err := client.Namespace(ns).Get(context.TODO(), "test-1", metav1.GetOptions{}); !apierrors.IsNotFound(err) {
669669
t.Fatal(err)
670670
}
671671
},
@@ -690,7 +690,7 @@ func TestMetadataClient(t *testing.T) {
690690
})
691691

692692
client := metadata.NewForConfigOrDie(cfg).Resource(v1.SchemeGroupVersion.WithResource("services"))
693-
w, err := client.Namespace(ns).Watch(metav1.ListOptions{ResourceVersion: svc.ResourceVersion, Watch: true})
693+
w, err := client.Namespace(ns).Watch(context.TODO(), metav1.ListOptions{ResourceVersion: svc.ResourceVersion, Watch: true})
694694
if err != nil {
695695
t.Fatal(err)
696696
}
@@ -747,7 +747,7 @@ func TestMetadataClient(t *testing.T) {
747747
cfg := metadata.ConfigFor(config)
748748
client := metadata.NewForConfigOrDie(cfg).Resource(crdGVR)
749749

750-
patched, err := client.Namespace(ns).Patch("test-2", types.MergePatchType, []byte(`{"metadata":{"annotations":{"test":"1"}}}`), metav1.PatchOptions{})
750+
patched, err := client.Namespace(ns).Patch(context.TODO(), "test-2", types.MergePatchType, []byte(`{"metadata":{"annotations":{"test":"1"}}}`), metav1.PatchOptions{})
751751
if err != nil {
752752
t.Fatal(err)
753753
}
@@ -762,7 +762,7 @@ func TestMetadataClient(t *testing.T) {
762762
})
763763
client = metadata.NewForConfigOrDie(cfg).Resource(crdGVR)
764764

765-
w, err := client.Namespace(ns).Watch(metav1.ListOptions{ResourceVersion: cr.GetResourceVersion(), Watch: true})
765+
w, err := client.Namespace(ns).Watch(context.TODO(), metav1.ListOptions{ResourceVersion: cr.GetResourceVersion(), Watch: true})
766766
if err != nil {
767767
t.Fatal(err)
768768
}

0 commit comments

Comments
 (0)