fix api server timeouts during shutdown

Need to cancel the context. It is discussed in kubernetes-sigs/controller-runtime#1571 (comment).
jsanda · Oct 18, 2021 · 2f1f118 · 2f1f118
1 parent 2aa917d
commit 2f1f118
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/apis/config/v1beta1/zz_generated.deepcopy.go b/apis/config/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/k8ssandra/v1alpha1/zz_generated.deepcopy.go b/apis/k8ssandra/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/replication/v1alpha1/zz_generated.deepcopy.go b/apis/replication/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/stargate/v1alpha1/zz_generated.deepcopy.go b/apis/stargate/v1alpha1/zz_generated.deepcopy.go
diff --git a/controllers/k8ssandra/k8ssandracluster_controller_test.go b/controllers/k8ssandra/k8ssandracluster_controller_test.go
@@ -51,6 +51,7 @@ var (
 
 func TestK8ssandraCluster(t *testing.T) {
 	ctx := testutils.TestSetup(t)
+	ctx, cancel := context.WithCancel(ctx)
 	testEnv = &testutils.MultiClusterTestEnv{}
 	seedsResolver.callback = func(dc *cassdcapi.CassandraDatacenter) ([]string, error) {
 		return []string{}, nil
@@ -82,6 +83,7 @@ func TestK8ssandraCluster(t *testing.T) {
 	}
 
 	defer testEnv.Stop(t)
+	defer cancel()
 
 	t.Run("CreateSingleDcCluster", testEnv.ControllerTest(ctx, createSingleDcCluster))
 	t.Run("CreateMultiDcCluster", testEnv.ControllerTest(ctx, createMultiDcCluster))

diff --git a/controllers/replication/secret_controller_test.go b/controllers/replication/secret_controller_test.go
@@ -38,7 +38,7 @@ var (
 
 func TestSecretController(t *testing.T) {
 	ctx := testutils.TestSetup(t)
-	// ctx, cancel := context.WithCancel(ctx)
+	ctx, cancel := context.WithCancel(ctx)
 	testEnv = &testutils.MultiClusterTestEnv{}
 	err := testEnv.Start(ctx, t, func(mgr manager.Manager, clientCache *clientcache.ClientCache, clusters []cluster.Cluster) error {
 		return (&SecretSyncController{
@@ -51,7 +51,7 @@ func TestSecretController(t *testing.T) {
 	}
 
 	defer testEnv.Stop(t)
-	// defer cancel()
+	defer cancel()
 
 	// Secret controller tests
 	t.Run("SingleClusterDoNothingToSecretsTest", testEnv.ControllerTest(ctx, wrongClusterIgnoreCopy))

diff --git a/controllers/stargate/stargate_controller_test.go b/controllers/stargate/stargate_controller_test.go
@@ -29,6 +29,7 @@ const (
 
 func TestStargate(t *testing.T) {
 	ctx := testutils.TestSetup(t)
+	ctx, cancel := context.WithCancel(ctx)
 	testEnv := &testutils.TestEnv{}
 	err := testEnv.Start(ctx, t, func(mgr manager.Manager) error {
 		err := (&StargateReconciler{
@@ -43,6 +44,7 @@ func TestStargate(t *testing.T) {
 	}
 
 	defer testEnv.Stop(t)
+	defer cancel()
 
 	t.Run("CreateStargateSingleRack", func(t *testing.T) {
 		testCreateStargateSingleRack(t, testEnv.TestClient)