Skip to content

Commit 684fa21

Browse files
philrhurstphilrhurst
committed
refactored backupSelector
The way we defined the selector for backups was quite terse. This refactor simplifies the logic.
1 parent 2eefb50 commit 684fa21

File tree

1 file changed

+18
-65
lines changed

1 file changed

+18
-65
lines changed

‎testing/chainsaw/e2e/backup/chainsaw-test.yaml‎

Lines changed: 18 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ spec:
1212

1313
- name: backupSelector
1414
value: (join(',', [
15-
'postgres-operator.crunchydata.com/cluster=CLUSTER',
16-
'postgres-operator.crunchydata.com/pgbackrest-backup=BACKUP_TYPE',
15+
'postgres-operator.crunchydata.com/cluster=check-replica-create-backup',
16+
'postgres-operator.crunchydata.com/pgbackrest-backup=replica-create',
1717
'postgres-operator.crunchydata.com/pgbackrest-repo=repo1'
1818
]))
1919

@@ -47,11 +47,6 @@ spec:
4747
duration: 10s
4848

4949
- name: Verify COMMAND_OPTS matches "--stanza=db --repo=1"
50-
bindings:
51-
- name: selector
52-
value: (replace_all(
53-
(replace_all($backupSelector, 'CLUSTER', ($cluster))),
54-
'BACKUP_TYPE', 'replica-create'))
5550
try:
5651
- sleep:
5752
duration: 10s
@@ -62,7 +57,7 @@ spec:
6257
- name: "CLUSTER"
6358
value: ($cluster)
6459
- name: "SELECTOR"
65-
value: ($selector)
60+
value: ($backupSelector)
6661
entrypoint: kubectl
6762
args:
6863
- get
@@ -90,8 +85,8 @@ spec:
9085

9186
- name: backupSelector
9287
value: (join(',', [
93-
'postgres-operator.crunchydata.com/cluster=CLUSTER',
94-
'postgres-operator.crunchydata.com/pgbackrest-backup=BACKUP_TYPE',
88+
'postgres-operator.crunchydata.com/cluster=check-backup-command',
89+
'postgres-operator.crunchydata.com/pgbackrest-backup=manual',
9590
'postgres-operator.crunchydata.com/pgbackrest-repo=repo1'
9691
]))
9792

@@ -146,11 +141,6 @@ spec:
146141
duration: 10s
147142

148143
- name: Verify COMMAND_OPTS matches "--stanza=db --repo=1 --type=full"
149-
bindings:
150-
- name: selector
151-
value: (replace_all(
152-
(replace_all($backupSelector, 'CLUSTER', ($cluster))),
153-
'BACKUP_TYPE', 'manual'))
154144
try:
155145
- sleep:
156146
duration: 10s
@@ -161,7 +151,7 @@ spec:
161151
- name: "CLUSTER"
162152
value: ($cluster)
163153
- name: "SELECTOR"
164-
value: ($selector)
154+
value: ($backupSelector)
165155
entrypoint: kubectl
166156
args:
167157
- get
@@ -176,16 +166,11 @@ spec:
176166
($stdout): '"--stanza=db --repo=1 --type=full"'
177167

178168
- name: Wait for CLI backup to succeed"
179-
bindings:
180-
- name: selector
181-
value: (replace_all(
182-
(replace_all($backupSelector, 'CLUSTER', ($cluster))),
183-
'BACKUP_TYPE', 'manual'))
184169
try:
185170
- wait:
186171
apiVersion: v1
187172
kind: Pod
188-
selector: ($selector)
173+
selector: ($backupSelector)
189174
timeout: 300s
190175
for:
191176
jsonPath:
@@ -206,8 +191,8 @@ spec:
206191

207192
- name: backupSelector
208193
value: (join(',', [
209-
'postgres-operator.crunchydata.com/cluster=CLUSTER',
210-
'postgres-operator.crunchydata.com/pgbackrest-backup=BACKUP_TYPE',
194+
'postgres-operator.crunchydata.com/cluster=check-backup-command-longer-options',
195+
'postgres-operator.crunchydata.com/pgbackrest-backup=manual',
211196
'postgres-operator.crunchydata.com/pgbackrest-repo=repo1'
212197
]))
213198

@@ -257,11 +242,6 @@ spec:
257242
duration: 10s
258243

259244
- name: Verify COMMAND_OPTS matches "--stanza=db --repo=1 --type=full --start-fast=n"
260-
bindings:
261-
- name: selector
262-
value: (replace_all(
263-
(replace_all($backupSelector, 'CLUSTER', ($cluster))),
264-
'BACKUP_TYPE', 'manual'))
265245
try:
266246
- sleep:
267247
duration: 10s
@@ -272,7 +252,7 @@ spec:
272252
- name: "CLUSTER"
273253
value: ($cluster)
274254
- name: "SELECTOR"
275-
value: ($selector)
255+
value: ($backupSelector)
276256
entrypoint: kubectl
277257
args:
278258
- get
@@ -287,16 +267,11 @@ spec:
287267
($stdout): '"--stanza=db --repo=1 --type=full --start-fast=n"'
288268

289269
- name: Wait for CLI backup to succeed"
290-
bindings:
291-
- name: selector
292-
value: (replace_all(
293-
(replace_all($backupSelector, 'CLUSTER', ($cluster))),
294-
'BACKUP_TYPE', 'manual'))
295270
try:
296271
- wait:
297272
apiVersion: v1
298273
kind: Pod
299-
selector: ($selector)
274+
selector: ($backupSelector)
300275
timeout: 300s
301276
for:
302277
jsonPath:
@@ -317,8 +292,8 @@ spec:
317292

318293
- name: backupSelector
319294
value: (join(',', [
320-
'postgres-operator.crunchydata.com/cluster=CLUSTER',
321-
'postgres-operator.crunchydata.com/pgbackrest-backup=BACKUP_TYPE',
295+
'postgres-operator.crunchydata.com/cluster=check-backup-command-multiple-flags',
296+
'postgres-operator.crunchydata.com/pgbackrest-backup=manual',
322297
'postgres-operator.crunchydata.com/pgbackrest-repo=repo1'
323298
]))
324299

@@ -375,11 +350,6 @@ spec:
375350
duration: 10s
376351

377352
- name: Verify COMMAND_OPTS matches "--stanza=db --repo=1 --type=full --start-fast=n"
378-
bindings:
379-
- name: selector
380-
value: (replace_all(
381-
(replace_all($backupSelector, 'CLUSTER', ($cluster))),
382-
'BACKUP_TYPE', 'manual'))
383353
try:
384354
- sleep:
385355
duration: 10s
@@ -390,7 +360,7 @@ spec:
390360
- name: "CLUSTER"
391361
value: ($cluster)
392362
- name: "SELECTOR"
393-
value: ($selector)
363+
value: ($backupSelector)
394364
entrypoint: kubectl
395365
args:
396366
- get
@@ -405,16 +375,11 @@ spec:
405375
($stdout): '"--stanza=db --repo=1 --type=full --start-fast=n"'
406376

407377
- name: Wait for CLI backup to succeed"
408-
bindings:
409-
- name: selector
410-
value: (replace_all(
411-
(replace_all($backupSelector, 'CLUSTER', ($cluster))),
412-
'BACKUP_TYPE', 'manual'))
413378
try:
414379
- wait:
415380
apiVersion: v1
416381
kind: Pod
417-
selector: ($selector)
382+
selector: ($backupSelector)
418383
timeout: 300s
419384
for:
420385
jsonPath:
@@ -435,8 +400,8 @@ spec:
435400

436401
- name: backupSelector
437402
value: (join(',', [
438-
'postgres-operator.crunchydata.com/cluster=CLUSTER',
439-
'postgres-operator.crunchydata.com/pgbackrest-backup=BACKUP_TYPE',
403+
'postgres-operator.crunchydata.com/cluster=check-backup-command-no-flags',
404+
'postgres-operator.crunchydata.com/pgbackrest-backup=manual',
440405
'postgres-operator.crunchydata.com/pgbackrest-repo=repo1'
441406
]))
442407

@@ -567,16 +532,11 @@ spec:
567532
(key2 != 'not-found'): true
568533

569534
- name: Wait for CLI backup to succeed"
570-
bindings:
571-
- name: selector
572-
value: (replace_all(
573-
(replace_all($backupSelector, 'CLUSTER', ($cluster))),
574-
'BACKUP_TYPE', 'manual'))
575535
try:
576536
- wait:
577537
apiVersion: v1
578538
kind: Pod
579-
selector: ($selector)
539+
selector: ($backupSelector)
580540
timeout: 300s
581541
for:
582542
jsonPath:
@@ -595,13 +555,6 @@ spec:
595555
- name: postgresVersion
596556
value: (to_string($values.versions.postgres))
597557

598-
- name: backupSelector
599-
value: (join(',', [
600-
'postgres-operator.crunchydata.com/cluster=CLUSTER',
601-
'postgres-operator.crunchydata.com/pgbackrest-backup=BACKUP_TYPE',
602-
'postgres-operator.crunchydata.com/pgbackrest-repo=repo1'
603-
]))
604-
605558
steps:
606559

607560
- name: 'Create Cluster from manifest'

0 commit comments

Comments
 (0)