Skip to content

Commit 981e620

Browse files
cbandycbandy
committed
Remove extra managers from Kubernetes tests
1 parent 5100cfc commit 981e620

File tree

8 files changed

+99
-241
lines changed

8 files changed

+99
-241
lines changed

‎internal/controller/postgrescluster/cluster_test.go‎

Lines changed: 28 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import (
3737
"k8s.io/apimachinery/pkg/runtime"
3838
"k8s.io/apimachinery/pkg/runtime/schema"
3939
"k8s.io/apimachinery/pkg/util/wait"
40+
"k8s.io/client-go/tools/record"
4041
"sigs.k8s.io/controller-runtime/pkg/client"
41-
"sigs.k8s.io/controller-runtime/pkg/manager"
4242
"sigs.k8s.io/controller-runtime/pkg/reconcile"
4343

4444
"github.com/crunchydata/postgres-operator/internal/initialize"
@@ -94,19 +94,16 @@ var gvks = []schema.GroupVersionKind{{
9494
}}
9595

9696
func TestCustomLabels(t *testing.T) {
97-
env, cc := setupKubernetes(t)
97+
ctx := context.Background()
98+
_, cc := setupKubernetes(t)
9899
require.ParallelCapacity(t, 2)
99100

100-
reconciler := &Reconciler{}
101-
ctx, cancel := setupManager(t, env.Config, func(mgr manager.Manager) {
102-
reconciler = &Reconciler{
103-
Client: cc,
104-
Owner: client.FieldOwner(t.Name()),
105-
Recorder: mgr.GetEventRecorderFor(ControllerName),
106-
Tracer: otel.Tracer(t.Name()),
107-
}
108-
})
109-
t.Cleanup(func() { teardownManager(cancel, t) })
101+
reconciler := &Reconciler{
102+
Client: cc,
103+
Owner: client.FieldOwner(t.Name()),
104+
Recorder: new(record.FakeRecorder),
105+
Tracer: otel.Tracer(t.Name()),
106+
}
110107

111108
ns := setupNamespace(t, cc)
112109

@@ -350,19 +347,16 @@ func TestCustomLabels(t *testing.T) {
350347
}
351348

352349
func TestCustomAnnotations(t *testing.T) {
353-
env, cc := setupKubernetes(t)
350+
ctx := context.Background()
351+
_, cc := setupKubernetes(t)
354352
require.ParallelCapacity(t, 2)
355353

356-
reconciler := &Reconciler{}
357-
ctx, cancel := setupManager(t, env.Config, func(mgr manager.Manager) {
358-
reconciler = &Reconciler{
359-
Client: cc,
360-
Owner: client.FieldOwner(t.Name()),
361-
Recorder: mgr.GetEventRecorderFor(ControllerName),
362-
Tracer: otel.Tracer(t.Name()),
363-
}
364-
})
365-
t.Cleanup(func() { teardownManager(cancel, t) })
354+
reconciler := &Reconciler{
355+
Client: cc,
356+
Owner: client.FieldOwner(t.Name()),
357+
Recorder: new(record.FakeRecorder),
358+
Tracer: otel.Tracer(t.Name()),
359+
}
366360

367361
ns := setupNamespace(t, cc)
368362

@@ -611,22 +605,20 @@ func TestContainerSecurityContext(t *testing.T) {
611605
t.Skip("Test requires pods to be created")
612606
}
613607

608+
ctx := context.Background()
614609
env, cc := setupKubernetes(t)
615610
require.ParallelCapacity(t, 1)
616611

617-
reconciler := &Reconciler{}
618-
ctx, cancel := setupManager(t, env.Config, func(mgr manager.Manager) {
619-
reconciler = &Reconciler{
620-
Client: cc,
621-
Owner: client.FieldOwner(t.Name()),
622-
Recorder: mgr.GetEventRecorderFor(ControllerName),
623-
Tracer: otel.Tracer(t.Name()),
624-
}
625-
podExec, err := newPodExecutor(env.Config)
626-
assert.NilError(t, err)
627-
reconciler.PodExec = podExec
628-
})
629-
t.Cleanup(func() { teardownManager(cancel, t) })
612+
reconciler := &Reconciler{
613+
Client: cc,
614+
Owner: client.FieldOwner(t.Name()),
615+
Recorder: new(record.FakeRecorder),
616+
Tracer: otel.Tracer(t.Name()),
617+
}
618+
619+
var err error
620+
reconciler.PodExec, err = newPodExecutor(env.Config)
621+
assert.NilError(t, err)
630622

631623
cluster := testCluster()
632624
cluster.Namespace = setupNamespace(t, cc).Name

‎internal/controller/postgrescluster/controller_ref_manager_test.go‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,34 +19,24 @@ package postgrescluster
1919
*/
2020

2121
import (
22+
"context"
2223
"testing"
2324

24-
"go.opentelemetry.io/otel"
2525
appsv1 "k8s.io/api/apps/v1"
2626
corev1 "k8s.io/api/core/v1"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"sigs.k8s.io/controller-runtime/pkg/client"
29-
"sigs.k8s.io/controller-runtime/pkg/manager"
3029

3130
"github.com/crunchydata/postgres-operator/internal/naming"
3231
"github.com/crunchydata/postgres-operator/internal/testing/require"
3332
)
3433

3534
func TestManageControllerRefs(t *testing.T) {
36-
tEnv, tClient := setupKubernetes(t)
35+
_, tClient := setupKubernetes(t)
3736
require.ParallelCapacity(t, 1)
3837

39-
r := &Reconciler{}
40-
ctx, cancel := setupManager(t, tEnv.Config, func(mgr manager.Manager) {
41-
r = &Reconciler{
42-
Client: mgr.GetClient(),
43-
Recorder: mgr.GetEventRecorderFor(ControllerName),
44-
Tracer: otel.Tracer(ControllerName),
45-
Owner: ControllerName,
46-
}
47-
})
48-
t.Cleanup(func() { teardownManager(cancel, t) })
49-
38+
ctx := context.Background()
39+
r := &Reconciler{Client: tClient}
5040
clusterName := "hippo"
5141

5242
cluster := testCluster()

‎internal/controller/postgrescluster/instance_test.go‎

Lines changed: 22 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ import (
4545
"k8s.io/apimachinery/pkg/types"
4646
"k8s.io/apimachinery/pkg/util/intstr"
4747
"k8s.io/apimachinery/pkg/util/wait"
48+
"k8s.io/client-go/tools/record"
4849
"sigs.k8s.io/controller-runtime/pkg/client"
49-
"sigs.k8s.io/controller-runtime/pkg/manager"
5050
"sigs.k8s.io/controller-runtime/pkg/reconcile"
5151

5252
"github.com/crunchydata/postgres-operator/internal/initialize"
@@ -1100,19 +1100,16 @@ func TestPodsToKeep(t *testing.T) {
11001100
}
11011101

11021102
func TestDeleteInstance(t *testing.T) {
1103-
env, cc := setupKubernetes(t)
1103+
ctx := context.Background()
1104+
_, cc := setupKubernetes(t)
11041105
require.ParallelCapacity(t, 1)
11051106

1106-
reconciler := &Reconciler{}
1107-
ctx, cancel := setupManager(t, env.Config, func(mgr manager.Manager) {
1108-
reconciler = &Reconciler{
1109-
Client: cc,
1110-
Owner: client.FieldOwner(t.Name()),
1111-
Recorder: mgr.GetEventRecorderFor(ControllerName),
1112-
Tracer: otel.Tracer(t.Name()),
1113-
}
1114-
})
1115-
t.Cleanup(func() { teardownManager(cancel, t) })
1107+
reconciler := &Reconciler{
1108+
Client: cc,
1109+
Owner: client.FieldOwner(t.Name()),
1110+
Recorder: new(record.FakeRecorder),
1111+
Tracer: otel.Tracer(t.Name()),
1112+
}
11161113

11171114
// Define, Create, and Reconcile a cluster to get an instance running in kube
11181115
cluster := testCluster()
@@ -1706,21 +1703,17 @@ func TestFindAvailableInstanceNames(t *testing.T) {
17061703
}
17071704

17081705
func TestReconcileUpgrade(t *testing.T) {
1709-
tEnv, tClient := setupKubernetes(t)
1706+
ctx := context.Background()
1707+
_, tClient := setupKubernetes(t)
17101708

17111709
// TODO(cbandy): Assume this should run alone for now.
17121710
require.ParallelCapacity(t, 99)
17131711

1714-
r := &Reconciler{}
1715-
ctx, cancel := setupManager(t, tEnv.Config, func(mgr manager.Manager) {
1716-
r = &Reconciler{
1717-
Client: mgr.GetClient(),
1718-
Recorder: mgr.GetEventRecorderFor(ControllerName),
1719-
Tracer: otel.Tracer(ControllerName),
1720-
Owner: ControllerName,
1721-
}
1722-
})
1723-
t.Cleanup(func() { teardownManager(cancel, t) })
1712+
r := &Reconciler{
1713+
Client: tClient,
1714+
Recorder: new(record.FakeRecorder),
1715+
Owner: client.FieldOwner(t.Name()),
1716+
}
17241717

17251718
ns := setupNamespace(t, tClient)
17261719
sa := &corev1.ServiceAccount{
@@ -2051,22 +2044,13 @@ func TestReconcileUpgrade(t *testing.T) {
20512044
}
20522045

20532046
func TestObserveUpgradeEnv(t *testing.T) {
2054-
tEnv, tClient := setupKubernetes(t)
2047+
ctx := context.Background()
2048+
_, tClient := setupKubernetes(t)
20552049

20562050
// TODO(cbandy): Assume this should run alone for now.
20572051
require.ParallelCapacity(t, 99)
20582052

2059-
r := &Reconciler{}
2060-
ctx, cancel := setupManager(t, tEnv.Config, func(mgr manager.Manager) {
2061-
r = &Reconciler{
2062-
Client: tClient,
2063-
Recorder: mgr.GetEventRecorderFor(ControllerName),
2064-
Tracer: otel.Tracer(ControllerName),
2065-
Owner: ControllerName,
2066-
}
2067-
})
2068-
t.Cleanup(func() { teardownManager(cancel, t) })
2069-
2053+
r := &Reconciler{Client: tClient, Owner: client.FieldOwner(t.Name())}
20702054
namespace := setupNamespace(t, tClient).Name
20712055

20722056
generateJob := func(clusterName string, completed, failed *bool) *batchv1.Job {
@@ -2274,22 +2258,13 @@ func TestObserveUpgradeEnv(t *testing.T) {
22742258
}
22752259

22762260
func TestPrepareForUpgrade(t *testing.T) {
2277-
tEnv, tClient := setupKubernetes(t)
2261+
ctx := context.Background()
2262+
_, tClient := setupKubernetes(t)
22782263

22792264
// TODO(cbandy): Assume this should run alone for now.
22802265
require.ParallelCapacity(t, 99)
22812266

2282-
r := &Reconciler{}
2283-
ctx, cancel := setupManager(t, tEnv.Config, func(mgr manager.Manager) {
2284-
r = &Reconciler{
2285-
Client: tClient,
2286-
Recorder: mgr.GetEventRecorderFor(ControllerName),
2287-
Tracer: otel.Tracer(ControllerName),
2288-
Owner: ControllerName,
2289-
}
2290-
})
2291-
t.Cleanup(func() { teardownManager(cancel, t) })
2292-
2267+
r := &Reconciler{Client: tClient, Owner: client.FieldOwner(t.Name())}
22932268
ns := setupNamespace(t, tClient)
22942269

22952270
generateJob := func(clusterName string) *batchv1.Job {

‎internal/controller/postgrescluster/patroni_test.go‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,13 @@ import (
2929
"time"
3030

3131
"github.com/pkg/errors"
32-
"go.opentelemetry.io/otel"
3332
"gotest.tools/v3/assert"
3433
appsv1 "k8s.io/api/apps/v1"
3534
corev1 "k8s.io/api/core/v1"
3635
apierrors "k8s.io/apimachinery/pkg/api/errors"
3736
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3837
"k8s.io/apimachinery/pkg/types"
3938
"sigs.k8s.io/controller-runtime/pkg/client"
40-
"sigs.k8s.io/controller-runtime/pkg/manager"
4139
"sigs.k8s.io/controller-runtime/pkg/reconcile"
4240

4341
"github.com/crunchydata/postgres-operator/internal/initialize"
@@ -234,19 +232,11 @@ func TestPatroniReplicationSecret(t *testing.T) {
234232
t.Skip("USE_EXISTING_CLUSTER: Test fails due to garbage collection")
235233
}
236234

237-
tEnv, tClient := setupKubernetes(t)
235+
_, tClient := setupKubernetes(t)
238236
require.ParallelCapacity(t, 0)
239237

240-
r := &Reconciler{}
241-
ctx, cancel := setupManager(t, tEnv.Config, func(mgr manager.Manager) {
242-
r = &Reconciler{
243-
Client: tClient,
244-
Recorder: mgr.GetEventRecorderFor(ControllerName),
245-
Tracer: otel.Tracer(ControllerName),
246-
Owner: ControllerName,
247-
}
248-
})
249-
t.Cleanup(func() { teardownManager(cancel, t) })
238+
ctx := context.Background()
239+
r := &Reconciler{Client: tClient, Owner: client.FieldOwner(t.Name())}
250240

251241
// test postgrescluster values
252242
var (

0 commit comments

Comments
 (0)