K8SPG-750 fix env var ordering (#1172)

Author: gkech

percona/pmm/pmm.go

@@ -58,7 +58,7 @@ func sidecarContainerV2(pgc *v2.PerconaPGCluster) corev1.Container {
 		})
 	}
 
-	container := corev1.Container{
+	return corev1.Container{
 		Name:            "pmm-client",
 		Image:           pmmSpec.Image,
 		ImagePullPolicy: pmmSpec.ImagePullPolicy,
@@ -242,25 +242,6 @@ func sidecarContainerV2(pgc *v2.PerconaPGCluster) corev1.Container {
 			},
 		},
 	}
-
-	if pgc.CompareVersion("2.7.0") >= 0 {
-		clusterName := pgc.Name
-		if pgc.Spec.PMM.CustomClusterName != "" {
-			clusterName = pgc.Spec.PMM.CustomClusterName
-		}
-		container.Env = append(container.Env,
-			corev1.EnvVar{
-				Name:  "CLUSTER_NAME",
-				Value: clusterName,
-			},
-			corev1.EnvVar{
-				Name:  "PMM_POSTGRES_PARAMS",
-				Value: pmmSpec.PostgresParams,
-			},
-		)
-	}
-
-	return container
 }
 
 // sidecarContainerV3 refers to the construction of the PMM3 container.
@@ -273,10 +254,6 @@ func sidecarContainerV3(pgc *v2.PerconaPGCluster) corev1.Container {
 	}
 
 	pmmSpec := pgc.Spec.PMM
-	clusterName := pgc.Name
-	if pgc.Spec.PMM.CustomClusterName != "" {
-		clusterName = pgc.Spec.PMM.CustomClusterName
-	}
 
 	container := corev1.Container{
 		Name:            "pmm-client",
@@ -452,14 +429,6 @@ func sidecarContainerV3(pgc *v2.PerconaPGCluster) corev1.Container {
 				Name:  "PMM_AGENT_PATHS_TEMPDIR",
 				Value: "/tmp",
 			},
-			{
-				Name:  "CLUSTER_NAME",
-				Value: clusterName,
-			},
-			{
-				Name:  "PMM_POSTGRES_PARAMS",
-				Value: pmmSpec.PostgresParams,
-			},
 		},
 	}
 
@@ -486,8 +455,12 @@ func agentPrerunScript(querySource v2.PMMQuerySource, pgc *v2.PerconaPGCluster)
 	}
 
 	if pgc.CompareVersion("2.7.0") >= 0 {
+		clusterName := pgc.Name
+		if pgc.Spec.PMM.CustomClusterName != "" {
+			clusterName = pgc.Spec.PMM.CustomClusterName
+		}
 		addServiceArgs = append(addServiceArgs,
-			"--cluster=$(CLUSTER_NAME)", "$PMM_POSTGRES_PARAMS",
+			fmt.Sprintf("--cluster=%s", clusterName), pgc.Spec.PMM.PostgresParams,
 		)
 	}
 	addService := fmt.Sprintf("pmm-admin add postgresql %s", strings.Join(addServiceArgs, " "))

percona/pmm/pmm_test.go

@@ -179,7 +179,7 @@ func TestSidecarContainerV2(t *testing.T) {
 	assert.NotNil(t, container.Lifecycle.PreStop)
 	assert.Equal(t, []string{"bash", "-c", "pmm-admin unregister --force"}, container.Lifecycle.PreStop.Exec.Command)
 
-	assert.Len(t, container.Env, 33)
+	assert.Len(t, container.Env, 31)
 
 	expectedEnvVars := map[string]string{
 		"POD_NAME":                      "", // field reference is asserted separately
@@ -211,10 +211,8 @@ func TestSidecarContainerV2(t *testing.T) {
 		"DB_TYPE":                       "postgresql",
 		"DB_USER":                       v2.UserMonitoring,
 		"DB_PASS":                       "", // secret reference is asserted separately
-		"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_POSTGRES_PARAMS; pmm-admin annotate --service-name=$(PMM_AGENT_SETUP_NODE_NAME) 'Service restarted'",
+		"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'",
 		"PMM_AGENT_PATHS_TEMPDIR":       "/tmp",
-		"CLUSTER_NAME":                  "test-cluster",
-		"PMM_POSTGRES_PARAMS":           "--environment=dev-postgres",
 	}
 
 	for _, envVar := range container.Env {
@@ -293,7 +291,7 @@ func TestSidecarContainerV3(t *testing.T) {
 	assert.NotNil(t, container.Lifecycle.PreStop)
 	assert.Equal(t, []string{"bash", "-c", "pmm-admin unregister --force"}, container.Lifecycle.PreStop.Exec.Command)
 
-	assert.Len(t, container.Env, 28)
+	assert.Len(t, container.Env, 26)
 
 	expectedEnvVars := map[string]string{
 		"POD_NAME":                      "", // field reference is asserted separately
@@ -320,10 +318,8 @@ func TestSidecarContainerV3(t *testing.T) {
 		"DB_TYPE":                       "postgresql",
 		"DB_USER":                       v2.UserMonitoring,
 		"DB_PASS":                       "", // secret reference is asserted separately
-		"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_POSTGRES_PARAMS; pmm-admin annotate --service-name=$(PMM_AGENT_SETUP_NODE_NAME) 'Service restarted'",
+		"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'",
 		"PMM_AGENT_PATHS_TEMPDIR":       "/tmp",
-		"CLUSTER_NAME":                  "test-cluster",
-		"PMM_POSTGRES_PARAMS":           "--environment=dev-postgres",
 	}
 
 	for _, envVar := range container.Env {