Merge branch 'main' into K8SPSMDB-1296

Author: pooknull

e2e-tests/monitoring-2-0/compare/statefulset_monitoring-cfg-oc.yml

@@ -283,6 +283,9 @@ spec:
             - mountPath: /etc/mongodb-ssl
               name: ssl
               readOnly: true
+            - mountPath: /data/db
+              name: mongod-data
+              readOnly: true
       dnsPolicy: ClusterFirst
       initContainers:
         - command:

e2e-tests/monitoring-2-0/compare/statefulset_monitoring-cfg.yml

@@ -284,6 +284,9 @@ spec:
             - mountPath: /etc/mongodb-ssl
               name: ssl
               readOnly: true
+            - mountPath: /data/db
+              name: mongod-data
+              readOnly: true
       dnsPolicy: ClusterFirst
       initContainers:
         - command:

e2e-tests/monitoring-2-0/compare/statefulset_monitoring-mongos-oc.yml

@@ -278,6 +278,9 @@ spec:
             - mountPath: /etc/mongodb-ssl
               name: ssl
               readOnly: true
+            - mountPath: /data/db
+              name: mongod-data
+              readOnly: true
       dnsPolicy: ClusterFirst
       initContainers:
         - command:

e2e-tests/monitoring-2-0/compare/statefulset_monitoring-mongos.yml

@@ -279,6 +279,9 @@ spec:
             - mountPath: /etc/mongodb-ssl
               name: ssl
               readOnly: true
+            - mountPath: /data/db
+              name: mongod-data
+              readOnly: true
       dnsPolicy: ClusterFirst
       initContainers:
         - command:

e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0-oc.yml

@@ -271,6 +271,9 @@ spec:
             - mountPath: /etc/mongodb-ssl
               name: ssl
               readOnly: true
+            - mountPath: /data/db
+              name: mongod-data
+              readOnly: true
       dnsPolicy: ClusterFirst
       initContainers:
         - command:

e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0.yml

@@ -272,6 +272,9 @@ spec:
             - mountPath: /etc/mongodb-ssl
               name: ssl
               readOnly: true
+            - mountPath: /data/db
+              name: mongod-data
+              readOnly: true
       dnsPolicy: ClusterFirst
       initContainers:
         - command:

e2e-tests/scheduled-backup/run

@@ -23,6 +23,7 @@ check_backup_count() {
 	local expected=$2
 
 	local count=$(kubectl_bin get psmdb-backup -l percona.com/backup-ancestor=${ancestor} | grep ready | wc -l)
+	count="${count//[[:space:]]/}"
 
 	if [[ ${count} != ${expected} ]]; then
 		echo "${ancestor}: Expected ${expected} backups but found ${count}."

pkg/controller/perconaservermongodbbackup/perconaservermongodbbackup_controller.go

@@ -593,7 +593,7 @@ func (r *ReconcilePerconaServerMongoDBBackup) deleteFilesystemBackup(ctx context
 	errB := bytes.Buffer{}
 	err = r.clientcmd.Exec(ctx, &pod, naming.ContainerBackupAgent, cmd, nil, &outB, &errB, false)
 	if err != nil {
-		return errors.Wrap(err, "exec delete-backup")
+		return errors.Wrapf(err, "exec delete-backup: stdout=%s, stderr=%s", outB.String(), errB.String())
 	}
 
 	log.Info("Backup deleted")

pkg/psmdb/const.go

@@ -16,7 +16,7 @@ const (
 
 	// MongodDataVolClaimName is a PVC Claim name
 	MongodDataVolClaimName = "mongod-data"
-	// MongodContainerDataDir is a mondo data path in container
+	// MongodContainerDataDir is a mongo data path in container
 	MongodContainerDataDir = "/data/db"
 
 	BinVolumeName = "bin"

pkg/psmdb/init.go

@@ -18,7 +18,7 @@ func EntrypointInitContainer(cr *api.PerconaServerMongoDB, name, image string, p
 		VolumeMounts: []corev1.VolumeMount{
 			{
 				Name:      MongodDataVolClaimName,
-				MountPath: "/data/db",
+				MountPath: MongodContainerDataDir,
 			},
 		},
 		Image:           image,