diff --git a/testing/kuttl/e2e/cluster-pause/files/00-cluster-created.yaml b/testing/kuttl/e2e/cluster-pause/files/00-cluster-created.yaml index 5c867a7892..a5fe982b1a 100644 --- a/testing/kuttl/e2e/cluster-pause/files/00-cluster-created.yaml +++ b/testing/kuttl/e2e/cluster-pause/files/00-cluster-created.yaml @@ -3,19 +3,6 @@ kind: PostgresCluster metadata: name: cluster-pause status: - conditions: - - message: pgBackRest dedicated repository host is ready - reason: RepoHostReady - status: "True" - type: PGBackRestRepoHostReady - - message: pgBackRest replica create repo is ready for backups - reason: StanzaCreated - status: "True" - type: PGBackRestReplicaRepoReady - - message: pgBackRest replica creation is now possible - reason: RepoBackupComplete - status: "True" - type: PGBackRestReplicaCreate instances: - name: instance1 readyReplicas: 1 diff --git a/testing/kuttl/e2e/cluster-pause/files/00-create-cluster.yaml b/testing/kuttl/e2e/cluster-pause/files/00-create-cluster.yaml index abf7b9f4f2..9f687a1dfa 100644 --- a/testing/kuttl/e2e/cluster-pause/files/00-create-cluster.yaml +++ b/testing/kuttl/e2e/cluster-pause/files/00-create-cluster.yaml @@ -12,14 +12,3 @@ spec: resources: requests: storage: 1Gi - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: - accessModes: - - "ReadWriteOnce" - resources: - requests: - storage: 1Gi diff --git a/testing/kuttl/e2e/cluster-pause/files/01-cluster-paused.yaml b/testing/kuttl/e2e/cluster-pause/files/01-cluster-paused.yaml index ecd459d3e1..6776fc542b 100644 --- a/testing/kuttl/e2e/cluster-pause/files/01-cluster-paused.yaml +++ b/testing/kuttl/e2e/cluster-pause/files/01-cluster-paused.yaml @@ -4,18 +4,6 @@ metadata: name: cluster-pause status: conditions: - - message: pgBackRest dedicated repository host is ready - reason: RepoHostReady - status: "True" - type: PGBackRestRepoHostReady - - message: pgBackRest replica create repo is ready for backups - reason: StanzaCreated - status: "True" - type: PGBackRestReplicaRepoReady - - message: pgBackRest replica creation is now possible - reason: RepoBackupComplete - status: "True" - type: PGBackRestReplicaCreate - message: No spec changes will be applied and no other statuses will be updated. reason: Paused status: "False" diff --git a/testing/kuttl/e2e/cluster-pause/files/02-cluster-resumed.yaml b/testing/kuttl/e2e/cluster-pause/files/02-cluster-resumed.yaml index 1c90fe5f22..82062fb908 100644 --- a/testing/kuttl/e2e/cluster-pause/files/02-cluster-resumed.yaml +++ b/testing/kuttl/e2e/cluster-pause/files/02-cluster-resumed.yaml @@ -3,19 +3,6 @@ kind: PostgresCluster metadata: name: cluster-pause status: - conditions: - - message: pgBackRest dedicated repository host is ready - reason: RepoHostReady - status: "True" - type: PGBackRestRepoHostReady - - message: pgBackRest replica create repo is ready for backups - reason: StanzaCreated - status: "True" - type: PGBackRestReplicaRepoReady - - message: pgBackRest replica creation is now possible - reason: RepoBackupComplete - status: "True" - type: PGBackRestReplicaCreate instances: - name: instance1 readyReplicas: 1 diff --git a/testing/kuttl/e2e/cluster-start/files/00-cluster-created.yaml b/testing/kuttl/e2e/cluster-start/files/00-cluster-created.yaml index ecc6ab7fe8..4eebece89e 100644 --- a/testing/kuttl/e2e/cluster-start/files/00-cluster-created.yaml +++ b/testing/kuttl/e2e/cluster-start/files/00-cluster-created.yaml @@ -9,15 +9,6 @@ status: replicas: 1 updatedReplicas: 1 --- -apiVersion: batch/v1 -kind: Job -metadata: - labels: - postgres-operator.crunchydata.com/cluster: cluster-start - postgres-operator.crunchydata.com/pgbackrest-backup: replica-create -status: - succeeded: 1 ---- apiVersion: v1 kind: Service metadata: diff --git a/testing/kuttl/e2e/cluster-start/files/00-create-cluster.yaml b/testing/kuttl/e2e/cluster-start/files/00-create-cluster.yaml index a870d940f1..713cd14eb3 100644 --- a/testing/kuttl/e2e/cluster-start/files/00-create-cluster.yaml +++ b/testing/kuttl/e2e/cluster-start/files/00-create-cluster.yaml @@ -12,14 +12,3 @@ spec: resources: requests: storage: 1Gi - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: - accessModes: - - "ReadWriteOnce" - resources: - requests: - storage: 1Gi diff --git a/testing/kuttl/e2e/exporter-custom-queries/files/exporter-custom-queries-cluster.yaml b/testing/kuttl/e2e/exporter-custom-queries/files/exporter-custom-queries-cluster.yaml index 6ff8ed5e67..5356b83be9 100644 --- a/testing/kuttl/e2e/exporter-custom-queries/files/exporter-custom-queries-cluster.yaml +++ b/testing/kuttl/e2e/exporter-custom-queries/files/exporter-custom-queries-cluster.yaml @@ -7,12 +7,6 @@ spec: instances: - name: instance1 dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } monitoring: pgmonitor: exporter: diff --git a/testing/kuttl/e2e/exporter-no-tls/files/exporter-no-tls-cluster.yaml b/testing/kuttl/e2e/exporter-no-tls/files/exporter-no-tls-cluster.yaml index 9cc6ec4877..690d5b505d 100644 --- a/testing/kuttl/e2e/exporter-no-tls/files/exporter-no-tls-cluster.yaml +++ b/testing/kuttl/e2e/exporter-no-tls/files/exporter-no-tls-cluster.yaml @@ -7,12 +7,6 @@ spec: instances: - name: instance1 dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } monitoring: pgmonitor: exporter: {} diff --git a/testing/kuttl/e2e/exporter-password-change/files/initial-postgrescluster.yaml b/testing/kuttl/e2e/exporter-password-change/files/initial-postgrescluster.yaml index e3fbb7b94a..d16c898ac2 100644 --- a/testing/kuttl/e2e/exporter-password-change/files/initial-postgrescluster.yaml +++ b/testing/kuttl/e2e/exporter-password-change/files/initial-postgrescluster.yaml @@ -7,12 +7,6 @@ spec: instances: - name: instance1 dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } monitoring: pgmonitor: exporter: {} diff --git a/testing/kuttl/e2e/exporter-tls/files/exporter-tls-cluster.yaml b/testing/kuttl/e2e/exporter-tls/files/exporter-tls-cluster.yaml index d445062bf3..4fa420664a 100644 --- a/testing/kuttl/e2e/exporter-tls/files/exporter-tls-cluster.yaml +++ b/testing/kuttl/e2e/exporter-tls/files/exporter-tls-cluster.yaml @@ -7,12 +7,6 @@ spec: instances: - name: instance1 dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } monitoring: pgmonitor: exporter: diff --git a/testing/kuttl/e2e/password-change/00--cluster.yaml b/testing/kuttl/e2e/password-change/00--cluster.yaml index 2777286880..d7b7019b62 100644 --- a/testing/kuttl/e2e/password-change/00--cluster.yaml +++ b/testing/kuttl/e2e/password-change/00--cluster.yaml @@ -12,14 +12,3 @@ spec: resources: requests: storage: 1Gi - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: - accessModes: - - "ReadWriteOnce" - resources: - requests: - storage: 1Gi diff --git a/testing/kuttl/e2e/pgadmin/01--cluster.yaml b/testing/kuttl/e2e/pgadmin/01--cluster.yaml index 2cc932c463..d1afb7be04 100644 --- a/testing/kuttl/e2e/pgadmin/01--cluster.yaml +++ b/testing/kuttl/e2e/pgadmin/01--cluster.yaml @@ -25,12 +25,6 @@ spec: - name: instance1 replicas: 1 dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } userInterface: pgAdmin: dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } diff --git a/testing/kuttl/e2e/pgbouncer/00--cluster.yaml b/testing/kuttl/e2e/pgbouncer/00--cluster.yaml index c83bfea9d3..4699d90171 100644 --- a/testing/kuttl/e2e/pgbouncer/00--cluster.yaml +++ b/testing/kuttl/e2e/pgbouncer/00--cluster.yaml @@ -7,14 +7,8 @@ spec: postgresVersion: ${KUTTL_PG_VERSION} instances: - name: instance1 - replicas: 2 + replicas: 1 dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } proxy: pgBouncer: replicas: 1 diff --git a/testing/kuttl/e2e/pgbouncer/00-assert.yaml b/testing/kuttl/e2e/pgbouncer/00-assert.yaml index afe492faa0..6c3a33079f 100644 --- a/testing/kuttl/e2e/pgbouncer/00-assert.yaml +++ b/testing/kuttl/e2e/pgbouncer/00-assert.yaml @@ -5,9 +5,9 @@ metadata: status: instances: - name: instance1 - readyReplicas: 2 - replicas: 2 - updatedReplicas: 2 + readyReplicas: 1 + replicas: 1 + updatedReplicas: 1 --- apiVersion: v1 kind: Service diff --git a/testing/kuttl/e2e/replica-read/00--cluster.yaml b/testing/kuttl/e2e/replica-read/00--cluster.yaml index a79666f4e1..c62f5418cd 100644 --- a/testing/kuttl/e2e/replica-read/00--cluster.yaml +++ b/testing/kuttl/e2e/replica-read/00--cluster.yaml @@ -13,14 +13,3 @@ spec: requests: storage: 1Gi replicas: 2 - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: - accessModes: - - "ReadWriteOnce" - resources: - requests: - storage: 1Gi diff --git a/testing/kuttl/e2e/root-cert-ownership/00--cluster.yaml b/testing/kuttl/e2e/root-cert-ownership/00--cluster.yaml index 461ae7ccba..2d23e1e3d3 100644 --- a/testing/kuttl/e2e/root-cert-ownership/00--cluster.yaml +++ b/testing/kuttl/e2e/root-cert-ownership/00--cluster.yaml @@ -9,12 +9,6 @@ spec: - name: instance1 replicas: 1 dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } --- apiVersion: postgres-operator.crunchydata.com/v1beta1 kind: PostgresCluster @@ -27,9 +21,3 @@ spec: - name: instance1 replicas: 1 dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } diff --git a/testing/kuttl/e2e/standalone-pgadmin-db-uri/files/00-cluster.yaml b/testing/kuttl/e2e/standalone-pgadmin-db-uri/files/00-cluster.yaml index a3b349844a..5f8678e5e9 100644 --- a/testing/kuttl/e2e/standalone-pgadmin-db-uri/files/00-cluster.yaml +++ b/testing/kuttl/e2e/standalone-pgadmin-db-uri/files/00-cluster.yaml @@ -9,9 +9,3 @@ spec: instances: - name: instance1 dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } diff --git a/testing/kuttl/e2e/standalone-pgadmin/files/02-cluster.yaml b/testing/kuttl/e2e/standalone-pgadmin/files/02-cluster.yaml index c1280caa01..d37cf895a2 100644 --- a/testing/kuttl/e2e/standalone-pgadmin/files/02-cluster.yaml +++ b/testing/kuttl/e2e/standalone-pgadmin/files/02-cluster.yaml @@ -9,9 +9,3 @@ spec: instances: - name: instance1 dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } diff --git a/testing/kuttl/e2e/standalone-pgadmin/files/04-cluster.yaml b/testing/kuttl/e2e/standalone-pgadmin/files/04-cluster.yaml index 63a44812e1..6ad5844c4a 100644 --- a/testing/kuttl/e2e/standalone-pgadmin/files/04-cluster.yaml +++ b/testing/kuttl/e2e/standalone-pgadmin/files/04-cluster.yaml @@ -9,9 +9,3 @@ spec: instances: - name: instance1 dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } diff --git a/testing/kuttl/e2e/standalone-pgadmin/files/06-cluster.yaml b/testing/kuttl/e2e/standalone-pgadmin/files/06-cluster.yaml index 40f60cf229..80e11eb957 100644 --- a/testing/kuttl/e2e/standalone-pgadmin/files/06-cluster.yaml +++ b/testing/kuttl/e2e/standalone-pgadmin/files/06-cluster.yaml @@ -9,9 +9,3 @@ spec: instances: - name: instance1 dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } diff --git a/testing/kuttl/e2e/standalone-pgadmin/files/11-cluster.yaml b/testing/kuttl/e2e/standalone-pgadmin/files/11-cluster.yaml index ec551d6e0f..b11b291d85 100644 --- a/testing/kuttl/e2e/standalone-pgadmin/files/11-cluster.yaml +++ b/testing/kuttl/e2e/standalone-pgadmin/files/11-cluster.yaml @@ -7,9 +7,3 @@ spec: instances: - name: instance1 dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } diff --git a/testing/kuttl/e2e/streaming-standby/01--primary-cluster.yaml b/testing/kuttl/e2e/streaming-standby/01--primary-cluster.yaml index cd0e05ac15..44d1386b59 100644 --- a/testing/kuttl/e2e/streaming-standby/01--primary-cluster.yaml +++ b/testing/kuttl/e2e/streaming-standby/01--primary-cluster.yaml @@ -11,9 +11,3 @@ spec: instances: - name: instance1 dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } diff --git a/testing/kuttl/e2e/streaming-standby/03--standby-cluster.yaml b/testing/kuttl/e2e/streaming-standby/03--standby-cluster.yaml index a3c542addb..ebe382041a 100644 --- a/testing/kuttl/e2e/streaming-standby/03--standby-cluster.yaml +++ b/testing/kuttl/e2e/streaming-standby/03--standby-cluster.yaml @@ -14,9 +14,3 @@ spec: instances: - name: instance1 dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } diff --git a/testing/kuttl/e2e/switchover/01--cluster.yaml b/testing/kuttl/e2e/switchover/01--cluster.yaml index 4b0d598ff1..4c91dd85ec 100644 --- a/testing/kuttl/e2e/switchover/01--cluster.yaml +++ b/testing/kuttl/e2e/switchover/01--cluster.yaml @@ -12,9 +12,3 @@ spec: instances: - replicas: 2 dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } diff --git a/testing/kuttl/e2e/tablespace-enabled/00--cluster.yaml b/testing/kuttl/e2e/tablespace-enabled/00--cluster.yaml index edeebeb8bb..ea69a7264f 100644 --- a/testing/kuttl/e2e/tablespace-enabled/00--cluster.yaml +++ b/testing/kuttl/e2e/tablespace-enabled/00--cluster.yaml @@ -39,14 +39,3 @@ spec: resources: requests: storage: 1Gi - backups: - pgbackrest: - repos: - - name: repo1 - volume: - volumeClaimSpec: - accessModes: - - "ReadWriteOnce" - resources: - requests: - storage: 1Gi diff --git a/testing/kuttl/e2e/tablespace-enabled/00-assert.yaml b/testing/kuttl/e2e/tablespace-enabled/00-assert.yaml index 9351766c4f..ad436fc892 100644 --- a/testing/kuttl/e2e/tablespace-enabled/00-assert.yaml +++ b/testing/kuttl/e2e/tablespace-enabled/00-assert.yaml @@ -9,15 +9,6 @@ status: replicas: 1 updatedReplicas: 1 --- -apiVersion: batch/v1 -kind: Job -metadata: - labels: - postgres-operator.crunchydata.com/cluster: tablespace-enabled - postgres-operator.crunchydata.com/pgbackrest-backup: replica-create -status: - succeeded: 1 ---- apiVersion: v1 kind: Service metadata: