Skip to content

Commit bf3395e

Browse files
timflannagantimflannagan
committed
test/e2e: Replace context.TODO() with context.Background()
1 parent f0d3d26 commit bf3395e

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
})
@@ -220,12 +220,12 @@ var _ = Describe("Garbage collection for dependent resources", func() {
220220
// create all owners
221221
var err error
222222
Eventually(func() error {
223-
fetchedA, err = operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Create(context.TODO(), &ownerA, metav1.CreateOptions{})
223+
fetchedA, err = operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Create(context.Background(), &ownerA, metav1.CreateOptions{})
224224
return err
225225
}).Should(Succeed())
226226

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

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

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

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

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

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

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

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

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

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

351351
Eventually(func() error {
352-
cs, err := operatorClient.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Create(context.TODO(), source, metav1.CreateOptions{})
352+
cs, err := operatorClient.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Create(context.Background(), source, metav1.CreateOptions{})
353353
if err != nil {
354354
return err
355355
}
@@ -391,25 +391,25 @@ var _ = Describe("Garbage collection for dependent resources", func() {
391391
BeforeEach(func() {
392392
// Delete subscription first
393393
Eventually(func() bool {
394-
err := operatorClient.OperatorsV1alpha1().Subscriptions(testNamespace).Delete(context.TODO(), subName, metav1.DeleteOptions{})
394+
err := operatorClient.OperatorsV1alpha1().Subscriptions(testNamespace).Delete(context.Background(), subName, metav1.DeleteOptions{})
395395
return k8serrors.IsNotFound(err)
396396
}).Should(BeTrue())
397397

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

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

410410
// wait for deletion
411411
Eventually(func() bool {
412-
_, err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Get(context.TODO(), csvName, metav1.GetOptions{})
412+
_, err := operatorClient.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Get(context.Background(), csvName, metav1.GetOptions{})
413413
return k8serrors.IsNotFound(err)
414414
}).Should(BeTrue())
415415
})
@@ -464,7 +464,7 @@ var _ = Describe("Garbage collection for dependent resources", func() {
464464

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

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

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

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

574574
var err error
575575
Eventually(func() error {
576-
source, err = operatorClient.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Create(context.TODO(), source, metav1.CreateOptions{})
576+
source, err = operatorClient.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Create(context.Background(), source, metav1.CreateOptions{})
577577
return err
578578
}).Should(Succeed())
579579

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

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

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

0 commit comments

Comments
 (0)