Skip to content

Commit d4f30e2

Browse files
committed
fix unit tests
1 parent 8c32e2e commit d4f30e2

3 files changed

Lines changed: 9 additions & 8 deletions

File tree

internal/config/config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ func VerifyImageValues(cluster *v1beta1.PostgresCluster) error {
124124

125125
var images []string
126126

127+
// K8SPG-710: Image check will fail without a backup section in PostgresCluster
127128
if cluster.BackupSpecFound() && PGBackRestContainerImage(cluster) == "" {
128129
images = append(images, "crunchy-pgbackrest")
129130
}

internal/config/config_test.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,10 @@ func TestVerifyImageValues(t *testing.T) {
220220
verifyImageCheck(t, "RELATED_IMAGE_POSTGRES_14_GIS_3.3", "crunchy-postgres-gis", cluster)
221221
})
222222

223-
t.Run("crunchy-pgbackrest", func(t *testing.T) {
224-
verifyImageCheck(t, "RELATED_IMAGE_PGBACKREST", "crunchy-pgbackrest", cluster)
225-
})
223+
// K8SPG-710: Image check will fail without a backup section in PostgresCluster
224+
// t.Run("crunchy-pgbackrest", func(t *testing.T) {
225+
// verifyImageCheck(t, "RELATED_IMAGE_PGBACKREST", "crunchy-pgbackrest", cluster)
226+
// })
226227

227228
t.Run("crunchy-pgbouncer", func(t *testing.T) {
228229
cluster.Spec.Proxy = new(v1beta1.PostgresProxySpec)
@@ -246,7 +247,8 @@ func TestVerifyImageValues(t *testing.T) {
246247
t.Run("multiple images", func(t *testing.T) {
247248
err := VerifyImageValues(cluster)
248249
assert.ErrorContains(t, err, "crunchy-postgres-gis")
249-
assert.ErrorContains(t, err, "crunchy-pgbackrest")
250+
// K8SPG-710: Image check will fail without a backup section in PostgresCluster
251+
// assert.ErrorContains(t, err, "crunchy-pgbackrest")
250252
assert.ErrorContains(t, err, "crunchy-pgbouncer")
251253
assert.ErrorContains(t, err, "crunchy-pgadmin4")
252254
assert.ErrorContains(t, err, "crunchy-postgres-exporter")

pkg/apis/postgres-operator.crunchydata.com/v1beta1/postgrescluster_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ metadata:
4444
creationTimestamp: null
4545
spec:
4646
backups:
47-
pgbackrest:
48-
repos: null
47+
pgbackrest: {}
4948
config: {}
5049
extensions: {}
5150
instances: null
@@ -79,8 +78,7 @@ metadata:
7978
creationTimestamp: null
8079
spec:
8180
backups:
82-
pgbackrest:
83-
repos: null
81+
pgbackrest: {}
8482
config: {}
8583
extensions: {}
8684
instances:

0 commit comments

Comments
 (0)