K8SPSMDB-1297 add data dir to proc (#1924)

Co-authored-by: Viacheslav Sarzhan <slava.sarzhan@percona.com>

Author: nmarukovich

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:

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:

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

@@ -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:

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:

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,

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

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,
 			},