Skip to content

Commit f7db42a

Browse files
committed
K8SPG-737: expose /pgdata mountpoint for node_exporter
https://perconadev.atlassian.net/browse/K8SPG-737
1 parent 25a8189 commit f7db42a

5 files changed

Lines changed: 52 additions & 1 deletion

File tree

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
apiVersion: kuttl.dev/v1beta1
2+
kind: TestStep
3+
commands:
4+
- script: |-
5+
set -o errexit
6+
set -o xtrace
7+
8+
source ../../functions
9+
10+
series_fetched=$(curl --insecure -G "https://admin:admin@$(get_service_ip monitoring-service)/prometheus/api/v1/query_range" \
11+
--data-urlencode "query=node_filesystem_free_bytes{mountpoint=\"/pgdata\"}" \
12+
--data-urlencode "start=$(($(date +%s) - 300))" \
13+
--data-urlencode "end=$(date +%s)" \
14+
--data-urlencode "step=5s" | jq -r '.stats.seriesFetched')
15+
16+
if [[ $series_fetched == 0 ]]; then
17+
echo "seriesFetched is 0"
18+
exit 1
19+
fi
20+
timeout: 360
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
apiVersion: kuttl.dev/v1beta1
2+
kind: TestStep
3+
commands:
4+
- script: |-
5+
set -o errexit
6+
set -o xtrace
7+
8+
source ../../functions
9+
10+
series_fetched=$(curl --insecure -G "https://admin:admin@$(get_service_ip monitoring-service)/prometheus/api/v1/query_range" \
11+
--data-urlencode "query=node_filesystem_free_bytes{mountpoint=\"/pgdata\"}" \
12+
--data-urlencode "start=$(($(date +%s) - 300))" \
13+
--data-urlencode "end=$(date +%s)" \
14+
--data-urlencode "step=5s" | jq -r '.stats.seriesFetched')
15+
16+
if [[ $series_fetched == 0 ]]; then
17+
echo "seriesFetched is 0"
18+
exit 1
19+
fi
20+
timeout: 360

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

File renamed without changes.

internal/controller/postgrescluster/instance.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1351,7 +1351,7 @@ func generateInstanceStatefulSetIntent(_ context.Context,
13511351
// ShareProcessNamespace makes Kubernetes' pause process PID 1 and lets
13521352
// containers see each other's processes.
13531353
// - https://docs.k8s.io/tasks/configure-pod-container/share-process-namespace/
1354-
sts.Spec.Template.Spec.ShareProcessNamespace = initialize.Bool(true)
1354+
sts.Spec.Template.Spec.ShareProcessNamespace = initialize.Bool(false) // K8SPG-737: should be false
13551355

13561356
// Patroni calls the Kubernetes API and pgBackRest may interact with a cloud
13571357
// storage provider. Use the instance ServiceAccount and automatically mount

percona/pmm/pmm.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
corev1 "k8s.io/api/core/v1"
88
"k8s.io/apimachinery/pkg/util/intstr"
99

10+
"github.com/percona/percona-postgresql-operator/internal/postgres"
1011
v2 "github.com/percona/percona-postgresql-operator/pkg/apis/pgv2.percona.com/v2"
1112
)
1213

@@ -80,6 +81,11 @@ func sidecarContainerV2(pgc *v2.PerconaPGCluster) corev1.Container {
8081
MountPath: "/pgconf/tls",
8182
ReadOnly: true,
8283
},
84+
{
85+
Name: postgres.DataVolumeMount().Name,
86+
MountPath: postgres.DataVolumeMount().MountPath,
87+
ReadOnly: true,
88+
},
8389
},
8490
Env: []corev1.EnvVar{
8591
{
@@ -288,6 +294,11 @@ func sidecarContainerV3(pgc *v2.PerconaPGCluster) corev1.Container {
288294
MountPath: "/pgconf/tls",
289295
ReadOnly: true,
290296
},
297+
{
298+
Name: postgres.DataVolumeMount().Name,
299+
MountPath: postgres.DataVolumeMount().MountPath,
300+
ReadOnly: true,
301+
},
291302
},
292303
Env: []corev1.EnvVar{
293304
{

0 commit comments

Comments
 (0)