Skip to content

Commit 49da79e

Browse files
gkechhors
authored andcommitted
K8SPG-826 use /tmp/pmm for pmm PMM_AGENT_PATHS_TEMPDIR (#1225)
Co-authored-by: Viacheslav Sarzhan <slava.sarzhan@percona.com>
1 parent 78dc23f commit 49da79e

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

percona/pmm/pmm.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ func sidecarContainerV3(pgc *v2.PerconaPGCluster) corev1.Container {
411411
},
412412
{
413413
Name: "PMM_AGENT_PATHS_TEMPDIR",
414-
Value: "/tmp",
414+
Value: "/tmp/pmm",
415415
},
416416
},
417417
}

percona/pmm/pmm_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
corev1 "k8s.io/api/core/v1"
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1212

13+
"github.com/percona/percona-postgresql-operator/percona/version"
1314
v2 "github.com/percona/percona-postgresql-operator/pkg/apis/pgv2.percona.com/v2"
1415
)
1516

@@ -26,7 +27,7 @@ func TestContainer(t *testing.T) {
2627

2728
pgc := &v2.PerconaPGCluster{
2829
Spec: v2.PerconaPGClusterSpec{
29-
CRVersion: "2.6.0",
30+
CRVersion: version.Version(),
3031
PMM: pmmSpec,
3132
},
3233
ObjectMeta: metav1.ObjectMeta{
@@ -152,7 +153,7 @@ func TestSidecarContainerV2(t *testing.T) {
152153

153154
pgc := &v2.PerconaPGCluster{
154155
Spec: v2.PerconaPGClusterSpec{
155-
CRVersion: "2.7.0",
156+
CRVersion: version.Version(),
156157
PMM: pmmSpec,
157158
},
158159
ObjectMeta: metav1.ObjectMeta{
@@ -264,7 +265,7 @@ func TestSidecarContainerV3(t *testing.T) {
264265

265266
pgc := &v2.PerconaPGCluster{
266267
Spec: v2.PerconaPGClusterSpec{
267-
CRVersion: "2.7.0",
268+
CRVersion: version.Version(),
268269
PMM: pmmSpec,
269270
},
270271
ObjectMeta: metav1.ObjectMeta{
@@ -321,7 +322,7 @@ func TestSidecarContainerV3(t *testing.T) {
321322
"DB_USER": v2.UserMonitoring,
322323
"DB_PASS": "", // secret reference is asserted separately
323324
"PMM_AGENT_PRERUN_SCRIPT": "pmm-admin status --wait=10s; pmm-admin add postgresql --username=$(DB_USER) --password='$(DB_PASS)' --host=127.0.0.1 --port=5432 --tls-cert-file=/pgconf/tls/tls.crt --tls-key-file=/pgconf/tls/tls.key --tls-ca-file=/pgconf/tls/ca.crt --tls-skip-verify --skip-connection-check --metrics-mode=push --service-name=$(PMM_AGENT_SETUP_NODE_NAME) --query-source= --cluster=test-cluster --environment=dev-postgres; pmm-admin annotate --service-name=$(PMM_AGENT_SETUP_NODE_NAME) 'Service restarted'",
324-
"PMM_AGENT_PATHS_TEMPDIR": "/tmp",
325+
"PMM_AGENT_PATHS_TEMPDIR": "/tmp/pmm",
325326
}
326327

327328
for _, envVar := range container.Env {

0 commit comments

Comments
 (0)