Skip to content

Commit 01c43f0

Browse files
timflannagantimflannagan
committed
test/e2e: Replace context.TODO() with context.Background()
1 parent b25b06f commit 01c43f0

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

0 commit comments

Comments
 (0)