Merge branch 'main' into K8SPSMDB-1359

Author: gkech

.github/CODEOWNERS

@@ -1,4 +1,4 @@
-* @hors @egegunes @pooknull @nmarukovich @gkech
-/e2e-tests/ @jvpasinatto @eleo007 @valmiranogueira
-Jenkinsfile @jvpasinatto @eleo007 @valmiranogueira
+* @hors @egegunes @pooknull @nmarukovich @gkech @mayankshah1607 @oksana-grishchenko
+/e2e-tests/ @jvpasinatto @eleo007 @valmiranogueira @bogdanjeler-ev
+Jenkinsfile @jvpasinatto @eleo007 @valmiranogueira @bogdanjeler-ev
 

config/crd/bases/psmdb.percona.com_perconaservermongodbrestores.yaml

@@ -229,8 +229,10 @@ spec:
                     ([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]$'))
                 - message: Date should not be used when 'latest' type is used
                   rule: self.type != 'latest' || !has(self.date)
-              replset:
-                type: string
+              replsetRemapping:
+                additionalProperties:
+                  type: string
+                type: object
               selective:
                 properties:
                   namespaces:

config/crd/bases/psmdb.percona.com_perconaservermongodbs.yaml

@@ -9,6 +9,9 @@ spec:
 #    withUsersAndRoles: true
 #    namespaces:
 #    - "db.collection"
+#  replsetRemapping:
+#    rs0: shard0
+#    rs1: shard1
 #  pitr:
 #    type: date
 #    date: YYYY-MM-DD HH:MM:SS

deploy/backup/restore.yaml

@@ -49,6 +49,14 @@ spec:
     apply: disabled
     schedule: "0 2 * * *"
     setFCV: false
+#  vault:
+#    endpointURL: https://vault-service:8200
+#    tlsSecret: my-tls-vault-secret
+#    syncUsers:
+#      role: operator
+#      mountPath: secrets
+#      keyPath: psmdb/operator/namespace/my-cluster-name/users
+#      tokenSecret: my-vault-sync-token-secret
   secrets:
     users: my-cluster-name-secrets
     encryptionKey: my-cluster-name-mongodb-encryption-key
@@ -427,7 +435,12 @@ spec:
 #      hostnames:
 #      - "host1"
 #      - "host2"
-
+#    env:
+#    - name: KEY
+#      value: VALUE
+#    envFrom:
+#    - configMapRef:
+#       name: configmap-name
   sharding:
     enabled: true
 #    balancer:
@@ -499,6 +512,12 @@ spec:
 #        runAsGroup: 1001
 #        supplementalGroups: [1001]
 #      runtimeClassName: image-rc
+#      env:
+#      - name: KEY
+#        value: VALUE
+#      envFrom:
+#      - configMapRef:
+#         name: configmap-name
 #      sidecars:
 #      - image: busybox
 #        command: ["/bin/sh"]
@@ -604,6 +623,12 @@ spec:
 #        runAsGroup: 1001
 #        supplementalGroups: [1001]
 #      runtimeClassName: image-rc
+#      env:
+#      - name: KEY
+#        value: VALUE
+#      envFrom:
+#      - configMapRef:
+#         name: configmap-name
 #      sidecars:
 #      - image: busybox
 #        command: ["/bin/sh"]