Merge branch 'main' into K8SPSMDB-1296

Author: pooknull

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

@@ -33,6 +33,10 @@ spec:
       jsonPath: .status.type
       name: Type
       type: string
+    - description: Backup size
+      jsonPath: .status.size
+      name: Size
+      type: string
     - description: Job status
       jsonPath: .status.state
       name: Status
@@ -169,6 +173,8 @@ spec:
                 required:
                 - bucket
                 type: object
+              size:
+                type: string
               start:
                 format: date-time
                 type: string

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

@@ -137,6 +137,8 @@ spec:
                     required:
                     - bucket
                     type: object
+                  size:
+                    type: string
                   start:
                     format: date-time
                     type: string

deploy/bundle.yaml

@@ -37,6 +37,10 @@ spec:
       jsonPath: .status.type
       name: Type
       type: string
+    - description: Backup size
+      jsonPath: .status.size
+      name: Size
+      type: string
     - description: Job status
       jsonPath: .status.state
       name: Status
@@ -173,6 +177,8 @@ spec:
                 required:
                 - bucket
                 type: object
+              size:
+                type: string
               start:
                 format: date-time
                 type: string
@@ -332,6 +338,8 @@ spec:
                     required:
                     - bucket
                     type: object
+                  size:
+                    type: string
                   start:
                     format: date-time
                     type: string

deploy/cr-minimal.yaml

@@ -3,8 +3,8 @@ kind: PerconaServerMongoDB
 metadata:
   name: minimal-cluster
 spec:
-  crVersion: 1.20.0
-  image: percona/percona-server-mongodb:7.0.18-11
+  crVersion: 1.21.0
+  image: perconalab/percona-server-mongodb-operator:main-mongod8.0
   unsafeFlags:
     replsetSize: true
     mongosSize: true

deploy/cr.yaml

@@ -13,8 +13,8 @@ spec:
 #  pause: true
 #  unmanaged: false
 #  enableVolumeExpansion: false
-  crVersion: 1.20.0
-  image: percona/percona-server-mongodb:7.0.18-11
+  crVersion: 1.21.0
+  image: perconalab/percona-server-mongodb-operator:main-mongod8.0
   imagePullPolicy: Always
 #  tls:
 #    mode: preferTLS
@@ -27,7 +27,7 @@ spec:
 #      group: cert-manager.io
 #  imagePullSecrets:
 #    - name: private-registry-credentials
-#  initImage: percona/percona-server-mongodb-operator:1.20.0
+#  initImage: perconalab/percona-server-mongodb-operator:main
 #  initContainerSecurityContext: {}
 #  unsafeFlags:
 #    tls: false
@@ -59,7 +59,7 @@ spec:
 #    sse: my-cluster-name-sse
   pmm:
     enabled: false
-    image: percona/pmm-client:2.44.1
+    image: perconalab/pmm-client:dev-latest
     serverHost: monitoring-service
 #    containerSecurityContext: {}
 #    customClusterName: mongo-cluster
@@ -622,7 +622,7 @@ spec:
 
   backup:
     enabled: true
-    image: percona/percona-backup-mongodb:2.9.1
+    image: perconalab/percona-server-mongodb-operator:main-backup
 #    annotations:
 #      iam.amazonaws.com/role: role-arn
 #    resources:

deploy/crd.yaml

@@ -37,6 +37,10 @@ spec:
       jsonPath: .status.type
       name: Type
       type: string
+    - description: Backup size
+      jsonPath: .status.size
+      name: Size
+      type: string
     - description: Job status
       jsonPath: .status.state
       name: Status
@@ -173,6 +177,8 @@ spec:
                 required:
                 - bucket
                 type: object
+              size:
+                type: string
               start:
                 format: date-time
                 type: string
@@ -332,6 +338,8 @@ spec:
                     required:
                     - bucket
                     type: object
+                  size:
+                    type: string
                   start:
                     format: date-time
                     type: string

deploy/cw-bundle.yaml

@@ -37,6 +37,10 @@ spec:
       jsonPath: .status.type
       name: Type
       type: string
+    - description: Backup size
+      jsonPath: .status.size
+      name: Size
+      type: string
     - description: Job status
       jsonPath: .status.state
       name: Status
@@ -173,6 +177,8 @@ spec:
                 required:
                 - bucket
                 type: object
+              size:
+                type: string
               start:
                 format: date-time
                 type: string
@@ -332,6 +338,8 @@ spec:
                     required:
                     - bucket
                     type: object
+                  size:
+                    type: string
                   start:
                     format: date-time
                     type: string

e2e-tests/upgrade-consistency-sharded-tls/compare/service_some-name-cfg-1180.yml renamed to e2e-tests/upgrade-consistency-sharded-tls/compare/service_some-name-cfg-1210.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 5
+  generation: 3
   labels:
     app.kubernetes.io/component: cfg
     app.kubernetes.io/instance: some-name