Skip to content

Commit ab05108

Browse files
authored
Fix tests for k8s 1.31 (#891)
1 parent 8c828d1 commit ab05108

File tree

6 files changed

+27
-16
lines changed

6 files changed

+27
-16
lines changed

e2e-tests/tests/migration-backup-s3/00-assert.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,4 @@ metadata:
55
labels:
66
job-name: pgo-deploy
77
status:
8-
conditions:
9-
- type: Complete
10-
status: 'True'
118
succeeded: 1

e2e-tests/tests/migration-backup-s3/02-assert.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ metadata:
1313
pgouser: admin
1414
vendor: crunchydata
1515
status:
16-
conditions:
17-
- type: Complete
18-
status: 'True'
1916
succeeded: 1
2017
---
2118
kind: Deployment

e2e-tests/tests/migration-backup-s3/08-assert.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ timeout: 120
2121
metadata:
2222
name: check-operator-deploy-status
2323
commands:
24-
- script: kubectl assert exist-enhanced deployment percona-postgresql-operator -n ${OPERATOR_NS:-$NAMESPACE} --field-selector status.readyReplicas=1
24+
- script: kubectl assert exist-enhanced deployment percona-postgresql-operator -n ${OPERATOR_NS:-$NAMESPACE} --field-selector status.readyReplicas=1

e2e-tests/tests/monitoring/03-assert.yaml

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,29 @@ metadata:
7171
controller: true
7272
blockOwnerDeletion: true
7373
status:
74-
conditions:
75-
- type: Complete
76-
status: 'True'
7774
succeeded: 1
75+
---
76+
apiVersion: pgv2.percona.com/v2
77+
kind: PerconaPGBackup
78+
metadata:
79+
annotations:
80+
pgv2.percona.com/pgbackrest-backup-job-type: replica-create
81+
generation: 1
82+
spec:
83+
pgCluster: monitoring
84+
repoName: repo1
85+
status:
86+
backupType: full
87+
repo:
88+
name: repo1
89+
schedules:
90+
full: 0 0 * * 6
91+
volume:
92+
volumeClaimSpec:
93+
accessModes:
94+
- ReadWriteOnce
95+
resources:
96+
requests:
97+
storage: 1Gi
98+
state: Succeeded
99+
storageType: filesystem

e2e-tests/tests/scheduled-backup/04-assert.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ metadata:
1313
controller: true
1414
blockOwnerDeletion: true
1515
status:
16-
conditions:
17-
- type: Complete
18-
status: 'True'
1916
succeeded: 1
2017
---
2118
apiVersion: pgv2.percona.com/v2
@@ -28,6 +25,7 @@ spec:
2825
status:
2926
backupType: full
3027
state: Succeeded
28+
storageType: s3
3129
---
3230
apiVersion: pgv2.percona.com/v2
3331
kind: PerconaPGBackup

e2e-tests/tests/scheduled-backup/07-assert.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ metadata:
1313
controller: true
1414
blockOwnerDeletion: true
1515
status:
16-
conditions:
17-
- type: Complete
18-
status: 'True'
1916
succeeded: 1
2017
---
2118
apiVersion: pgv2.percona.com/v2

0 commit comments

Comments
 (0)