Skip to content

Commit d541d8e

Browse files
pooknullpooknull
committed
Merge remote-tracking branch 'origin/main' into K8SPSMDB-1296
2 parents 01dedaa + 376231f commit d541d8e

File tree

116 files changed

+5624
-409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+5624
-409
lines changed

‎deploy/bundle.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25111,6 +25111,7 @@ kind: Deployment
2511125111
metadata:
2511225112
name: percona-server-mongodb-operator
2511325113
labels:
25114+
name: percona-server-mongodb-operator
2511425115
app.kubernetes.io/component: operator
2511525116
app.kubernetes.io/instance: percona-server-mongodb-operator
2511625117
app.kubernetes.io/name: percona-server-mongodb-operator
@@ -25119,13 +25120,11 @@ spec:
2511925120
replicas: 1
2512025121
selector:
2512125122
matchLabels:
25122-
app.kubernetes.io/component: operator
25123-
app.kubernetes.io/instance: percona-server-mongodb-operator
25124-
app.kubernetes.io/name: percona-server-mongodb-operator
25125-
app.kubernetes.io/part-of: percona-server-mongodb-operator
25123+
name: percona-server-mongodb-operator
2512625124
template:
2512725125
metadata:
2512825126
labels:
25127+
name: percona-server-mongodb-operator
2512925128
app.kubernetes.io/component: operator
2513025129
app.kubernetes.io/instance: percona-server-mongodb-operator
2513125130
app.kubernetes.io/name: percona-server-mongodb-operator

‎deploy/cw-bundle.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25131,6 +25131,12 @@ apiVersion: apps/v1
2513125131
kind: Deployment
2513225132
metadata:
2513325133
name: percona-server-mongodb-operator
25134+
labels:
25135+
name: percona-server-mongodb-operator
25136+
app.kubernetes.io/component: operator
25137+
app.kubernetes.io/instance: percona-server-mongodb-operator
25138+
app.kubernetes.io/name: percona-server-mongodb-operator
25139+
app.kubernetes.io/part-of: percona-server-mongodb-operator
2513425140
spec:
2513525141
replicas: 1
2513625142
selector:
@@ -25140,6 +25146,10 @@ spec:
2514025146
metadata:
2514125147
labels:
2514225148
name: percona-server-mongodb-operator
25149+
app.kubernetes.io/component: operator
25150+
app.kubernetes.io/instance: percona-server-mongodb-operator
25151+
app.kubernetes.io/name: percona-server-mongodb-operator
25152+
app.kubernetes.io/part-of: percona-server-mongodb-operator
2514325153
spec:
2514425154
serviceAccountName: percona-server-mongodb-operator
2514525155
containers:

‎deploy/cw-operator.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
name: percona-server-mongodb-operator
5+
labels:
6+
name: percona-server-mongodb-operator
7+
app.kubernetes.io/component: operator
8+
app.kubernetes.io/instance: percona-server-mongodb-operator
9+
app.kubernetes.io/name: percona-server-mongodb-operator
10+
app.kubernetes.io/part-of: percona-server-mongodb-operator
511
spec:
612
replicas: 1
713
selector:
@@ -11,6 +17,10 @@ spec:
1117
metadata:
1218
labels:
1319
name: percona-server-mongodb-operator
20+
app.kubernetes.io/component: operator
21+
app.kubernetes.io/instance: percona-server-mongodb-operator
22+
app.kubernetes.io/name: percona-server-mongodb-operator
23+
app.kubernetes.io/part-of: percona-server-mongodb-operator
1424
spec:
1525
serviceAccountName: percona-server-mongodb-operator
1626
containers:

‎deploy/operator.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ kind: Deployment
33
metadata:
44
name: percona-server-mongodb-operator
55
labels:
6+
name: percona-server-mongodb-operator
67
app.kubernetes.io/component: operator
78
app.kubernetes.io/instance: percona-server-mongodb-operator
89
app.kubernetes.io/name: percona-server-mongodb-operator
@@ -11,13 +12,11 @@ spec:
1112
replicas: 1
1213
selector:
1314
matchLabels:
14-
app.kubernetes.io/component: operator
15-
app.kubernetes.io/instance: percona-server-mongodb-operator
16-
app.kubernetes.io/name: percona-server-mongodb-operator
17-
app.kubernetes.io/part-of: percona-server-mongodb-operator
15+
name: percona-server-mongodb-operator
1816
template:
1917
metadata:
2018
labels:
19+
name: percona-server-mongodb-operator
2120
app.kubernetes.io/component: operator
2221
app.kubernetes.io/instance: percona-server-mongodb-operator
2322
app.kubernetes.io/name: percona-server-mongodb-operator

‎e2e-tests/data-at-rest-encryption/run

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,7 @@ fi
5656
sleep 5
5757

5858
desc "check backup and restore -- minio"
59-
backup_dest_minio=$(get_backup_dest "$backup_name_minio")
60-
retry 3 8 kubectl_bin run -i --rm aws-cli --image=perconalab/awscli --restart=Never -- \
61-
/usr/bin/env AWS_ACCESS_KEY_ID=some-access-key AWS_SECRET_ACCESS_KEY=some-secret-key AWS_DEFAULT_REGION=us-east-1 \
62-
/usr/bin/aws --endpoint-url http://minio-service:9000 s3 ls s3://${backup_dest_minio}/rs0/ \
63-
| grep myApp.test.gz
59+
check_backup_in_storage ${backup_name_minio} minio rs0 'myApp.test.gz'
6460
run_mongos 'use myApp\n db.test.insert({ x: 100501 })' "myApp:myPass@$cluster-mongos.$namespace"
6561
compare_mongos_cmd "find" "myApp:myPass@$cluster-mongos.$namespace" "-2nd"
6662
run_restore "$backup_name_minio"

‎e2e-tests/demand-backup-incremental-sharded/run

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ fi
142142
backup_name_minio="backup-minio-sharded"
143143
run_backup minio ${backup_name_minio}
144144
wait_backup "${backup_name_minio}"
145+
check_backup_in_storage ${backup_name_minio} minio rs0
145146

146147
run_mongos \
147148
'use myApp\n db.test.insert({ x: 100502 })' \
@@ -152,6 +153,7 @@ compare_mongos_cmd "find" "myApp:myPass@${cluster}-mongos.${namespace}" "-not-ba
152153
backup_name_minio_not_base="backup-minio-not-base-sharded"
153154
run_backup minio ${backup_name_minio_not_base} false
154155
wait_backup "${backup_name_minio_not_base}"
156+
check_backup_in_storage ${backup_name_minio_not_base} minio rs0
155157

156158
if [ -z "$SKIP_BACKUPS_TO_AWS_GCP_AZURE" ]; then
157159
run_restore "${backup_name_aws}" "_restore_sharded"

‎e2e-tests/demand-backup-incremental/run

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ fi
123123
backup_name_minio="backup-minio"
124124
run_backup minio ${backup_name_minio}
125125
wait_backup "${backup_name_minio}"
126+
check_backup_in_storage ${backup_name_minio} minio rs0
126127

127128
run_mongo \
128129
'use myApp\n db.test.insert({ x: 100501 })' \
@@ -136,6 +137,7 @@ compare_mongo_cmd "find" "myApp:myPass@${cluster}-rs0-2.${cluster}-rs0.${namespa
136137
backup_name_minio_not_base="backup-minio-not-base"
137138
run_backup minio "${backup_name_minio_not_base}" false
138139
wait_backup "${backup_name_minio_not_base}"
140+
check_backup_in_storage ${backup_name_minio_not_base} minio rs0
139141

140142
if [ -z "$SKIP_BACKUPS_TO_AWS_GCP_AZURE" ]; then
141143
run_restore "${backup_name_aws}"
@@ -165,6 +167,7 @@ log 'running backups'
165167
backup_name_minio="backup-minio-arbiter-nv"
166168
run_backup minio ${backup_name_minio}
167169
wait_backup "${backup_name_minio}"
170+
check_backup_in_storage ${backup_name_minio} minio rs0
168171

169172
run_restore ${backup_name_minio}
170173
run_recovery_check ${backup_name_minio} "_restore-arbiter-nv"

‎e2e-tests/demand-backup-physical-sharded/compare/find-sharded.json renamed to ‎e2e-tests/demand-backup-physical-aws/compare/find-sharded.json

File renamed without changes.

‎e2e-tests/demand-backup-physical-sharded/compare/find.json renamed to ‎e2e-tests/demand-backup-physical-aws/compare/find.json

File renamed without changes.

0 commit comments

Comments
 (0)