Skip to content

Commit de1adda

Browse files
committed
Fix some envtests:
Add required container name and image to statefulsets. Pin envtest k8s version to latest supported version (1.34).
1 parent 0bb7e47 commit de1adda

File tree

5 files changed

+43
-3
lines changed

5 files changed

+43
-3
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ GO_BUILD = $(GO) build
2020
GO_TEST ?= $(GO) test
2121
KUTTL ?= $(GO) run github.com/kudobuilder/kuttl/cmd/kubectl-kuttl@latest
2222
KUTTL_TEST ?= $(KUTTL) test
23+
ENVTEST_K8S_VERSION ?= 1.34
2324

2425
##@ General
2526

internal/controller/postgrescluster/apply_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,14 @@ 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 = corev1.PodSpec{
155+
Containers: []corev1.Container{
156+
{
157+
Name: "some-container",
158+
Image: "some-image",
159+
},
160+
},
161+
}
154162
return &sts
155163
}
156164

internal/controller/postgrescluster/controller_ref_manager_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,14 @@ 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{
51+
{
52+
Name: "some-container",
53+
Image: "some-image",
54+
},
55+
},
56+
},
4957
},
5058
},
5159
}

internal/controller/postgrescluster/pgbackrest_test.go

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1679,7 +1679,14 @@ func TestGetPGBackRestResources(t *testing.T) {
16791679
ObjectMeta: metav1.ObjectMeta{
16801680
Labels: naming.PGBackRestDedicatedLabels(clusterName),
16811681
},
1682-
Spec: corev1.PodSpec{},
1682+
Spec: corev1.PodSpec{
1683+
Containers: []corev1.Container{
1684+
{
1685+
Name: "some-container",
1686+
Image: "some-image",
1687+
},
1688+
},
1689+
},
16831690
},
16841691
},
16851692
},
@@ -1717,7 +1724,14 @@ func TestGetPGBackRestResources(t *testing.T) {
17171724
ObjectMeta: metav1.ObjectMeta{
17181725
Labels: naming.PGBackRestDedicatedLabels(clusterName),
17191726
},
1720-
Spec: corev1.PodSpec{},
1727+
Spec: corev1.PodSpec{
1728+
Containers: []corev1.Container{
1729+
{
1730+
Name: "some-container",
1731+
Image: "some-image",
1732+
},
1733+
},
1734+
},
17211735
},
17221736
},
17231737
},
@@ -1753,7 +1767,14 @@ func TestGetPGBackRestResources(t *testing.T) {
17531767
ObjectMeta: metav1.ObjectMeta{
17541768
Labels: naming.PGBackRestDedicatedLabels(clusterName),
17551769
},
1756-
Spec: corev1.PodSpec{},
1770+
Spec: corev1.PodSpec{
1771+
Containers: []corev1.Container{
1772+
{
1773+
Name: "some-container",
1774+
Image: "some-image",
1775+
},
1776+
},
1777+
},
17571778
},
17581779
},
17591780
},

internal/controller/standalone_pgadmin/statefulset_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ func TestReconcilePGAdminStatefulSet(t *testing.T) {
3535
pgadmin := new(v1beta1.PGAdmin)
3636
pgadmin.Name = "test-standalone-pgadmin"
3737
pgadmin.Namespace = ns.Name
38+
pgadmin.Spec.Image = initialize.String("some-image")
3839

3940
assert.NilError(t, cc.Create(ctx, pgadmin))
4041
t.Cleanup(func() { assert.Check(t, cc.Delete(ctx, pgadmin)) })
@@ -103,6 +104,7 @@ terminationGracePeriodSeconds: 30
103104
// add pod level customizations
104105
custompgadmin.Name = "custom-pgadmin"
105106
custompgadmin.Namespace = ns.Name
107+
custompgadmin.Spec.Image = initialize.String("some-image")
106108

107109
// annotation and label
108110
custompgadmin.Spec.Metadata = &v1beta1.Metadata{

0 commit comments

Comments
 (0)