Skip to content

Commit cf4d797

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#88906 from liggitt/dynamic-delete
Dynamic client: plumb context
2 parents b9f15ec + b7c2faf commit cf4d797

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+460
-440
lines changed

‎cmd/kubeadm/app/util/apiclient/clientbacked_dryrun.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 apiclient
1818

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

@@ -74,7 +75,7 @@ func NewClientBackedDryRunGetterFromKubeconfig(file string) (*ClientBackedDryRun
7475

7576
// HandleGetAction handles GET actions to the dryrun clientset this interface supports
7677
func (clg *ClientBackedDryRunGetter) HandleGetAction(action core.GetAction) (bool, runtime.Object, error) {
77-
unstructuredObj, err := clg.dynamicClient.Resource(action.GetResource()).Namespace(action.GetNamespace()).Get(action.GetName(), metav1.GetOptions{})
78+
unstructuredObj, err := clg.dynamicClient.Resource(action.GetResource()).Namespace(action.GetNamespace()).Get(context.TODO(), action.GetName(), metav1.GetOptions{})
7879
// Inform the user that the requested object wasn't found.
7980
printIfNotExists(err)
8081
if err != nil {
@@ -95,7 +96,7 @@ func (clg *ClientBackedDryRunGetter) HandleListAction(action core.ListAction) (b
9596
FieldSelector: action.GetListRestrictions().Fields.String(),
9697
}
9798

98-
unstructuredList, err := clg.dynamicClient.Resource(action.GetResource()).Namespace(action.GetNamespace()).List(listOpts)
99+
unstructuredList, err := clg.dynamicClient.Resource(action.GetResource()).Namespace(action.GetNamespace()).List(context.TODO(), listOpts)
99100
if err != nil {
100101
return true, nil, err
101102
}

‎staging/src/k8s.io/apiextensions-apiserver/test/integration/basic_test.go‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta
9393
for _, v := range noxuDefinition.Spec.Versions {
9494
noxuResourceClients[v.Name] = newNamespacedCustomResourceVersionedClient(ns, dynamicClient, noxuDefinition, v.Name)
9595

96-
noxuWatch, err := noxuResourceClients[v.Name].Watch(metav1.ListOptions{})
96+
noxuWatch, err := noxuResourceClients[v.Name].Watch(context.TODO(), metav1.ListOptions{})
9797
if disabledVersions[v.Name] {
9898
if !errors.IsNotFound(err) {
9999
t.Errorf("expected the watch operation fail with NotFound for disabled version %s, got error: %v", v.Name, err)
@@ -161,7 +161,7 @@ func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta
161161
// Check get for all versions
162162
for version2, noxuResourceClient2 := range noxuResourceClients {
163163
// Get test
164-
gottenNoxuInstance, err := noxuResourceClient2.Get("foo", metav1.GetOptions{})
164+
gottenNoxuInstance, err := noxuResourceClient2.Get(context.TODO(), "foo", metav1.GetOptions{})
165165

166166
if disabledVersions[version2] {
167167
if !errors.IsNotFound(err) {
@@ -179,7 +179,7 @@ func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta
179179
}
180180

181181
// List test
182-
listWithItem, err := noxuResourceClient2.List(metav1.ListOptions{})
182+
listWithItem, err := noxuResourceClient2.List(context.TODO(), metav1.ListOptions{})
183183
if disabledVersions[version2] {
184184
if !errors.IsNotFound(err) {
185185
t.Errorf("expected the list operation fail with NotFound for disabled version %s, got error: %v", version2, err)
@@ -208,14 +208,14 @@ func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta
208208
gottenNoxuInstance = &unstructured.Unstructured{}
209209
gottenNoxuInstance.SetName("foo")
210210
} else {
211-
gottenNoxuInstance, err = noxuResourceClient2.Get("foo", metav1.GetOptions{})
211+
gottenNoxuInstance, err = noxuResourceClient2.Get(context.TODO(), "foo", metav1.GetOptions{})
212212
if err != nil {
213213
t.Fatal(err)
214214
}
215215
}
216216

217217
gottenNoxuInstance.Object["updated"] = version2
218-
updatedNoxuInstance, err := noxuResourceClient2.Update(gottenNoxuInstance, metav1.UpdateOptions{})
218+
updatedNoxuInstance, err := noxuResourceClient2.Update(context.TODO(), gottenNoxuInstance, metav1.UpdateOptions{})
219219
if disabledVersions[version2] {
220220
if !errors.IsNotFound(err) {
221221
t.Errorf("expected the update operation fail with NotFound for disabled version %s, got error: %v", version2, err)
@@ -265,11 +265,11 @@ func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta
265265
}
266266

267267
// Delete test
268-
if err := noxuResourceClient.Delete("foo", metav1.NewDeleteOptions(0)); err != nil {
268+
if err := noxuResourceClient.Delete(context.TODO(), "foo", *metav1.NewDeleteOptions(0)); err != nil {
269269
t.Fatal(err)
270270
}
271271

272-
listWithoutItem, err := noxuResourceClient.List(metav1.ListOptions{})
272+
listWithoutItem, err := noxuResourceClient.List(context.TODO(), metav1.ListOptions{})
273273
if err != nil {
274274
t.Fatal(err)
275275
}
@@ -305,7 +305,7 @@ func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta
305305
}
306306

307307
// Delete test
308-
if err := noxuResourceClient.DeleteCollection(metav1.NewDeleteOptions(0), metav1.ListOptions{}); err != nil {
308+
if err := noxuResourceClient.DeleteCollection(context.TODO(), *metav1.NewDeleteOptions(0), metav1.ListOptions{}); err != nil {
309309
t.Fatal(err)
310310
}
311311
}
@@ -333,7 +333,7 @@ func TestInvalidCRUD(t *testing.T) {
333333
for _, v := range noxuDefinition.Spec.Versions {
334334
noxuResourceClients[v.Name] = newNamespacedCustomResourceVersionedClient("", dynamicClient, noxuDefinition, v.Name)
335335

336-
noxuWatch, err := noxuResourceClients[v.Name].Watch(metav1.ListOptions{})
336+
noxuWatch, err := noxuResourceClients[v.Name].Watch(context.TODO(), metav1.ListOptions{})
337337
if disabledVersions[v.Name] {
338338
if !errors.IsNotFound(err) {
339339
t.Errorf("expected the watch operation fail with NotFound for disabled version %s, got error: %v", v.Name, err)
@@ -354,7 +354,7 @@ func TestInvalidCRUD(t *testing.T) {
354354
for version, noxuResourceClient := range noxuResourceClients {
355355
// Case when typeless Unstructured object is passed
356356
typelessInstance := &unstructured.Unstructured{}
357-
if _, err := noxuResourceClient.Create(typelessInstance, metav1.CreateOptions{}); !errors.IsBadRequest(err) {
357+
if _, err := noxuResourceClient.Create(context.TODO(), typelessInstance, metav1.CreateOptions{}); !errors.IsBadRequest(err) {
358358
t.Errorf("expected badrequest for submitting empty object, got %#v", err)
359359
}
360360
// Case when apiVersion and Kind would be set up from GVK, but no other objects are present
@@ -364,15 +364,15 @@ func TestInvalidCRUD(t *testing.T) {
364364
"kind": "WishIHadChosenNoxu",
365365
},
366366
}
367-
if _, err := noxuResourceClient.Create(typedNoBodyInstance, metav1.CreateOptions{}); !errors.IsInvalid(err) {
367+
if _, err := noxuResourceClient.Create(context.TODO(), typedNoBodyInstance, metav1.CreateOptions{}); !errors.IsInvalid(err) {
368368
t.Errorf("expected invalid request for submitting malformed object, got %#v", err)
369369
}
370370
}
371371
}
372372

373373
func testFieldSelector(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta1.CustomResourceDefinition, dynamicClient dynamic.Interface) {
374374
noxuResourceClient := newNamespacedCustomResourceClient(ns, dynamicClient, noxuDefinition)
375-
initialList, err := noxuResourceClient.List(metav1.ListOptions{})
375+
initialList, err := noxuResourceClient.List(context.TODO(), metav1.ListOptions{})
376376
if err != nil {
377377
t.Fatal(err)
378378
}
@@ -395,6 +395,7 @@ func testFieldSelector(t *testing.T, ns string, noxuDefinition *apiextensionsv1b
395395
t.Fatal(err)
396396
}
397397
noxuWatch, err := noxuResourceClient.Watch(
398+
context.TODO(),
398399
metav1.ListOptions{
399400
ResourceVersion: initialListListMeta.GetResourceVersion(),
400401
FieldSelector: "metadata.name=foo",
@@ -449,15 +450,15 @@ func testFieldSelector(t *testing.T, ns string, noxuDefinition *apiextensionsv1b
449450
t.Errorf("missing watch event")
450451
}
451452

452-
gottenNoxuInstance, err := noxuResourceClient.Get("foo", metav1.GetOptions{})
453+
gottenNoxuInstance, err := noxuResourceClient.Get(context.TODO(), "foo", metav1.GetOptions{})
453454
if err != nil {
454455
t.Fatal(err)
455456
}
456457
if e, a := createdNoxuInstanceFoo, gottenNoxuInstance; !reflect.DeepEqual(e, a) {
457458
t.Errorf("expected %v, got %v", e, a)
458459
}
459460

460-
listWithItem, err := noxuResourceClient.List(metav1.ListOptions{FieldSelector: "metadata.name=foo"})
461+
listWithItem, err := noxuResourceClient.List(context.TODO(), metav1.ListOptions{FieldSelector: "metadata.name=foo"})
461462
if err != nil {
462463
t.Fatal(err)
463464
}
@@ -468,14 +469,14 @@ func testFieldSelector(t *testing.T, ns string, noxuDefinition *apiextensionsv1b
468469
t.Errorf("expected %v, got %v", e, a)
469470
}
470471

471-
if err := noxuResourceClient.Delete("bar", nil); err != nil {
472+
if err := noxuResourceClient.Delete(context.TODO(), "bar", metav1.DeleteOptions{}); err != nil {
472473
t.Fatal(err)
473474
}
474-
if err := noxuResourceClient.Delete("foo", nil); err != nil {
475+
if err := noxuResourceClient.Delete(context.TODO(), "foo", metav1.DeleteOptions{}); err != nil {
475476
t.Fatal(err)
476477
}
477478

478-
listWithoutItem, err := noxuResourceClient.List(metav1.ListOptions{})
479+
listWithoutItem, err := noxuResourceClient.List(context.TODO(), metav1.ListOptions{})
479480
if err != nil {
480481
t.Fatal(err)
481482
}
@@ -578,7 +579,7 @@ func TestNoNamespaceReject(t *testing.T) {
578579

579580
ns := ""
580581
noxuResourceClient := newNamespacedCustomResourceClient(ns, dynamicClient, noxuDefinition)
581-
initialList, err := noxuResourceClient.List(metav1.ListOptions{})
582+
initialList, err := noxuResourceClient.List(context.TODO(), metav1.ListOptions{})
582583
if err != nil {
583584
t.Fatal(err)
584585
}
@@ -640,7 +641,7 @@ func TestSelfLink(t *testing.T) {
640641
noxuNamespacedResourceClient := newNamespacedCustomResourceClient(ns, dynamicClient, noxuDefinition)
641642

642643
noxuInstanceToCreate := fixtures.NewNoxuInstance(ns, "foo")
643-
createdNoxuInstance, err := noxuNamespacedResourceClient.Create(noxuInstanceToCreate, metav1.CreateOptions{})
644+
createdNoxuInstance, err := noxuNamespacedResourceClient.Create(context.TODO(), noxuInstanceToCreate, metav1.CreateOptions{})
644645
if err != nil {
645646
t.Fatal(err)
646647
}
@@ -659,7 +660,7 @@ func TestSelfLink(t *testing.T) {
659660
curletResourceClient := newNamespacedCustomResourceClient(ns, dynamicClient, curletDefinition)
660661

661662
curletInstanceToCreate := fixtures.NewCurletInstance(ns, "foo")
662-
createdCurletInstance, err := curletResourceClient.Create(curletInstanceToCreate, metav1.CreateOptions{})
663+
createdCurletInstance, err := curletResourceClient.Create(context.TODO(), curletInstanceToCreate, metav1.CreateOptions{})
663664
if err != nil {
664665
t.Fatal(err)
665666
}
@@ -686,7 +687,7 @@ func TestPreserveInt(t *testing.T) {
686687
noxuNamespacedResourceClient := newNamespacedCustomResourceClient(ns, dynamicClient, noxuDefinition)
687688

688689
noxuInstanceToCreate := fixtures.NewNoxuInstance(ns, "foo")
689-
createdNoxuInstance, err := noxuNamespacedResourceClient.Create(noxuInstanceToCreate, metav1.CreateOptions{})
690+
createdNoxuInstance, err := noxuNamespacedResourceClient.Create(context.TODO(), noxuInstanceToCreate, metav1.CreateOptions{})
690691
if err != nil {
691692
t.Fatal(err)
692693
}
@@ -729,14 +730,14 @@ func TestPatch(t *testing.T) {
729730

730731
t.Logf("Creating foo")
731732
noxuInstanceToCreate := fixtures.NewNoxuInstance(ns, "foo")
732-
_, err = noxuNamespacedResourceClient.Create(noxuInstanceToCreate, metav1.CreateOptions{})
733+
_, err = noxuNamespacedResourceClient.Create(context.TODO(), noxuInstanceToCreate, metav1.CreateOptions{})
733734
if err != nil {
734735
t.Fatal(err)
735736
}
736737

737738
t.Logf("Patching .num.num2 to 999")
738739
patch := []byte(`{"num": {"num2":999}}`)
739-
patchedNoxuInstance, err := noxuNamespacedResourceClient.Patch("foo", types.MergePatchType, patch, metav1.PatchOptions{})
740+
patchedNoxuInstance, err := noxuNamespacedResourceClient.Patch(context.TODO(), "foo", types.MergePatchType, patch, metav1.PatchOptions{})
740741
if err != nil {
741742
t.Fatalf("unexpected error: %v", err)
742743
}
@@ -751,7 +752,7 @@ func TestPatch(t *testing.T) {
751752

752753
// a patch with no change
753754
t.Logf("Patching .num.num2 again to 999")
754-
patchedNoxuInstance, err = noxuNamespacedResourceClient.Patch("foo", types.MergePatchType, patch, metav1.PatchOptions{})
755+
patchedNoxuInstance, err = noxuNamespacedResourceClient.Patch(context.TODO(), "foo", types.MergePatchType, patch, metav1.PatchOptions{})
755756
if err != nil {
756757
t.Fatalf("unexpected error: %v", err)
757758
}
@@ -761,7 +762,7 @@ func TestPatch(t *testing.T) {
761762

762763
// an empty patch
763764
t.Logf("Applying empty patch")
764-
patchedNoxuInstance, err = noxuNamespacedResourceClient.Patch("foo", types.MergePatchType, []byte(`{}`), metav1.PatchOptions{})
765+
patchedNoxuInstance, err = noxuNamespacedResourceClient.Patch(context.TODO(), "foo", types.MergePatchType, []byte(`{}`), metav1.PatchOptions{})
765766
if err != nil {
766767
t.Fatalf("unexpected error: %v", err)
767768
}
@@ -804,7 +805,7 @@ func TestCrossNamespaceListWatch(t *testing.T) {
804805

805806
ns := ""
806807
noxuResourceClient := newNamespacedCustomResourceClient(ns, dynamicClient, noxuDefinition)
807-
initialList, err := noxuResourceClient.List(metav1.ListOptions{})
808+
initialList, err := noxuResourceClient.List(context.TODO(), metav1.ListOptions{})
808809
if err != nil {
809810
t.Fatal(err)
810811
}
@@ -817,7 +818,7 @@ func TestCrossNamespaceListWatch(t *testing.T) {
817818
t.Fatal(err)
818819
}
819820

820-
noxuWatch, err := noxuResourceClient.Watch(metav1.ListOptions{ResourceVersion: initialListListMeta.GetResourceVersion()})
821+
noxuWatch, err := noxuResourceClient.Watch(context.TODO(), metav1.ListOptions{ResourceVersion: initialListListMeta.GetResourceVersion()})
821822
if err != nil {
822823
t.Fatal(err)
823824
}
@@ -827,7 +828,7 @@ func TestCrossNamespaceListWatch(t *testing.T) {
827828
ns1 := "namespace-1"
828829
noxuNamespacedResourceClient1 := newNamespacedCustomResourceClient(ns1, dynamicClient, noxuDefinition)
829830
instances[ns1] = createInstanceWithNamespaceHelper(t, ns1, "foo1", noxuNamespacedResourceClient1, noxuDefinition)
830-
noxuNamespacesWatch1, err := noxuNamespacedResourceClient1.Watch(metav1.ListOptions{ResourceVersion: initialListListMeta.GetResourceVersion()})
831+
noxuNamespacesWatch1, err := noxuNamespacedResourceClient1.Watch(context.TODO(), metav1.ListOptions{ResourceVersion: initialListListMeta.GetResourceVersion()})
831832
if err != nil {
832833
t.Fatalf("Failed to watch namespace: %s, error: %v", ns1, err)
833834
}
@@ -836,13 +837,13 @@ func TestCrossNamespaceListWatch(t *testing.T) {
836837
ns2 := "namespace-2"
837838
noxuNamespacedResourceClient2 := newNamespacedCustomResourceClient(ns2, dynamicClient, noxuDefinition)
838839
instances[ns2] = createInstanceWithNamespaceHelper(t, ns2, "foo2", noxuNamespacedResourceClient2, noxuDefinition)
839-
noxuNamespacesWatch2, err := noxuNamespacedResourceClient2.Watch(metav1.ListOptions{ResourceVersion: initialListListMeta.GetResourceVersion()})
840+
noxuNamespacesWatch2, err := noxuNamespacedResourceClient2.Watch(context.TODO(), metav1.ListOptions{ResourceVersion: initialListListMeta.GetResourceVersion()})
840841
if err != nil {
841842
t.Fatalf("Failed to watch namespace: %s, error: %v", ns2, err)
842843
}
843844
defer noxuNamespacesWatch2.Stop()
844845

845-
createdList, err := noxuResourceClient.List(metav1.ListOptions{})
846+
createdList, err := noxuResourceClient.List(context.TODO(), metav1.ListOptions{})
846847
if err != nil {
847848
t.Fatal(err)
848849
}

‎staging/src/k8s.io/apiextensions-apiserver/test/integration/change_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func TestChangeCRD(t *testing.T) {
103103
go func(i int) {
104104
defer wg.Done()
105105
noxuInstanceToCreate := fixtures.NewNoxuInstance(ns, fmt.Sprintf("foo-%d", i))
106-
if _, err := noxuNamespacedResourceClient.Create(noxuInstanceToCreate, metav1.CreateOptions{}); err != nil {
106+
if _, err := noxuNamespacedResourceClient.Create(context.TODO(), noxuInstanceToCreate, metav1.CreateOptions{}); err != nil {
107107
t.Error(err)
108108
return
109109
}
@@ -113,7 +113,7 @@ func TestChangeCRD(t *testing.T) {
113113
case <-stopChan:
114114
return
115115
default:
116-
if _, err := noxuNamespacedResourceClient.Get(noxuInstanceToCreate.GetName(), metav1.GetOptions{}); err != nil {
116+
if _, err := noxuNamespacedResourceClient.Get(context.TODO(), noxuInstanceToCreate.GetName(), metav1.GetOptions{}); err != nil {
117117
t.Error(err)
118118
continue
119119
}
@@ -130,7 +130,7 @@ func TestChangeCRD(t *testing.T) {
130130
case <-stopChan:
131131
return
132132
default:
133-
w, err := noxuNamespacedResourceClient.Watch(metav1.ListOptions{})
133+
w, err := noxuNamespacedResourceClient.Watch(context.TODO(), metav1.ListOptions{})
134134
if err != nil {
135135
t.Errorf("unexpected error establishing watch: %v", err)
136136
continue

0 commit comments

Comments
 (0)