Skip to content

Commit e1c1b00

Browse files
authored
Speed up KUTTL tests by dropping backups (#3982)
* Speed up KUTTL tests by dropping backups Issues: [PGO-1572]
1 parent c316cf5 commit e1c1b00

File tree

26 files changed

+4
-211
lines changed

26 files changed

+4
-211
lines changed

testing/kuttl/e2e/cluster-pause/files/00-cluster-created.yaml

-13
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,6 @@ kind: PostgresCluster
33
metadata:
44
name: cluster-pause
55
status:
6-
conditions:
7-
- message: pgBackRest dedicated repository host is ready
8-
reason: RepoHostReady
9-
status: "True"
10-
type: PGBackRestRepoHostReady
11-
- message: pgBackRest replica create repo is ready for backups
12-
reason: StanzaCreated
13-
status: "True"
14-
type: PGBackRestReplicaRepoReady
15-
- message: pgBackRest replica creation is now possible
16-
reason: RepoBackupComplete
17-
status: "True"
18-
type: PGBackRestReplicaCreate
196
instances:
207
- name: instance1
218
readyReplicas: 1

testing/kuttl/e2e/cluster-pause/files/00-create-cluster.yaml

-11
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,3 @@ spec:
1212
resources:
1313
requests:
1414
storage: 1Gi
15-
backups:
16-
pgbackrest:
17-
repos:
18-
- name: repo1
19-
volume:
20-
volumeClaimSpec:
21-
accessModes:
22-
- "ReadWriteOnce"
23-
resources:
24-
requests:
25-
storage: 1Gi

testing/kuttl/e2e/cluster-pause/files/01-cluster-paused.yaml

-12
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,6 @@ metadata:
44
name: cluster-pause
55
status:
66
conditions:
7-
- message: pgBackRest dedicated repository host is ready
8-
reason: RepoHostReady
9-
status: "True"
10-
type: PGBackRestRepoHostReady
11-
- message: pgBackRest replica create repo is ready for backups
12-
reason: StanzaCreated
13-
status: "True"
14-
type: PGBackRestReplicaRepoReady
15-
- message: pgBackRest replica creation is now possible
16-
reason: RepoBackupComplete
17-
status: "True"
18-
type: PGBackRestReplicaCreate
197
- message: No spec changes will be applied and no other statuses will be updated.
208
reason: Paused
219
status: "False"

testing/kuttl/e2e/cluster-pause/files/02-cluster-resumed.yaml

-13
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,6 @@ kind: PostgresCluster
33
metadata:
44
name: cluster-pause
55
status:
6-
conditions:
7-
- message: pgBackRest dedicated repository host is ready
8-
reason: RepoHostReady
9-
status: "True"
10-
type: PGBackRestRepoHostReady
11-
- message: pgBackRest replica create repo is ready for backups
12-
reason: StanzaCreated
13-
status: "True"
14-
type: PGBackRestReplicaRepoReady
15-
- message: pgBackRest replica creation is now possible
16-
reason: RepoBackupComplete
17-
status: "True"
18-
type: PGBackRestReplicaCreate
196
instances:
207
- name: instance1
218
readyReplicas: 1

testing/kuttl/e2e/cluster-start/files/00-cluster-created.yaml

-9
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@ status:
99
replicas: 1
1010
updatedReplicas: 1
1111
---
12-
apiVersion: batch/v1
13-
kind: Job
14-
metadata:
15-
labels:
16-
postgres-operator.crunchydata.com/cluster: cluster-start
17-
postgres-operator.crunchydata.com/pgbackrest-backup: replica-create
18-
status:
19-
succeeded: 1
20-
---
2112
apiVersion: v1
2213
kind: Service
2314
metadata:

testing/kuttl/e2e/cluster-start/files/00-create-cluster.yaml

-11
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,3 @@ spec:
1212
resources:
1313
requests:
1414
storage: 1Gi
15-
backups:
16-
pgbackrest:
17-
repos:
18-
- name: repo1
19-
volume:
20-
volumeClaimSpec:
21-
accessModes:
22-
- "ReadWriteOnce"
23-
resources:
24-
requests:
25-
storage: 1Gi

testing/kuttl/e2e/exporter-custom-queries/files/exporter-custom-queries-cluster.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ spec:
77
instances:
88
- name: instance1
99
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
10-
backups:
11-
pgbackrest:
12-
repos:
13-
- name: repo1
14-
volume:
15-
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
1610
monitoring:
1711
pgmonitor:
1812
exporter:

testing/kuttl/e2e/exporter-no-tls/files/exporter-no-tls-cluster.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ spec:
77
instances:
88
- name: instance1
99
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
10-
backups:
11-
pgbackrest:
12-
repos:
13-
- name: repo1
14-
volume:
15-
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
1610
monitoring:
1711
pgmonitor:
1812
exporter: {}

testing/kuttl/e2e/exporter-password-change/files/initial-postgrescluster.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ spec:
77
instances:
88
- name: instance1
99
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
10-
backups:
11-
pgbackrest:
12-
repos:
13-
- name: repo1
14-
volume:
15-
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
1610
monitoring:
1711
pgmonitor:
1812
exporter: {}

testing/kuttl/e2e/exporter-tls/files/exporter-tls-cluster.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ spec:
77
instances:
88
- name: instance1
99
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
10-
backups:
11-
pgbackrest:
12-
repos:
13-
- name: repo1
14-
volume:
15-
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
1610
monitoring:
1711
pgmonitor:
1812
exporter:

testing/kuttl/e2e/password-change/00--cluster.yaml

-11
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,3 @@ spec:
1212
resources:
1313
requests:
1414
storage: 1Gi
15-
backups:
16-
pgbackrest:
17-
repos:
18-
- name: repo1
19-
volume:
20-
volumeClaimSpec:
21-
accessModes:
22-
- "ReadWriteOnce"
23-
resources:
24-
requests:
25-
storage: 1Gi

testing/kuttl/e2e/pgadmin/01--cluster.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@ spec:
2525
- name: instance1
2626
replicas: 1
2727
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
28-
backups:
29-
pgbackrest:
30-
repos:
31-
- name: repo1
32-
volume:
33-
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
3428
userInterface:
3529
pgAdmin:
3630
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }

testing/kuttl/e2e/pgbouncer/00--cluster.yaml

+1-7
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,8 @@ spec:
77
postgresVersion: ${KUTTL_PG_VERSION}
88
instances:
99
- name: instance1
10-
replicas: 2
10+
replicas: 1
1111
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
12-
backups:
13-
pgbackrest:
14-
repos:
15-
- name: repo1
16-
volume:
17-
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
1812
proxy:
1913
pgBouncer:
2014
replicas: 1

testing/kuttl/e2e/pgbouncer/00-assert.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ metadata:
55
status:
66
instances:
77
- name: instance1
8-
readyReplicas: 2
9-
replicas: 2
10-
updatedReplicas: 2
8+
readyReplicas: 1
9+
replicas: 1
10+
updatedReplicas: 1
1111
---
1212
apiVersion: v1
1313
kind: Service

testing/kuttl/e2e/replica-read/00--cluster.yaml

-11
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,3 @@ spec:
1313
requests:
1414
storage: 1Gi
1515
replicas: 2
16-
backups:
17-
pgbackrest:
18-
repos:
19-
- name: repo1
20-
volume:
21-
volumeClaimSpec:
22-
accessModes:
23-
- "ReadWriteOnce"
24-
resources:
25-
requests:
26-
storage: 1Gi

testing/kuttl/e2e/root-cert-ownership/00--cluster.yaml

-12
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ spec:
99
- name: instance1
1010
replicas: 1
1111
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
12-
backups:
13-
pgbackrest:
14-
repos:
15-
- name: repo1
16-
volume:
17-
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
1812
---
1913
apiVersion: postgres-operator.crunchydata.com/v1beta1
2014
kind: PostgresCluster
@@ -27,9 +21,3 @@ spec:
2721
- name: instance1
2822
replicas: 1
2923
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
30-
backups:
31-
pgbackrest:
32-
repos:
33-
- name: repo1
34-
volume:
35-
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }

testing/kuttl/e2e/standalone-pgadmin-db-uri/files/00-cluster.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,3 @@ spec:
99
instances:
1010
- name: instance1
1111
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
12-
backups:
13-
pgbackrest:
14-
repos:
15-
- name: repo1
16-
volume:
17-
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }

testing/kuttl/e2e/standalone-pgadmin/files/02-cluster.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,3 @@ spec:
99
instances:
1010
- name: instance1
1111
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
12-
backups:
13-
pgbackrest:
14-
repos:
15-
- name: repo1
16-
volume:
17-
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }

testing/kuttl/e2e/standalone-pgadmin/files/04-cluster.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,3 @@ spec:
99
instances:
1010
- name: instance1
1111
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
12-
backups:
13-
pgbackrest:
14-
repos:
15-
- name: repo1
16-
volume:
17-
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }

testing/kuttl/e2e/standalone-pgadmin/files/06-cluster.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,3 @@ spec:
99
instances:
1010
- name: instance1
1111
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
12-
backups:
13-
pgbackrest:
14-
repos:
15-
- name: repo1
16-
volume:
17-
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }

testing/kuttl/e2e/standalone-pgadmin/files/11-cluster.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,3 @@ spec:
77
instances:
88
- name: instance1
99
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
10-
backups:
11-
pgbackrest:
12-
repos:
13-
- name: repo1
14-
volume:
15-
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }

testing/kuttl/e2e/streaming-standby/01--primary-cluster.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,3 @@ spec:
1111
instances:
1212
- name: instance1
1313
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
14-
backups:
15-
pgbackrest:
16-
repos:
17-
- name: repo1
18-
volume:
19-
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }

testing/kuttl/e2e/streaming-standby/03--standby-cluster.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,3 @@ spec:
1414
instances:
1515
- name: instance1
1616
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
17-
backups:
18-
pgbackrest:
19-
repos:
20-
- name: repo1
21-
volume:
22-
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }

testing/kuttl/e2e/switchover/01--cluster.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,3 @@ spec:
1212
instances:
1313
- replicas: 2
1414
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
15-
backups:
16-
pgbackrest:
17-
repos:
18-
- name: repo1
19-
volume:
20-
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }

testing/kuttl/e2e/tablespace-enabled/00--cluster.yaml

-11
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,3 @@ spec:
3939
resources:
4040
requests:
4141
storage: 1Gi
42-
backups:
43-
pgbackrest:
44-
repos:
45-
- name: repo1
46-
volume:
47-
volumeClaimSpec:
48-
accessModes:
49-
- "ReadWriteOnce"
50-
resources:
51-
requests:
52-
storage: 1Gi

testing/kuttl/e2e/tablespace-enabled/00-assert.yaml

-9
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@ status:
99
replicas: 1
1010
updatedReplicas: 1
1111
---
12-
apiVersion: batch/v1
13-
kind: Job
14-
metadata:
15-
labels:
16-
postgres-operator.crunchydata.com/cluster: tablespace-enabled
17-
postgres-operator.crunchydata.com/pgbackrest-backup: replica-create
18-
status:
19-
succeeded: 1
20-
---
2112
apiVersion: v1
2213
kind: Service
2314
metadata:

0 commit comments

Comments
 (0)