Skip to content

Commit 969e017

Browse files
committed
context consistency: ensure all context are TODO()
1 parent 6fbe831 commit 969e017

7 files changed

Lines changed: 14 additions & 14 deletions

File tree

pkg/controller/deployment/deploment_helper_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ func TestGetOverrideResourcesFor(t *testing.T) {
334334
},
335335
}
336336

337-
ctx, cancel := context.WithCancel(context.Background())
337+
ctx, cancel := context.WithCancel(context.TODO())
338338
defer cancel()
339339

340340
// Create channel to know when the watch has started.
@@ -856,7 +856,7 @@ func TestGetOverrideSchedulingFor(t *testing.T) {
856856
},
857857
}
858858

859-
ctx, cancel := context.WithCancel(context.Background())
859+
ctx, cancel := context.WithCancel(context.TODO())
860860
defer cancel()
861861

862862
// Create channel to know when the watch has started.

pkg/operator/informers/externalversions/factory.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/e2e/cert_manager_deployment_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const (
3939
var testassets embed.FS
4040

4141
func TestSelfSignedCerts(t *testing.T) {
42-
ctx := context.Background()
42+
ctx := context.TODO()
4343
loader := library.NewDynamicResourceLoader(ctx, t)
4444

4545
ns, err := loader.CreateTestingNS("e2e-self-signed-cert")
@@ -68,7 +68,7 @@ func TestSelfSignedCerts(t *testing.T) {
6868
}
6969

7070
func TestACMECertsIngress(t *testing.T) {
71-
ctx := context.Background()
71+
ctx := context.TODO()
7272
loader := library.NewDynamicResourceLoader(ctx, t)
7373
config, err := library.GetConfigForTest(t)
7474
require.NoError(t, err)
@@ -154,7 +154,7 @@ func TestACMECertsIngress(t *testing.T) {
154154
}
155155

156156
func TestCertRenew(t *testing.T) {
157-
ctx := context.Background()
157+
ctx := context.TODO()
158158
loader := library.NewDynamicResourceLoader(ctx, t)
159159
config, err := library.GetConfigForTest(t)
160160
require.NoErrorf(t, err, "failed to fetch host configuration: %v", err)
@@ -307,7 +307,7 @@ func TestCertRenew(t *testing.T) {
307307
}
308308

309309
func TestContainerOverrides(t *testing.T) {
310-
ctx := context.Background()
310+
ctx := context.TODO()
311311
config, err := library.GetConfigForTest(t)
312312
require.NoError(t, err)
313313

test/e2e/certificates_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ var _ = Describe("ACME Certificate", Ordered, func() {
4040

4141
BeforeAll(func() {
4242
By("creating Kube clients")
43-
ctx = context.Background()
43+
ctx = context.TODO()
4444
var err error
4545
baseDomain, err = library.GetClusterBaseDomain(ctx, configClient)
4646
Expect(err).NotTo(HaveOccurred())
@@ -680,7 +680,7 @@ var _ = Describe("Self-signed Certificate", Ordered, func() {
680680
var ns *corev1.Namespace
681681

682682
BeforeAll(func() {
683-
ctx = context.Background()
683+
ctx = context.TODO()
684684

685685
By("creating a test namespace")
686686
namespace, err := loader.CreateTestingNS("e2e-self-signed-certs")

test/e2e/overrides_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var _ = Describe("Overrides test", Ordered, func() {
1919

2020
BeforeEach(func() {
2121
By("Reset cert-manager state")
22-
err := resetCertManagerState(context.Background(), certmanageroperatorclient, loader)
22+
err := resetCertManagerState(context.TODO(), certmanageroperatorclient, loader)
2323
Expect(err).NotTo(HaveOccurred())
2424

2525
By("Waiting for operator status to become available")
@@ -492,7 +492,7 @@ var _ = Describe("Overrides test", Ordered, func() {
492492

493493
AfterAll(func() {
494494
By("Reset cert-manager state")
495-
err := resetCertManagerState(context.Background(), certmanageroperatorclient, loader)
495+
err := resetCertManagerState(context.TODO(), certmanageroperatorclient, loader)
496496
Expect(err).NotTo(HaveOccurred())
497497

498498
By("Waiting for operator status to become available")

test/e2e/utils_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ func addOverrideScheduling(client *certmanoperatorclient.Clientset, deploymentNa
322322
// polling the deployment scheduling.
323323
func verifyDeploymentScheduling(k8sclient *kubernetes.Clientset, deploymentName string, res v1alpha1.CertManagerScheduling, added bool) error {
324324

325-
return wait.PollUntilContextTimeout(context.Background(), time.Second*10, time.Minute*5, true, func(context.Context) (done bool, err error) {
325+
return wait.PollUntilContextTimeout(context.TODO(), time.Second*10, time.Minute*5, true, func(context.Context) (done bool, err error) {
326326
controllerDeployment, err := k8sclient.AppsV1().Deployments(operandNamespace).Get(context.TODO(), deploymentName, v1.GetOptions{})
327327
if err != nil {
328328
if apierrors.IsNotFound(err) {

test/library/utils.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func (d DynamicResourceLoader) CreateTestingNS(namespacePrefix string) (*v1.Name
3131
var got *v1.Namespace
3232
if err := wait.PollImmediate(1*time.Second, 30*time.Second, func() (bool, error) {
3333
var err error
34-
got, err = d.KubeClient.CoreV1().Namespaces().Create(context.Background(), namespace, metav1.CreateOptions{})
34+
got, err = d.KubeClient.CoreV1().Namespaces().Create(context.TODO(), namespace, metav1.CreateOptions{})
3535
if err != nil {
3636
log.Printf("Error creating namespace: %v", err)
3737
return false, nil
@@ -44,7 +44,7 @@ func (d DynamicResourceLoader) CreateTestingNS(namespacePrefix string) (*v1.Name
4444
}
4545

4646
func (d DynamicResourceLoader) DeleteTestingNS(name string, shouldDumpEvents func() bool) (bool, error) {
47-
ctx := context.Background()
47+
ctx := context.TODO()
4848
if shouldDumpEvents() {
4949
d.DumpEventsInNamespace(name)
5050
}

0 commit comments

Comments
 (0)