Skip to content

Commit 9a990e1

Browse files
timflannagantimflannagan
committed
test/e2e: Replace context.TODO() with context.Background()
1 parent cf49231 commit 9a990e1

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

‎test/e2e/gc_e2e_test.go

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ var _ = Describe("Garbage collection for dependent resources", func() {
7676
// Create a CustomResourceDefinition
7777
var err error
7878
Eventually(func() error {
79-
crd, err = kubeClient.ApiextensionsInterface().ApiextensionsV1().CustomResourceDefinitions().Create(context.TODO(), crd, metav1.CreateOptions{})
79+
crd, err = kubeClient.ApiextensionsInterface().ApiextensionsV1().CustomResourceDefinitions().Create(context.Background(), crd, metav1.CreateOptions{})
8080
return err
8181
}).Should(Succeed())
8282

@@ -101,15 +101,15 @@ var _ = Describe("Garbage collection for dependent resources", func() {
101101
IgnoreError(kubeClient.DeleteClusterRole(cr.GetName(), &metav1.DeleteOptions{}))
102102

103103
// Clean up CRD
104-
IgnoreError(kubeClient.ApiextensionsInterface().ApiextensionsV1().CustomResourceDefinitions().Delete(context.TODO(), crd.GetName(), metav1.DeleteOptions{}))
104+
IgnoreError(kubeClient.ApiextensionsInterface().ApiextensionsV1().CustomResourceDefinitions().Delete(context.Background(), crd.GetName(), metav1.DeleteOptions{}))
105105
})
106106

107107
When("CustomResourceDefinition is deleted", func() {
108108

109109
BeforeEach(func() {
110110
// Delete CRD
111111
Eventually(func() bool {
112-
err := kubeClient.ApiextensionsInterface().ApiextensionsV1().CustomResourceDefinitions().Delete(context.TODO(), crd.GetName(), metav1.DeleteOptions{})
112+
err := kubeClient.ApiextensionsInterface().ApiextensionsV1().CustomResourceDefinitions().Delete(context.Background(), crd.GetName(), metav1.DeleteOptions{})
113113
return k8serrors.IsNotFound(err)
114114
}).Should(BeTrue())
115115
})
@@ -223,12 +223,12 @@ var _ = Describe("Garbage collection for dependent resources", func() {
223223
// create all owners
224224
var err error
225225
Eventually(func() error {
226-
fetchedA, err = operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Create(context.TODO(), &ownerA, metav1.CreateOptions{})
226+
fetchedA, err = operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Create(context.Background(), &ownerA, metav1.CreateOptions{})
227227
return err
228228
}).Should(Succeed())
229229

230230
Eventually(func() error {
231-
fetchedB, err = operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Create(context.TODO(), &ownerB, metav1.CreateOptions{})
231+
fetchedB, err = operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Create(context.Background(), &ownerB, metav1.CreateOptions{})
232232
return err
233233
}).Should(Succeed())
234234

@@ -245,7 +245,7 @@ var _ = Describe("Garbage collection for dependent resources", func() {
245245

246246
// create ConfigMap dependent
247247
Eventually(func() error {
248-
_, err = kubeClient.KubernetesInterface().CoreV1().ConfigMaps(testNamespace).Create(context.TODO(), dependent, metav1.CreateOptions{})
248+
_, err = kubeClient.KubernetesInterface().CoreV1().ConfigMaps(testNamespace).Create(context.Background(), dependent, metav1.CreateOptions{})
249249
return err
250250
}).Should(Succeed(), "dependent could not be created")
251251

@@ -258,20 +258,20 @@ var _ = Describe("Garbage collection for dependent resources", func() {
258258
BeforeEach(func() {
259259
// delete ownerA in the foreground (to ensure any "blocking" dependents are deleted before ownerA)
260260
Eventually(func() bool {
261-
err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Delete(context.TODO(), fetchedA.GetName(), options)
261+
err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Delete(context.Background(), fetchedA.GetName(), options)
262262
return k8serrors.IsNotFound(err)
263263
}).Should(BeTrue())
264264

265265
// wait for deletion of ownerA
266266
Eventually(func() bool {
267-
_, err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Get(context.TODO(), ownerA.GetName(), metav1.GetOptions{})
267+
_, err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Get(context.Background(), ownerA.GetName(), metav1.GetOptions{})
268268
return k8serrors.IsNotFound(err)
269269
}).Should(BeTrue())
270270
})
271271

272272
It("should not have deleted the dependent since ownerB CSV is still present", func() {
273273
Eventually(func() error {
274-
_, err := kubeClient.KubernetesInterface().CoreV1().ConfigMaps(testNamespace).Get(context.TODO(), dependent.GetName(), metav1.GetOptions{})
274+
_, err := kubeClient.KubernetesInterface().CoreV1().ConfigMaps(testNamespace).Get(context.Background(), dependent.GetName(), metav1.GetOptions{})
275275
return err
276276
}).Should(Succeed(), "dependent deleted after one of the owner was deleted")
277277
ctx.Ctx().Logf("dependent still exists after one owner was deleted")
@@ -283,32 +283,32 @@ var _ = Describe("Garbage collection for dependent resources", func() {
283283
BeforeEach(func() {
284284
// delete ownerA in the foreground (to ensure any "blocking" dependents are deleted before ownerA)
285285
Eventually(func() bool {
286-
err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Delete(context.TODO(), fetchedA.GetName(), options)
286+
err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Delete(context.Background(), fetchedA.GetName(), options)
287287
return k8serrors.IsNotFound(err)
288288
}).Should(BeTrue())
289289

290290
// wait for deletion of ownerA
291291
Eventually(func() bool {
292-
_, err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Get(context.TODO(), ownerA.GetName(), metav1.GetOptions{})
292+
_, err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Get(context.Background(), ownerA.GetName(), metav1.GetOptions{})
293293
return k8serrors.IsNotFound(err)
294294
}).Should(BeTrue())
295295

296296
// delete ownerB in the foreground (to ensure any "blocking" dependents are deleted before ownerB)
297297
Eventually(func() bool {
298-
err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Delete(context.TODO(), fetchedB.GetName(), options)
298+
err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Delete(context.Background(), fetchedB.GetName(), options)
299299
return k8serrors.IsNotFound(err)
300300
}).Should(BeTrue())
301301

302302
// wait for deletion of ownerB
303303
Eventually(func() bool {
304-
_, err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Get(context.TODO(), ownerB.GetName(), metav1.GetOptions{})
304+
_, err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Get(context.Background(), ownerB.GetName(), metav1.GetOptions{})
305305
return k8serrors.IsNotFound(err)
306306
}).Should(BeTrue())
307307
})
308308

309309
It("should have deleted the dependent since both the owners were deleted", func() {
310310
Eventually(func() bool {
311-
_, err := kubeClient.KubernetesInterface().CoreV1().ConfigMaps(testNamespace).Get(context.TODO(), dependent.GetName(), metav1.GetOptions{})
311+
_, err := kubeClient.KubernetesInterface().CoreV1().ConfigMaps(testNamespace).Get(context.Background(), dependent.GetName(), metav1.GetOptions{})
312312
return k8serrors.IsNotFound(err)
313313
}).Should(BeTrue(), "expected dependency configmap would be properly garabage collected")
314314
ctx.Ctx().Logf("dependent successfully garbage collected after both owners were deleted")
@@ -352,7 +352,7 @@ var _ = Describe("Garbage collection for dependent resources", func() {
352352
}
353353

354354
Eventually(func() error {
355-
cs, err := operatorClient.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Create(context.TODO(), source, metav1.CreateOptions{})
355+
cs, err := operatorClient.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Create(context.Background(), source, metav1.CreateOptions{})
356356
if err != nil {
357357
return err
358358
}
@@ -394,25 +394,25 @@ var _ = Describe("Garbage collection for dependent resources", func() {
394394
BeforeEach(func() {
395395
// Delete subscription first
396396
Eventually(func() bool {
397-
err := operatorClient.OperatorsV1alpha1().Subscriptions(testNamespace).Delete(context.TODO(), subName, metav1.DeleteOptions{})
397+
err := operatorClient.OperatorsV1alpha1().Subscriptions(testNamespace).Delete(context.Background(), subName, metav1.DeleteOptions{})
398398
return k8serrors.IsNotFound(err)
399399
}).Should(BeTrue())
400400

401401
// wait for deletion
402402
Eventually(func() bool {
403-
_, err := operatorClient.OperatorsV1alpha1().Subscriptions(testNamespace).Get(context.TODO(), subName, metav1.GetOptions{})
403+
_, err := operatorClient.OperatorsV1alpha1().Subscriptions(testNamespace).Get(context.Background(), subName, metav1.GetOptions{})
404404
return k8serrors.IsNotFound(err)
405405
}).Should(BeTrue())
406406

407407
// Delete CSV
408408
Eventually(func() bool {
409-
err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Delete(context.TODO(), csvName, metav1.DeleteOptions{})
409+
err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Delete(context.Background(), csvName, metav1.DeleteOptions{})
410410
return k8serrors.IsNotFound(err)
411411
}).Should(BeTrue())
412412

413413
// wait for deletion
414414
Eventually(func() bool {
415-
_, err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Get(context.TODO(), csvName, metav1.GetOptions{})
415+
_, err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Get(context.Background(), csvName, metav1.GetOptions{})
416416
return k8serrors.IsNotFound(err)
417417
}).Should(BeTrue())
418418
})
@@ -467,7 +467,7 @@ var _ = Describe("Garbage collection for dependent resources", func() {
467467

468468
var err error
469469
Eventually(func() error {
470-
source, err = operatorClient.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Create(context.TODO(), source, metav1.CreateOptions{})
470+
source, err = operatorClient.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Create(context.Background(), source, metav1.CreateOptions{})
471471
return err
472472
}).Should(Succeed(), "could not create catalog source")
473473

@@ -500,13 +500,13 @@ var _ = Describe("Garbage collection for dependent resources", func() {
500500
BeforeEach(func() {
501501
Eventually(func() error {
502502
// update subscription first
503-
sub, err := operatorClient.OperatorsV1alpha1().Subscriptions(testNamespace).Get(context.TODO(), subName, metav1.GetOptions{})
503+
sub, err := operatorClient.OperatorsV1alpha1().Subscriptions(testNamespace).Get(context.Background(), subName, metav1.GetOptions{})
504504
if err != nil {
505505
return fmt.Errorf("could not get subscription")
506506
}
507507
// update channel on sub
508508
sub.Spec.Channel = upgradeChannelName
509-
_, err = operatorClient.OperatorsV1alpha1().Subscriptions(testNamespace).Update(context.TODO(), sub, metav1.UpdateOptions{})
509+
_, err = operatorClient.OperatorsV1alpha1().Subscriptions(testNamespace).Update(context.Background(), sub, metav1.UpdateOptions{})
510510
return err
511511
}).Should(Succeed(), "could not update subscription")
512512

@@ -522,7 +522,7 @@ var _ = Describe("Garbage collection for dependent resources", func() {
522522

523523
// Ensure the new csv is installed
524524
Eventually(func() error {
525-
_, err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Get(context.TODO(), newCSVname, metav1.GetOptions{})
525+
_, err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Get(context.Background(), newCSVname, metav1.GetOptions{})
526526
return err
527527
}).Should(BeNil())
528528
})
@@ -576,7 +576,7 @@ var _ = Describe("Garbage collection for dependent resources", func() {
576576

577577
var err error
578578
Eventually(func() error {
579-
source, err = operatorClient.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Create(context.TODO(), source, metav1.CreateOptions{})
579+
source, err = operatorClient.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Create(context.Background(), source, metav1.CreateOptions{})
580580
return err
581581
}).Should(Succeed())
582582

@@ -610,13 +610,13 @@ var _ = Describe("Garbage collection for dependent resources", func() {
610610
BeforeEach(func() {
611611
Eventually(func() error {
612612
// update subscription first
613-
sub, err := operatorClient.OperatorsV1alpha1().Subscriptions(testNamespace).Get(context.TODO(), subName, metav1.GetOptions{})
613+
sub, err := operatorClient.OperatorsV1alpha1().Subscriptions(testNamespace).Get(context.Background(), subName, metav1.GetOptions{})
614614
if err != nil {
615615
return fmt.Errorf("could not get subscription")
616616
}
617617
// update channel on sub
618618
sub.Spec.Channel = upgradeChannelName
619-
_, err = operatorClient.OperatorsV1alpha1().Subscriptions(testNamespace).Update(context.TODO(), sub, metav1.UpdateOptions{})
619+
_, err = operatorClient.OperatorsV1alpha1().Subscriptions(testNamespace).Update(context.Background(), sub, metav1.UpdateOptions{})
620620
return err
621621
}).Should(Succeed(), "could not update subscription")
622622

@@ -632,7 +632,7 @@ var _ = Describe("Garbage collection for dependent resources", func() {
632632

633633
// Ensure the new csv is installed
634634
Eventually(func() error {
635-
_, err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Get(context.TODO(), newCSVname, metav1.GetOptions{})
635+
_, err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Get(context.Background(), newCSVname, metav1.GetOptions{})
636636
return err
637637
}).Should(BeNil())
638638
})

0 commit comments

Comments
 (0)