K8SPXC-1553 PMM_AGENT_PATHS_TEMPDIR configured to /tmp/pmm (#2112)

gkech · hors · web-flow · commit 37c06c5df232 · 2025-07-23T23:18:46.000+03:00
* K8SPXC-1553 PMM_AGENT_PATHS_TEMPDIR configured to /tmp/pmm

* update e2e tests

---------

Co-authored-by: Viacheslav Sarzhan &lt;slava.sarzhan@percona.com&gt;
diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-haproxy-k127.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-haproxy-k127.yml
@@ -77,7 +77,7 @@ spec:
             - name: PMM_AGENT_SIDECAR_SLEEP
               value: "5"
             - name: PMM_AGENT_PATHS_TEMPDIR
-              value: /tmp
+              value: /tmp/pmm
             - name: PMM_AGENT_PRERUN_SCRIPT
               value: /var/lib/mysql/pmm-prerun.sh
             - name: DB_CLUSTER
diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-haproxy-no-prefix-k127.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-haproxy-no-prefix-k127.yml
@@ -77,7 +77,7 @@ spec:
             - name: PMM_AGENT_SIDECAR_SLEEP
               value: "5"
             - name: PMM_AGENT_PATHS_TEMPDIR
-              value: /tmp
+              value: /tmp/pmm
             - name: PMM_AGENT_PRERUN_SCRIPT
               value: /var/lib/mysql/pmm-prerun.sh
             - name: DB_CLUSTER
diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-haproxy-no-prefix-oc.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-haproxy-no-prefix-oc.yml
@@ -74,7 +74,7 @@ spec:
             - name: PMM_AGENT_SIDECAR_SLEEP
               value: "5"
             - name: PMM_AGENT_PATHS_TEMPDIR
-              value: /tmp
+              value: /tmp/pmm
             - name: PMM_AGENT_PRERUN_SCRIPT
               value: /var/lib/mysql/pmm-prerun.sh
             - name: DB_CLUSTER
diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-haproxy-no-prefix.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-haproxy-no-prefix.yml
@@ -74,7 +74,7 @@ spec:
             - name: PMM_AGENT_SIDECAR_SLEEP
               value: "5"
             - name: PMM_AGENT_PATHS_TEMPDIR
-              value: /tmp
+              value: /tmp/pmm
             - name: PMM_AGENT_PRERUN_SCRIPT
               value: /var/lib/mysql/pmm-prerun.sh
             - name: DB_CLUSTER
diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-haproxy-oc.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-haproxy-oc.yml
@@ -74,7 +74,7 @@ spec:
             - name: PMM_AGENT_SIDECAR_SLEEP
               value: "5"
             - name: PMM_AGENT_PATHS_TEMPDIR
-              value: /tmp
+              value: /tmp/pmm
             - name: PMM_AGENT_PRERUN_SCRIPT
               value: /var/lib/mysql/pmm-prerun.sh
             - name: DB_CLUSTER
diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-haproxy.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-haproxy.yml
@@ -74,7 +74,7 @@ spec:
             - name: PMM_AGENT_SIDECAR_SLEEP
               value: "5"
             - name: PMM_AGENT_PATHS_TEMPDIR
-              value: /tmp
+              value: /tmp/pmm
             - name: PMM_AGENT_PRERUN_SCRIPT
               value: /var/lib/mysql/pmm-prerun.sh
             - name: DB_CLUSTER
diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pxc-k127-no-prefix-oc.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pxc-k127-no-prefix-oc.yml
@@ -77,7 +77,7 @@ spec:
             - name: PMM_AGENT_SIDECAR_SLEEP
               value: "5"
             - name: PMM_AGENT_PATHS_TEMPDIR
-              value: /tmp
+              value: /tmp/pmm
             - name: PMM_AGENT_PRERUN_SCRIPT
               value: /var/lib/mysql/pmm-prerun.sh
             - name: DB_CLUSTER
diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pxc-k127-oc.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pxc-k127-oc.yml
@@ -77,7 +77,7 @@ spec:
             - name: PMM_AGENT_SIDECAR_SLEEP
               value: "5"
             - name: PMM_AGENT_PATHS_TEMPDIR
-              value: /tmp
+              value: /tmp/pmm
             - name: PMM_AGENT_PRERUN_SCRIPT
               value: /var/lib/mysql/pmm-prerun.sh
             - name: DB_CLUSTER
diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pxc-k127.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pxc-k127.yml
@@ -77,7 +77,7 @@ spec:
             - name: PMM_AGENT_SIDECAR_SLEEP
               value: "5"
             - name: PMM_AGENT_PATHS_TEMPDIR
-              value: /tmp
+              value: /tmp/pmm
             - name: PMM_AGENT_PRERUN_SCRIPT
               value: /var/lib/mysql/pmm-prerun.sh
             - name: DB_CLUSTER
diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pxc-no-prefix-k127-oc.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pxc-no-prefix-k127-oc.yml
@@ -77,7 +77,7 @@ spec:
             - name: PMM_AGENT_SIDECAR_SLEEP
               value: "5"
             - name: PMM_AGENT_PATHS_TEMPDIR
-              value: /tmp
+              value: /tmp/pmm
             - name: PMM_AGENT_PRERUN_SCRIPT
               value: /var/lib/mysql/pmm-prerun.sh
             - name: DB_CLUSTER
diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pxc-no-prefix-k127.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pxc-no-prefix-k127.yml
@@ -77,7 +77,7 @@ spec:
             - name: PMM_AGENT_SIDECAR_SLEEP
               value: "5"
             - name: PMM_AGENT_PATHS_TEMPDIR
-              value: /tmp
+              value: /tmp/pmm
             - name: PMM_AGENT_PRERUN_SCRIPT
               value: /var/lib/mysql/pmm-prerun.sh
             - name: DB_CLUSTER
diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pxc-no-prefix-oc.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pxc-no-prefix-oc.yml
@@ -74,7 +74,7 @@ spec:
             - name: PMM_AGENT_SIDECAR_SLEEP
               value: "5"
             - name: PMM_AGENT_PATHS_TEMPDIR
-              value: /tmp
+              value: /tmp/pmm
             - name: PMM_AGENT_PRERUN_SCRIPT
               value: /var/lib/mysql/pmm-prerun.sh
             - name: DB_CLUSTER
diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pxc-no-prefix.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pxc-no-prefix.yml
@@ -74,7 +74,7 @@ spec:
             - name: PMM_AGENT_SIDECAR_SLEEP
               value: "5"
             - name: PMM_AGENT_PATHS_TEMPDIR
-              value: /tmp
+              value: /tmp/pmm
             - name: PMM_AGENT_PRERUN_SCRIPT
               value: /var/lib/mysql/pmm-prerun.sh
             - name: DB_CLUSTER
diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pxc-oc.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pxc-oc.yml
@@ -74,7 +74,7 @@ spec:
             - name: PMM_AGENT_SIDECAR_SLEEP
               value: "5"
             - name: PMM_AGENT_PATHS_TEMPDIR
-              value: /tmp
+              value: /tmp/pmm
             - name: PMM_AGENT_PRERUN_SCRIPT
               value: /var/lib/mysql/pmm-prerun.sh
             - name: DB_CLUSTER
diff --git a/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pxc.yml b/e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-pxc.yml
@@ -74,7 +74,7 @@ spec:
             - name: PMM_AGENT_SIDECAR_SLEEP
               value: "5"
             - name: PMM_AGENT_PATHS_TEMPDIR
-              value: /tmp
+              value: /tmp/pmm
             - name: PMM_AGENT_PRERUN_SCRIPT
               value: /var/lib/mysql/pmm-prerun.sh
             - name: DB_CLUSTER
diff --git a/pkg/pxc/app/pmm.go b/pkg/pxc/app/pmm.go
@@ -364,7 +364,7 @@ func PMM3Client(cr *api.PerconaXtraDBCluster, secret *corev1.Secret, envVarsSecr
 		},
 		{
 			Name:  "PMM_AGENT_PATHS_TEMPDIR",
-			Value: "/tmp",
+			Value: "/tmp/pmm",
 		},
 		{
 			Name:  "PMM_AGENT_PRERUN_SCRIPT",
diff --git a/pkg/pxc/app/pmm_test.go b/pkg/pxc/app/pmm_test.go
@@ -137,7 +137,7 @@ func TestPMM3Client(t *testing.T) {
 			assert.Equal(t, "container", envMap["PMM_AGENT_SETUP_NODE_TYPE"])
 			assert.Equal(t, "true", envMap["PMM_AGENT_SIDECAR"])
 			assert.Equal(t, "5", envMap["PMM_AGENT_SIDECAR_SLEEP"])
-			assert.Equal(t, "/tmp", envMap["PMM_AGENT_PATHS_TEMPDIR"])
+			assert.Equal(t, "/tmp/pmm", envMap["PMM_AGENT_PATHS_TEMPDIR"])
 			assert.Equal(t, "/var/lib/mysql/pmm-prerun.sh", envMap["PMM_AGENT_PRERUN_SCRIPT"])
 			assert.Equal(t, "foo-cluster", envMap["CLUSTER_NAME"])
 			assert.Equal(t, "$(PMM_PREFIX)$(POD_NAMESPACE)-$(POD_NAME)", envMap["PMM_AGENT_SETUP_NODE_NAME"])
