Skip to content

Commit b9e4561

Browse files
nmarukovichnmarukovich
committed
rename var
1 parent d9dd4a2 commit b9e4561

2 files changed

Lines changed: 61 additions & 61 deletions

File tree

‎percona/pmm/pmm.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ func sidecarContainerV2(pgc *v2.PerconaPGCluster) corev1.Container {
212212

213213
if pgc.CompareVersion("2.9.0") >= 0 {
214214
env = append(env, corev1.EnvVar{
215-
Name: "PMM_AGENT_SETUP_MOUNT_INFO_PATH",
215+
Name: "PMM_AGENT_SETUP_PROC_MOUNTS_PATH",
216216
Value: "/proc/self/mounts",
217217
})
218218
}
@@ -413,7 +413,7 @@ func sidecarContainerV3(pgc *v2.PerconaPGCluster) corev1.Container {
413413

414414
if pgc.CompareVersion("2.9.0") >= 0 {
415415
env = append(env, corev1.EnvVar{
416-
Name: "PMM_AGENT_SETUP_MOUNT_INFO_PATH",
416+
Name: "PMM_AGENT_SETUP_PROC_MOUNTS_PATH",
417417
Value: "/proc/self/mounts",
418418
})
419419
}

‎percona/pmm/pmm_test.go‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -187,38 +187,38 @@ func TestSidecarContainerV2(t *testing.T) {
187187
assert.Len(t, container.Env, 32)
188188

189189
expectedEnvVars := map[string]string{
190-
"POD_NAME": "", // field reference is asserted separately
191-
"POD_NAMESPACE": "", // field reference is asserted separately
192-
"PMM_USER": "api_key",
193-
"PMM_SERVER": pmmSpec.ServerHost,
194-
"PMM_AGENT_SERVER_ADDRESS": pmmSpec.ServerHost,
195-
"PMM_AGENT_SERVER_USERNAME": "api_key",
196-
"PMM_AGENT_SERVER_PASSWORD": "", // secret reference is asserted separately
197-
"CLIENT_PORT_LISTEN": "7777",
198-
"CLIENT_PORT_MIN": "30100",
199-
"CLIENT_PORT_MAX": "30105",
200-
"PMM_AGENT_LISTEN_PORT": "7777",
201-
"PMM_AGENT_PORTS_MIN": "30100",
202-
"PMM_AGENT_PORTS_MAX": "30105",
203-
"PMM_AGENT_CONFIG_FILE": "/usr/local/percona/pmm2/config/pmm-agent.yaml",
204-
"PMM_AGENT_LOG_LEVEL": "info",
205-
"PMM_AGENT_DEBUG": "false",
206-
"PMM_AGENT_TRACE": "false",
207-
"PMM_AGENT_SERVER_INSECURE_TLS": "1",
208-
"PMM_AGENT_LISTEN_ADDRESS": "0.0.0.0",
209-
"PMM_AGENT_SETUP_NODE_NAME": "$(POD_NAMESPACE)-$(POD_NAME)",
210-
"PMM_AGENT_SETUP_METRICS_MODE": "push",
211-
"PMM_AGENT_SETUP": "1",
212-
"PMM_AGENT_SETUP_FORCE": "1",
213-
"PMM_AGENT_SETUP_NODE_TYPE": "container",
214-
"PMM_AGENT_SIDECAR": "true",
215-
"PMM_AGENT_SIDECAR_SLEEP": "5",
216-
"DB_TYPE": "postgresql",
217-
"DB_USER": v2.UserMonitoring,
218-
"DB_PASS": "", // secret reference is asserted separately
219-
"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'",
220-
"PMM_AGENT_PATHS_TEMPDIR": "/tmp",
221-
"PMM_AGENT_SETUP_MOUNT_INFO_PATH": "/proc/self/mounts",
190+
"POD_NAME": "", // field reference is asserted separately
191+
"POD_NAMESPACE": "", // field reference is asserted separately
192+
"PMM_USER": "api_key",
193+
"PMM_SERVER": pmmSpec.ServerHost,
194+
"PMM_AGENT_SERVER_ADDRESS": pmmSpec.ServerHost,
195+
"PMM_AGENT_SERVER_USERNAME": "api_key",
196+
"PMM_AGENT_SERVER_PASSWORD": "", // secret reference is asserted separately
197+
"CLIENT_PORT_LISTEN": "7777",
198+
"CLIENT_PORT_MIN": "30100",
199+
"CLIENT_PORT_MAX": "30105",
200+
"PMM_AGENT_LISTEN_PORT": "7777",
201+
"PMM_AGENT_PORTS_MIN": "30100",
202+
"PMM_AGENT_PORTS_MAX": "30105",
203+
"PMM_AGENT_CONFIG_FILE": "/usr/local/percona/pmm2/config/pmm-agent.yaml",
204+
"PMM_AGENT_LOG_LEVEL": "info",
205+
"PMM_AGENT_DEBUG": "false",
206+
"PMM_AGENT_TRACE": "false",
207+
"PMM_AGENT_SERVER_INSECURE_TLS": "1",
208+
"PMM_AGENT_LISTEN_ADDRESS": "0.0.0.0",
209+
"PMM_AGENT_SETUP_NODE_NAME": "$(POD_NAMESPACE)-$(POD_NAME)",
210+
"PMM_AGENT_SETUP_METRICS_MODE": "push",
211+
"PMM_AGENT_SETUP": "1",
212+
"PMM_AGENT_SETUP_FORCE": "1",
213+
"PMM_AGENT_SETUP_NODE_TYPE": "container",
214+
"PMM_AGENT_SIDECAR": "true",
215+
"PMM_AGENT_SIDECAR_SLEEP": "5",
216+
"DB_TYPE": "postgresql",
217+
"DB_USER": v2.UserMonitoring,
218+
"DB_PASS": "", // secret reference is asserted separately
219+
"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'",
220+
"PMM_AGENT_PATHS_TEMPDIR": "/tmp",
221+
"PMM_AGENT_SETUP_PROC_MOUNTS_PATH": "/proc/self/mounts",
222222
}
223223

224224
for _, envVar := range container.Env {
@@ -301,33 +301,33 @@ func TestSidecarContainerV3(t *testing.T) {
301301
assert.Len(t, container.Env, 27)
302302

303303
expectedEnvVars := map[string]string{
304-
"POD_NAME": "", // field reference is asserted separately
305-
"POD_NAMESPACE": "", // field reference is asserted separately
306-
"PMM_AGENT_SERVER_ADDRESS": pmmSpec.ServerHost,
307-
"PMM_AGENT_SERVER_USERNAME": "service_token",
308-
"PMM_AGENT_SERVER_PASSWORD": "", // secret reference is asserted separately
309-
"PMM_AGENT_LISTEN_PORT": "7777",
310-
"PMM_AGENT_PORTS_MIN": "30100",
311-
"PMM_AGENT_PORTS_MAX": "30105",
312-
"PMM_AGENT_CONFIG_FILE": "/usr/local/percona/pmm/config/pmm-agent.yaml",
313-
"PMM_AGENT_LOG_LEVEL": "info",
314-
"PMM_AGENT_DEBUG": "false",
315-
"PMM_AGENT_TRACE": "false",
316-
"PMM_AGENT_SERVER_INSECURE_TLS": "1",
317-
"PMM_AGENT_LISTEN_ADDRESS": "0.0.0.0",
318-
"PMM_AGENT_SETUP_NODE_NAME": "$(POD_NAMESPACE)-$(POD_NAME)",
319-
"PMM_AGENT_SETUP_METRICS_MODE": "push",
320-
"PMM_AGENT_SETUP": "1",
321-
"PMM_AGENT_SETUP_FORCE": "1",
322-
"PMM_AGENT_SETUP_NODE_TYPE": "container",
323-
"PMM_AGENT_SIDECAR": "true",
324-
"PMM_AGENT_SIDECAR_SLEEP": "5",
325-
"DB_TYPE": "postgresql",
326-
"DB_USER": v2.UserMonitoring,
327-
"DB_PASS": "", // secret reference is asserted separately
328-
"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 add external --scheme=https --listen-port=8008 --tls-skip-verify --service-name=$(PMM_AGENT_SETUP_NODE_NAME)-patroni-external; pmm-admin annotate --service-name=$(PMM_AGENT_SETUP_NODE_NAME) 'Service restarted'",
329-
"PMM_AGENT_PATHS_TEMPDIR": "/tmp/pmm",
330-
"PMM_AGENT_SETUP_MOUNT_INFO_PATH": "/proc/self/mounts",
304+
"POD_NAME": "", // field reference is asserted separately
305+
"POD_NAMESPACE": "", // field reference is asserted separately
306+
"PMM_AGENT_SERVER_ADDRESS": pmmSpec.ServerHost,
307+
"PMM_AGENT_SERVER_USERNAME": "service_token",
308+
"PMM_AGENT_SERVER_PASSWORD": "", // secret reference is asserted separately
309+
"PMM_AGENT_LISTEN_PORT": "7777",
310+
"PMM_AGENT_PORTS_MIN": "30100",
311+
"PMM_AGENT_PORTS_MAX": "30105",
312+
"PMM_AGENT_CONFIG_FILE": "/usr/local/percona/pmm/config/pmm-agent.yaml",
313+
"PMM_AGENT_LOG_LEVEL": "info",
314+
"PMM_AGENT_DEBUG": "false",
315+
"PMM_AGENT_TRACE": "false",
316+
"PMM_AGENT_SERVER_INSECURE_TLS": "1",
317+
"PMM_AGENT_LISTEN_ADDRESS": "0.0.0.0",
318+
"PMM_AGENT_SETUP_NODE_NAME": "$(POD_NAMESPACE)-$(POD_NAME)",
319+
"PMM_AGENT_SETUP_METRICS_MODE": "push",
320+
"PMM_AGENT_SETUP": "1",
321+
"PMM_AGENT_SETUP_FORCE": "1",
322+
"PMM_AGENT_SETUP_NODE_TYPE": "container",
323+
"PMM_AGENT_SIDECAR": "true",
324+
"PMM_AGENT_SIDECAR_SLEEP": "5",
325+
"DB_TYPE": "postgresql",
326+
"DB_USER": v2.UserMonitoring,
327+
"DB_PASS": "", // secret reference is asserted separately
328+
"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 add external --scheme=https --listen-port=8008 --tls-skip-verify --service-name=$(PMM_AGENT_SETUP_NODE_NAME)-patroni-external; pmm-admin annotate --service-name=$(PMM_AGENT_SETUP_NODE_NAME) 'Service restarted'",
329+
"PMM_AGENT_PATHS_TEMPDIR": "/tmp/pmm",
330+
"PMM_AGENT_SETUP_PROC_MOUNTS_PATH": "/proc/self/mounts",
331331
}
332332

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

0 commit comments

Comments
 (0)