Skip to content

Commit 1776c73

Browse files
committed
fix unit test
1 parent 3f83c9b commit 1776c73

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

percona/pmm/pmm_test.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ func TestSidecarContainerV2(t *testing.T) {
150150

151151
pgc := &v2.PerconaPGCluster{
152152
Spec: v2.PerconaPGClusterSpec{
153-
CRVersion: "2.6.0",
153+
CRVersion: "2.7.0",
154154
PMM: pmmSpec,
155155
},
156156
ObjectMeta: metav1.ObjectMeta{
@@ -179,7 +179,7 @@ func TestSidecarContainerV2(t *testing.T) {
179179
assert.NotNil(t, container.Lifecycle.PreStop)
180180
assert.Equal(t, []string{"bash", "-c", "pmm-admin unregister --force"}, container.Lifecycle.PreStop.Exec.Command)
181181

182-
assert.Len(t, container.Env, 31)
182+
assert.Len(t, container.Env, 32)
183183

184184
expectedEnvVars := map[string]string{
185185
"POD_NAME": "", // field reference is asserted separately
@@ -211,8 +211,9 @@ func TestSidecarContainerV2(t *testing.T) {
211211
"DB_TYPE": "postgresql",
212212
"DB_USER": v2.UserMonitoring,
213213
"DB_PASS": "", // secret reference is asserted separately
214-
"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=; pmm-admin annotate --service-name=$(PMM_AGENT_SETUP_NODE_NAME) 'Service restarted'",
214+
"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=$(CLUSTER_NAME); pmm-admin annotate --service-name=$(PMM_AGENT_SETUP_NODE_NAME) 'Service restarted'",
215215
"PMM_AGENT_PATHS_TEMPDIR": "/tmp",
216+
"CLUSTER_NAME": "test-cluster",
216217
}
217218

218219
for _, envVar := range container.Env {
@@ -290,7 +291,7 @@ func TestSidecarContainerV3(t *testing.T) {
290291
assert.NotNil(t, container.Lifecycle.PreStop)
291292
assert.Equal(t, []string{"bash", "-c", "pmm-admin unregister --force"}, container.Lifecycle.PreStop.Exec.Command)
292293

293-
assert.Len(t, container.Env, 26)
294+
assert.Len(t, container.Env, 27)
294295

295296
expectedEnvVars := map[string]string{
296297
"POD_NAME": "", // field reference is asserted separately
@@ -317,8 +318,9 @@ func TestSidecarContainerV3(t *testing.T) {
317318
"DB_TYPE": "postgresql",
318319
"DB_USER": v2.UserMonitoring,
319320
"DB_PASS": "", // secret reference is asserted separately
320-
"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=; pmm-admin annotate --service-name=$(PMM_AGENT_SETUP_NODE_NAME) 'Service restarted'",
321+
"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=$(CLUSTER_NAME); pmm-admin annotate --service-name=$(PMM_AGENT_SETUP_NODE_NAME) 'Service restarted'",
321322
"PMM_AGENT_PATHS_TEMPDIR": "/tmp",
323+
"CLUSTER_NAME": "test-cluster",
322324
}
323325

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

0 commit comments

Comments
 (0)