Merge branch 'main' into release-1.20.0

jvpasinatto · web-flow · commit faa33c152dde · 2025-05-19T13:44:17.000-03:00
diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-cfg-oc.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-cfg-oc.yml
@@ -277,6 +277,9 @@ spec:
             - mountPath: /etc/mongodb-ssl
               name: ssl
               readOnly: true
+            - mountPath: /data/db
+              name: mongod-data
+              readOnly: true
       dnsPolicy: ClusterFirst
       initContainers:
         - command:
diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-cfg.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-cfg.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:
diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-mongos-oc.yml b/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:
diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-mongos.yml b/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:
diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0-oc.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0-oc.yml
@@ -265,6 +265,9 @@ spec:
             - mountPath: /etc/mongodb-ssl
               name: ssl
               readOnly: true
+            - mountPath: /data/db
+              name: mongod-data
+              readOnly: true
       dnsPolicy: ClusterFirst
       initContainers:
         - command:
diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-rs0.yml
@@ -266,6 +266,9 @@ spec:
             - mountPath: /etc/mongodb-ssl
               name: ssl
               readOnly: true
+            - mountPath: /data/db
+              name: mongod-data
+              readOnly: true
       dnsPolicy: ClusterFirst
       initContainers:
         - command:
diff --git a/e2e-tests/scheduled-backup/run b/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}."
diff --git a/go.mod b/go.mod
@@ -23,7 +23,7 @@ require (
 	go.mongodb.org/mongo-driver v1.17.3
 	go.uber.org/zap v1.27.0
 	golang.org/x/sync v0.13.0
-	google.golang.org/grpc v1.71.1
+	google.golang.org/grpc v1.72.0
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.33.0
 	k8s.io/apimachinery v0.33.0
diff --git a/go.sum b/go.sum
@@ -802,8 +802,8 @@ google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ij
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.71.1 h1:ffsFWr7ygTUscGPI0KKK6TLrGz0476KUvvsbqWK0rPI=
-google.golang.org/grpc v1.71.1/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
+google.golang.org/grpc v1.72.0 h1:S7UkcVa60b5AAQTaO6ZKamFp1zMZSU0fGDK2WZLbBnM=
+google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
diff --git a/pkg/controller/perconaservermongodbbackup/perconaservermongodbbackup_controller.go b/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")
diff --git a/pkg/controller/perconaservermongodbrestore/physical.go b/pkg/controller/perconaservermongodbrestore/physical.go
@@ -918,6 +918,10 @@ func (r *ReconcilePerconaServerMongoDBRestore) getLatestChunkTS(ctx context.Cont
 		return "", errors.Wrap(err, "unmarshal PBM status output")
 	}
 
+	if len(pbmStatus.Backups.Chunks.Timelines) < 1 {
+		return "", errors.New("no oplog chunks")
+	}
+
 	latest := pbmStatus.Backups.Chunks.Timelines[len(pbmStatus.Backups.Chunks.Timelines)-1].Range.End
 	ts := time.Unix(int64(latest), 0).UTC()
 
diff --git a/pkg/psmdb/const.go b/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"
diff --git a/pkg/psmdb/init.go b/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,
diff --git a/pkg/psmdb/pmm.go b/pkg/psmdb/pmm.go
@@ -25,35 +25,6 @@ func PMMContainer(cr *api.PerconaServerMongoDB, secret *corev1.Secret, dbPort in
 		ports = append(ports, corev1.ContainerPort{ContainerPort: int32(i)})
 	}
 
-	dbArgsEnv := []corev1.EnvVar{
-		{
-			Name: "MONGODB_USER",
-			ValueFrom: &corev1.EnvVarSource{
-				SecretKeyRef: &corev1.SecretKeySelector{
-					Key: "MONGODB_CLUSTER_MONITOR_USER_ESCAPED",
-					LocalObjectReference: corev1.LocalObjectReference{
-						Name: secret.Name,
-					},
-				},
-			},
-		},
-		{
-			Name: "MONGODB_PASSWORD",
-			ValueFrom: &corev1.EnvVarSource{
-				SecretKeyRef: &corev1.SecretKeySelector{
-					Key: "MONGODB_CLUSTER_MONITOR_PASSWORD_ESCAPED",
-					LocalObjectReference: corev1.LocalObjectReference{
-						Name: secret.Name,
-					},
-				},
-			},
-		},
-		{
-			Name: "DB_ARGS",
-			// no need to change the port here since these arguments are used only if cr.CompareVersion("1.2.0") < 0
-			Value: "--uri=mongodb://$(MONGODB_USER):$(MONGODB_PASSWORD)@127.0.0.1:27017/",
-		},
-	}
 	dbEnv := []corev1.EnvVar{
 		{
 			Name: "DB_USER",
@@ -114,13 +85,16 @@ func PMMContainer(cr *api.PerconaServerMongoDB, secret *corev1.Secret, dbPort in
 			},
 		},
 		Ports: ports,
+		VolumeMounts: []corev1.VolumeMount{
+			{
+				Name:      "ssl",
+				MountPath: SSLDir,
+				ReadOnly:  true,
+			},
+		},
 	}
 
-	if cr.CompareVersion("1.2.0") >= 0 {
-		pmm.Env = append(pmm.Env, dbEnv...)
-	} else {
-		pmm.Env = append(pmm.Env, dbArgsEnv...)
-	}
+	pmm.Env = append(pmm.Env, dbEnv...)
 
 	if customLogin {
 		pmmPassKey := api.PMMAPIKey
@@ -171,14 +145,12 @@ func PMMContainer(cr *api.PerconaServerMongoDB, secret *corev1.Secret, dbPort in
 		pmm.Env = append(pmm.Env, pmmAgentEnvs(spec, secret, customLogin, customAdminParams)...)
 	}
 
-	if cr.CompareVersion("1.13.0") >= 0 {
-		pmm.VolumeMounts = []corev1.VolumeMount{
-			{
-				Name:      "ssl",
-				MountPath: SSLDir,
-				ReadOnly:  true,
-			},
-		}
+	if cr.CompareVersion("1.18.0") >= 0 {
+		pmm.VolumeMounts = append(pmm.VolumeMounts, corev1.VolumeMount{
+			Name:      MongodDataVolClaimName,
+			MountPath: MongodContainerDataDir,
+			ReadOnly:  true,
+		})
 	}
 
 	return pmm
diff --git a/pkg/psmdb/statefulset.go b/pkg/psmdb/statefulset.go
@@ -437,7 +437,7 @@ func backupAgentContainer(ctx context.Context, cr *api.PerconaServerMongoDB, rep
 
 		c.VolumeMounts = append(c.VolumeMounts, []corev1.VolumeMount{
 			{
-				Name:      "mongod-data",
+				Name:      MongodDataVolClaimName,
 				MountPath: MongodContainerDataDir,
 				ReadOnly:  false,
 			},

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