Revert "K8SPG-737: expose /pgdata mountpoint for node_exporter (#1113)" (#1188)

Author: egegunes

e2e-tests/tests/monitoring-pmm3/08-check-mountpoint-expose.yaml

@@ -1365,9 +1365,6 @@ func generateInstanceStatefulSetIntent(_ context.Context,
 	// containers see each other's processes.
 	// - https://docs.k8s.io/tasks/configure-pod-container/share-process-namespace/
 	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

e2e-tests/tests/monitoring/08-check-mountpoint-expose.yaml

@@ -7,7 +7,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 
-	"github.com/percona/percona-postgresql-operator/internal/postgres"
 	v2 "github.com/percona/percona-postgresql-operator/pkg/apis/pgv2.percona.com/v2"
 )
 
@@ -43,21 +42,6 @@ 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,
-		})
-	}
-
 	return corev1.Container{
 		Name:            "pmm-client",
 		Image:           pmmSpec.Image,
@@ -90,7 +74,13 @@ func sidecarContainerV2(pgc *v2.PerconaPGCluster) corev1.Container {
 				},
 			},
 		},
-		VolumeMounts: volumeMounts,
+		VolumeMounts: []corev1.VolumeMount{
+			{
+				Name:      "cert-volume",
+				MountPath: "/pgconf/tls",
+				ReadOnly:  true,
+			},
+		},
 		Env: []corev1.EnvVar{
 			{
 				Name: "POD_NAME",
@@ -293,13 +283,7 @@ func sidecarContainerV3(pgc *v2.PerconaPGCluster) corev1.Container {
 				MountPath: "/pgconf/tls",
 				ReadOnly:  true,
 			},
-			{
-				Name:      postgres.DataVolumeMount().Name,
-				MountPath: postgres.DataVolumeMount().MountPath,
-				ReadOnly:  true,
-			},
 		},
-
 		Env: []corev1.EnvVar{
 			{
 				Name: "POD_NAME",

e2e-tests/tests/monitoring/09-deleted-from-server-inventory.yaml renamed to e2e-tests/tests/monitoring/08-deleted-from-server-inventory.yaml

@@ -6,6 +6,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
@@ -135,6 +136,7 @@ func TestContainer(t *testing.T) {
 			assert.Contains(t, container.Env, tt.verificationEnvVar())
 		})
 	}
+
 }
 
 func TestSidecarContainerV2(t *testing.T) {
@@ -244,7 +246,7 @@ func TestSidecarContainerV2(t *testing.T) {
 		}
 	}
 
-	assert.Len(t, container.VolumeMounts, 2)
+	assert.Len(t, container.VolumeMounts, 1)
 	assert.Equal(t, "/pgconf/tls", container.VolumeMounts[0].MountPath)
 	assert.True(t, container.VolumeMounts[0].ReadOnly)
 }
@@ -351,7 +353,7 @@ func TestSidecarContainerV3(t *testing.T) {
 		}
 	}
 
-	assert.Len(t, container.VolumeMounts, 2)
+	assert.Len(t, container.VolumeMounts, 1)
 	assert.Equal(t, "/pgconf/tls", container.VolumeMounts[0].MountPath)
 	assert.True(t, container.VolumeMounts[0].ReadOnly)
 }