Skip to content

Commit 02bd7a7

Browse files
authored
Fix failing envtest (#4260)
Since the introduction of k8s 1.34 as the envtest latest, some of our tests were failing due to missing elements of the statefulset spec (mostly). This PR fixes those tests by adding those elements. Issues: [PGO-2648]
1 parent 2b8d9ea commit 02bd7a7

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

internal/controller/postgrescluster/apply_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ func TestServerSideApply(t *testing.T) {
151151
MatchLabels: map[string]string{"select": name},
152152
}
153153
sts.Spec.Template.Labels = map[string]string{"select": name}
154+
sts.Spec.Template.Spec.Containers = []corev1.Container{{Name: "test", Image: "test"}}
154155
return &sts
155156
}
156157

internal/controller/postgrescluster/controller_ref_manager_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ func TestManageControllerRefs(t *testing.T) {
4646
ObjectMeta: metav1.ObjectMeta{
4747
Labels: map[string]string{"label1": "val1"},
4848
},
49+
Spec: corev1.PodSpec{
50+
Containers: []corev1.Container{{Name: "test", Image: "test"}},
51+
},
4952
},
5053
},
5154
}

internal/controller/postgrescluster/pgbackrest_test.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1707,7 +1707,9 @@ func TestGetPGBackRestResources(t *testing.T) {
17071707
ObjectMeta: metav1.ObjectMeta{
17081708
Labels: naming.PGBackRestDedicatedLabels(clusterName),
17091709
},
1710-
Spec: corev1.PodSpec{},
1710+
Spec: corev1.PodSpec{
1711+
Containers: []corev1.Container{{Name: "test", Image: "test"}},
1712+
},
17111713
},
17121714
},
17131715
},
@@ -1745,7 +1747,9 @@ func TestGetPGBackRestResources(t *testing.T) {
17451747
ObjectMeta: metav1.ObjectMeta{
17461748
Labels: naming.PGBackRestDedicatedLabels(clusterName),
17471749
},
1748-
Spec: corev1.PodSpec{},
1750+
Spec: corev1.PodSpec{
1751+
Containers: []corev1.Container{{Name: "test", Image: "test"}},
1752+
},
17491753
},
17501754
},
17511755
},
@@ -1781,7 +1785,9 @@ func TestGetPGBackRestResources(t *testing.T) {
17811785
ObjectMeta: metav1.ObjectMeta{
17821786
Labels: naming.PGBackRestDedicatedLabels(clusterName),
17831787
},
1784-
Spec: corev1.PodSpec{},
1788+
Spec: corev1.PodSpec{
1789+
Containers: []corev1.Container{{Name: "test", Image: "test"}},
1790+
},
17851791
},
17861792
},
17871793
},

internal/controller/standalone_pgadmin/statefulset_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ func TestReconcilePGAdminStatefulSet(t *testing.T) {
3737
pgadmin := new(v1beta1.PGAdmin)
3838
pgadmin.Name = "test-standalone-pgadmin"
3939
pgadmin.Namespace = ns.Name
40+
pgadmin.Spec.Image = initialize.String("test")
4041
require.UnmarshalInto(t, &pgadmin.Spec, `{
4142
dataVolumeClaimSpec: {
4243
accessModes: [ReadWriteOnce],
@@ -113,6 +114,7 @@ terminationGracePeriodSeconds: 30
113114
// add pod level customizations
114115
custompgadmin.Name = "custom-pgadmin"
115116
custompgadmin.Namespace = ns.Name
117+
custompgadmin.Spec.Image = initialize.String("test")
116118
require.UnmarshalInto(t, &custompgadmin.Spec, `{
117119
dataVolumeClaimSpec: {
118120
accessModes: [ReadWriteOnce],
@@ -231,7 +233,7 @@ tolerations:
231233
// add pod level customizations
232234
custompgadmin.Name = "custom-volumes"
233235
custompgadmin.Namespace = ns.Name
234-
236+
custompgadmin.Spec.Image = initialize.String("test")
235237
require.UnmarshalInto(t, &custompgadmin.Spec, `{
236238
dataVolumeClaimSpec: {
237239
accessModes: [ReadWriteOnce],

0 commit comments

Comments
 (0)