Skip to content

Commit

Permalink
Merge branch 'main' into K8SPSMDB-1158
Browse files Browse the repository at this point in the history
  • Loading branch information
@hors
hors authored Sep 24, 2024
2 parents e7aa2e1 + 6f25a61 commit 6c0e2d4
Show file tree
Hide file tree
Showing 35 changed files with 1,027 additions and 186 deletions.
46 changes: 46 additions & 0 deletions config/crd/bases/psmdb.percona.com_perconaservermongodbs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3389,12 +3389,20 @@ spec:
externalNodes:
items:
properties:
horizons:
additionalProperties:
type: string
type: object
host:
type: string
port:
type: integer
priority:
type: integer
tags:
additionalProperties:
type: string
type: object
votes:
type: integer
required:
Expand Down Expand Up @@ -6310,6 +6318,21 @@ spec:
format: int32
type: integer
type: object
replsetOverrides:
additionalProperties:
properties:
horizons:
additionalProperties:
type: string
type: object
host:
type: string
tags:
additionalProperties:
type: string
type: object
type: object
type: object
resources:
properties:
claims:
Expand Down Expand Up @@ -10995,12 +11018,20 @@ spec:
externalNodes:
items:
properties:
horizons:
additionalProperties:
type: string
type: object
host:
type: string
port:
type: integer
priority:
type: integer
tags:
additionalProperties:
type: string
type: object
votes:
type: integer
required:
Expand Down Expand Up @@ -13916,6 +13947,21 @@ spec:
format: int32
type: integer
type: object
replsetOverrides:
additionalProperties:
properties:
horizons:
additionalProperties:
type: string
type: object
host:
type: string
tags:
additionalProperties:
type: string
type: object
type: object
type: object
resources:
properties:
claims:
Expand Down
46 changes: 46 additions & 0 deletions deploy/bundle.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4071,12 +4071,20 @@ spec:
externalNodes:
items:
properties:
horizons:
additionalProperties:
type: string
type: object
host:
type: string
port:
type: integer
priority:
type: integer
tags:
additionalProperties:
type: string
type: object
votes:
type: integer
required:
Expand Down Expand Up @@ -6992,6 +7000,21 @@ spec:
format: int32
type: integer
type: object
replsetOverrides:
additionalProperties:
properties:
horizons:
additionalProperties:
type: string
type: object
host:
type: string
tags:
additionalProperties:
type: string
type: object
type: object
type: object
resources:
properties:
claims:
Expand Down Expand Up @@ -11677,12 +11700,20 @@ spec:
externalNodes:
items:
properties:
horizons:
additionalProperties:
type: string
type: object
host:
type: string
port:
type: integer
priority:
type: integer
tags:
additionalProperties:
type: string
type: object
votes:
type: integer
required:
Expand Down Expand Up @@ -14598,6 +14629,21 @@ spec:
format: int32
type: integer
type: object
replsetOverrides:
additionalProperties:
properties:
horizons:
additionalProperties:
type: string
type: object
host:
type: string
tags:
additionalProperties:
type: string
type: object
type: object
type: object
resources:
properties:
claims:
Expand Down
13 changes: 13 additions & 0 deletions deploy/cr.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,19 @@ spec:
# maxSkew: 1
# topologyKey: kubernetes.io/hostname
# whenUnsatisfiable: DoNotSchedule
# replsetOverrides:
# my-cluster-name-rs0-0:
# host: my-cluster-name-rs0-0.example.net:27017
# tags:
# key: value-0
# my-cluster-name-rs0-1:
# host: my-cluster-name-rs0-1.example.net:27017
# tags:
# key: value-1
# my-cluster-name-rs0-2:
# host: my-cluster-name-rs0-2.example.net:27017
# tags:
# key: value-2
# externalNodes:
# - host: 34.124.76.90
# - host: 34.124.76.91
Expand Down
46 changes: 46 additions & 0 deletions deploy/crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4071,12 +4071,20 @@ spec:
externalNodes:
items:
properties:
horizons:
additionalProperties:
type: string
type: object
host:
type: string
port:
type: integer
priority:
type: integer
tags:
additionalProperties:
type: string
type: object
votes:
type: integer
required:
Expand Down Expand Up @@ -6992,6 +7000,21 @@ spec:
format: int32
type: integer
type: object
replsetOverrides:
additionalProperties:
properties:
horizons:
additionalProperties:
type: string
type: object
host:
type: string
tags:
additionalProperties:
type: string
type: object
type: object
type: object
resources:
properties:
claims:
Expand Down Expand Up @@ -11677,12 +11700,20 @@ spec:
externalNodes:
items:
properties:
horizons:
additionalProperties:
type: string
type: object
host:
type: string
port:
type: integer
priority:
type: integer
tags:
additionalProperties:
type: string
type: object
votes:
type: integer
required:
Expand Down Expand Up @@ -14598,6 +14629,21 @@ spec:
format: int32
type: integer
type: object
replsetOverrides:
additionalProperties:
properties:
horizons:
additionalProperties:
type: string
type: object
host:
type: string
tags:
additionalProperties:
type: string
type: object
type: object
type: object
resources:
properties:
claims:
Expand Down
46 changes: 46 additions & 0 deletions deploy/cw-bundle.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4071,12 +4071,20 @@ spec:
externalNodes:
items:
properties:
horizons:
additionalProperties:
type: string
type: object
host:
type: string
port:
type: integer
priority:
type: integer
tags:
additionalProperties:
type: string
type: object
votes:
type: integer
required:
Expand Down Expand Up @@ -6992,6 +7000,21 @@ spec:
format: int32
type: integer
type: object
replsetOverrides:
additionalProperties:
properties:
horizons:
additionalProperties:
type: string
type: object
host:
type: string
tags:
additionalProperties:
type: string
type: object
type: object
type: object
resources:
properties:
claims:
Expand Down Expand Up @@ -11677,12 +11700,20 @@ spec:
externalNodes:
items:
properties:
horizons:
additionalProperties:
type: string
type: object
host:
type: string
port:
type: integer
priority:
type: integer
tags:
additionalProperties:
type: string
type: object
votes:
type: integer
required:
Expand Down Expand Up @@ -14598,6 +14629,21 @@ spec:
format: int32
type: integer
type: object
replsetOverrides:
additionalProperties:
properties:
horizons:
additionalProperties:
type: string
type: object
host:
type: string
tags:
additionalProperties:
type: string
type: object
type: object
type: object
resources:
properties:
claims:
Expand Down
4 changes: 3 additions & 1 deletion e2e-tests/functions
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1197,11 +1197,13 @@ wait_cluster_consistency() {
run_backup() {
local storage=$1
local backup_name=${2:-"backup-${storage}"}
local type=${3:-"logical"}

desc "run backup $backup_name"

yq eval '.metadata.name = "'${backup_name}'"
| .spec.storageName = "'${storage}'"' \
| .spec.storageName = "'${storage}'"
| .spec.type = "'${type}'"' \
$test_dir/conf/backup-$storage.yml \
| kubectl_bin apply -f -
}
Expand Down
4 changes: 4 additions & 0 deletions e2e-tests/replset-overrides/compare/find-2nd.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
switched to db myApp
{ "_id" : , "x" : 100500 }
{ "_id" : , "x" : 100501 }
bye
3 changes: 3 additions & 0 deletions e2e-tests/replset-overrides/compare/find.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
switched to db myApp
{ "_id" : , "x" : 100500 }
bye
9 changes: 9 additions & 0 deletions e2e-tests/replset-overrides/conf/backup-minio.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: psmdb.percona.com/v1
kind: PerconaServerMongoDBBackup
metadata:
name:
finalizers:
- percona.com/delete-backup
spec:
clusterName: some-name
storageName: minio
Loading

0 comments on commit 6c0e2d4

Please sign in to comment.