Skip to content

Commit 154a58f

Browse files
frittenthekefrittentheke
committed
Adapt cluster tests to new function sigurature with eventRecord (via NewFakeRecorder)
1 parent 97c20de commit 154a58f

File tree

4 files changed

+25
-17
lines changed

4 files changed

+25
-17
lines changed

‎pkg/cluster/cluster_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/zalando/postgres-operator/pkg/util/k8sutil"
1414
"github.com/zalando/postgres-operator/pkg/util/teams"
1515
v1 "k8s.io/api/core/v1"
16+
"k8s.io/client-go/tools/record"
1617
)
1718

1819
const (
@@ -21,6 +22,8 @@ const (
2122
)
2223

2324
var logger = logrus.New().WithField("test", "cluster")
25+
var eventRecorder = record.NewFakeRecorder(1)
26+
2427
var cl = New(
2528
Config{
2629
OpConfig: config.Config{
@@ -34,6 +37,7 @@ var cl = New(
3437
k8sutil.NewMockKubernetesClient(),
3538
acidv1.Postgresql{},
3639
logger,
40+
eventRecorder,
3741
)
3842

3943
func TestInitRobotUsers(t *testing.T) {

‎pkg/cluster/k8sres_test.go

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestGenerateSpiloJSONConfiguration(t *testing.T) {
3737
ReplicationUsername: replicationUserName,
3838
},
3939
},
40-
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger)
40+
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger, eventRecorder)
4141

4242
testName := "TestGenerateSpiloConfig"
4343
tests := []struct {
@@ -102,7 +102,7 @@ func TestCreateLoadBalancerLogic(t *testing.T) {
102102
ReplicationUsername: replicationUserName,
103103
},
104104
},
105-
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger)
105+
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger, eventRecorder)
106106

107107
testName := "TestCreateLoadBalancerLogic"
108108
tests := []struct {
@@ -164,7 +164,8 @@ func TestGeneratePodDisruptionBudget(t *testing.T) {
164164
acidv1.Postgresql{
165165
ObjectMeta: metav1.ObjectMeta{Name: "myapp-database", Namespace: "myapp"},
166166
Spec: acidv1.PostgresSpec{TeamID: "myapp", NumberOfInstances: 3}},
167-
logger),
167+
logger,
168+
eventRecorder),
168169
policyv1beta1.PodDisruptionBudget{
169170
ObjectMeta: metav1.ObjectMeta{
170171
Name: "postgres-myapp-database-pdb",
@@ -187,7 +188,8 @@ func TestGeneratePodDisruptionBudget(t *testing.T) {
187188
acidv1.Postgresql{
188189
ObjectMeta: metav1.ObjectMeta{Name: "myapp-database", Namespace: "myapp"},
189190
Spec: acidv1.PostgresSpec{TeamID: "myapp", NumberOfInstances: 0}},
190-
logger),
191+
logger,
192+
eventRecorder),
191193
policyv1beta1.PodDisruptionBudget{
192194
ObjectMeta: metav1.ObjectMeta{
193195
Name: "postgres-myapp-database-pdb",
@@ -210,7 +212,8 @@ func TestGeneratePodDisruptionBudget(t *testing.T) {
210212
acidv1.Postgresql{
211213
ObjectMeta: metav1.ObjectMeta{Name: "myapp-database", Namespace: "myapp"},
212214
Spec: acidv1.PostgresSpec{TeamID: "myapp", NumberOfInstances: 3}},
213-
logger),
215+
logger,
216+
eventRecorder),
214217
policyv1beta1.PodDisruptionBudget{
215218
ObjectMeta: metav1.ObjectMeta{
216219
Name: "postgres-myapp-database-pdb",
@@ -233,7 +236,8 @@ func TestGeneratePodDisruptionBudget(t *testing.T) {
233236
acidv1.Postgresql{
234237
ObjectMeta: metav1.ObjectMeta{Name: "myapp-database", Namespace: "myapp"},
235238
Spec: acidv1.PostgresSpec{TeamID: "myapp", NumberOfInstances: 3}},
236-
logger),
239+
logger,
240+
eventRecorder),
237241
policyv1beta1.PodDisruptionBudget{
238242
ObjectMeta: metav1.ObjectMeta{
239243
Name: "postgres-myapp-database-databass-budget",
@@ -368,7 +372,7 @@ func TestCloneEnv(t *testing.T) {
368372
ReplicationUsername: replicationUserName,
369373
},
370374
},
371-
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger)
375+
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger, eventRecorder)
372376

373377
for _, tt := range tests {
374378
envs := cluster.generateCloneEnvironment(tt.cloneOpts)
@@ -502,7 +506,7 @@ func TestGetPgVersion(t *testing.T) {
502506
ReplicationUsername: replicationUserName,
503507
},
504508
},
505-
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger)
509+
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger, eventRecorder)
506510

507511
for _, tt := range tests {
508512
pgVersion, err := cluster.getNewPgVersion(tt.pgContainer, tt.newPgVersion)
@@ -678,7 +682,7 @@ func TestConnectionPoolerPodSpec(t *testing.T) {
678682
ConnectionPoolerDefaultMemoryLimit: "100Mi",
679683
},
680684
},
681-
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger)
685+
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger, eventRecorder)
682686

683687
var clusterNoDefaultRes = New(
684688
Config{
@@ -690,7 +694,7 @@ func TestConnectionPoolerPodSpec(t *testing.T) {
690694
},
691695
ConnectionPooler: config.ConnectionPooler{},
692696
},
693-
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger)
697+
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger, eventRecorder)
694698

695699
noCheck := func(cluster *Cluster, podSpec *v1.PodTemplateSpec) error { return nil }
696700

@@ -803,7 +807,7 @@ func TestConnectionPoolerDeploymentSpec(t *testing.T) {
803807
ConnectionPoolerDefaultMemoryLimit: "100Mi",
804808
},
805809
},
806-
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger)
810+
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger, eventRecorder)
807811
cluster.Statefulset = &appsv1.StatefulSet{
808812
ObjectMeta: metav1.ObjectMeta{
809813
Name: "test-sts",
@@ -904,7 +908,7 @@ func TestConnectionPoolerServiceSpec(t *testing.T) {
904908
ConnectionPoolerDefaultMemoryLimit: "100Mi",
905909
},
906910
},
907-
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger)
911+
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger, eventRecorder)
908912
cluster.Statefulset = &appsv1.StatefulSet{
909913
ObjectMeta: metav1.ObjectMeta{
910914
Name: "test-sts",
@@ -990,7 +994,7 @@ func TestTLS(t *testing.T) {
990994
SpiloFSGroup: &spiloFSGroup,
991995
},
992996
},
993-
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger)
997+
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger, eventRecorder)
994998
spec = makeSpec(acidv1.TLSDescription{SecretName: "my-secret", CAFile: "ca.crt"})
995999
s, err := cluster.generateStatefulSet(&spec)
9961000
if err != nil {
@@ -1112,7 +1116,7 @@ func TestAdditionalVolume(t *testing.T) {
11121116
ReplicationUsername: replicationUserName,
11131117
},
11141118
},
1115-
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger)
1119+
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger, eventRecorder)
11161120

11171121
for _, tt := range tests {
11181122
// Test with additional volume mounted in all containers

‎pkg/cluster/resources_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestConnectionPoolerCreationAndDeletion(t *testing.T) {
3636
ConnectionPoolerDefaultMemoryLimit: "100Mi",
3737
},
3838
},
39-
}, k8sutil.NewMockKubernetesClient(), acidv1.Postgresql{}, logger)
39+
}, k8sutil.NewMockKubernetesClient(), acidv1.Postgresql{}, logger, eventRecorder)
4040

4141
cluster.Statefulset = &appsv1.StatefulSet{
4242
ObjectMeta: metav1.ObjectMeta{
@@ -85,7 +85,7 @@ func TestNeedConnectionPooler(t *testing.T) {
8585
ConnectionPoolerDefaultMemoryLimit: "100Mi",
8686
},
8787
},
88-
}, k8sutil.NewMockKubernetesClient(), acidv1.Postgresql{}, logger)
88+
}, k8sutil.NewMockKubernetesClient(), acidv1.Postgresql{}, logger, eventRecorder)
8989

9090
cluster.Spec = acidv1.PostgresSpec{
9191
ConnectionPooler: &acidv1.ConnectionPooler{},

‎pkg/cluster/sync_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func TestConnectionPoolerSynchronization(t *testing.T) {
7979
NumberOfInstances: int32ToPointer(1),
8080
},
8181
},
82-
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger)
82+
}, k8sutil.KubernetesClient{}, acidv1.Postgresql{}, logger, eventRecorder)
8383

8484
cluster.Statefulset = &appsv1.StatefulSet{
8585
ObjectMeta: metav1.ObjectMeta{

0 commit comments

Comments
 (0)