fix upgrade tests

Author: pooknull

internal/controller/postgrescluster/instance.go

@@ -1351,7 +1351,10 @@ func generateInstanceStatefulSetIntent(_ context.Context,
 	// ShareProcessNamespace makes Kubernetes' pause process PID 1 and lets
 	// containers see each other's processes.
 	// - https://docs.k8s.io/tasks/configure-pod-container/share-process-namespace/
-	sts.Spec.Template.Spec.ShareProcessNamespace = initialize.Bool(false) // K8SPG-737: should be false
+	sts.Spec.Template.Spec.ShareProcessNamespace = initialize.Bool(true)
+	if cluster.CompareVersion("2.7.0") >= 0 {
+		sts.Spec.Template.Spec.ShareProcessNamespace = initialize.Bool(false) // K8SPG-737: should be false
+	}
 
 	// Patroni calls the Kubernetes API and pgBackRest may interact with a cloud
 	// storage provider. Use the instance ServiceAccount and automatically mount

percona/pmm/pmm.go

@@ -43,6 +43,21 @@ func sidecarContainerV2(pgc *v2.PerconaPGCluster) corev1.Container {
 
 	pmmSpec := pgc.Spec.PMM
 
+	volumeMounts := []corev1.VolumeMount{
+		{
+			Name:      "cert-volume",
+			MountPath: "/pgconf/tls",
+			ReadOnly:  true,
+		},
+	}
+	if pgc.CompareVersion("2.7.0") >= 0 {
+		volumeMounts = append(volumeMounts, corev1.VolumeMount{
+			Name:      postgres.DataVolumeMount().Name,
+			MountPath: postgres.DataVolumeMount().MountPath,
+			ReadOnly:  true,
+		})
+	}
+
 	container := corev1.Container{
 		Name:            "pmm-client",
 		Image:           pmmSpec.Image,
@@ -75,18 +90,7 @@ func sidecarContainerV2(pgc *v2.PerconaPGCluster) corev1.Container {
 				},
 			},
 		},
-		VolumeMounts: []corev1.VolumeMount{
-			{
-				Name:      "cert-volume",
-				MountPath: "/pgconf/tls",
-				ReadOnly:  true,
-			},
-			{
-				Name:      postgres.DataVolumeMount().Name,
-				MountPath: postgres.DataVolumeMount().MountPath,
-				ReadOnly:  true,
-			},
-		},
+		VolumeMounts: volumeMounts,
 		Env: []corev1.EnvVar{
 			{
 				Name: "POD_NAME",
@@ -273,6 +277,20 @@ func sidecarContainerV3(pgc *v2.PerconaPGCluster) corev1.Container {
 	if pgc.Spec.PMM.CustomClusterName != "" {
 		clusterName = pgc.Spec.PMM.CustomClusterName
 	}
+	volumeMounts := []corev1.VolumeMount{
+		{
+			Name:      "cert-volume",
+			MountPath: "/pgconf/tls",
+			ReadOnly:  true,
+		},
+	}
+	if pgc.CompareVersion("2.7.0") >= 0 {
+		volumeMounts = append(volumeMounts, corev1.VolumeMount{
+			Name:      postgres.DataVolumeMount().Name,
+			MountPath: postgres.DataVolumeMount().MountPath,
+			ReadOnly:  true,
+		})
+	}
 
 	container := corev1.Container{
 		Name:            "pmm-client",
@@ -306,18 +324,7 @@ func sidecarContainerV3(pgc *v2.PerconaPGCluster) corev1.Container {
 				},
 			},
 		},
-		VolumeMounts: []corev1.VolumeMount{
-			{
-				Name:      "cert-volume",
-				MountPath: "/pgconf/tls",
-				ReadOnly:  true,
-			},
-			{
-				Name:      postgres.DataVolumeMount().Name,
-				MountPath: postgres.DataVolumeMount().MountPath,
-				ReadOnly:  true,
-			},
-		},
+		VolumeMounts: volumeMounts,
 		Env: []corev1.EnvVar{
 			{
 				Name: "POD_NAME",