K8SPSMDB-1268 pmm3 support (#1916)

* K8SPSMDB-1268 pmm3 support

* fix imports

* assert the env var lengths

* add server host

* cover more inits in test

* add custom params

* improve test

* remove spammy logs

* e2e tests

* fix mounts for pmm3 container

* update secret with new token comment

* wrapup e2e test

* drop unused env vars

* ensure that pmm3 test is fully functional

* bonus: improve the custom name e2e verification

* add small assertion to ensure that disabled pmm and nil secret return no container

* make custom cluster name configurable in cr for the e2e test

* fix linter

* cr: package rename to config

* add some more test cases

Author: gkech

cmd/mongodb-healthcheck/logger/logger.go

@@ -13,7 +13,7 @@ import (
 	"gopkg.in/natefinch/lumberjack.v2"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	"github.com/percona/percona-server-mongodb-operator/pkg/psmdb"
+	"github.com/percona/percona-server-mongodb-operator/pkg/psmdb/config"
 )
 
 type Logger struct {
@@ -22,7 +22,7 @@ type Logger struct {
 }
 
 func New() *Logger {
-	logPath := filepath.Join(psmdb.MongodDataVolClaimName, "logs", "mongodb-healthcheck.log")
+	logPath := filepath.Join(config.MongodDataVolClaimName, "logs", "mongodb-healthcheck.log")
 
 	return newLogger(logPath)
 }

deploy/secrets.yaml

@@ -17,3 +17,4 @@ stringData:
   PMM_SERVER_API_KEY: apikey
   #PMM_SERVER_USER: admin
   #PMM_SERVER_PASSWORD: admin
+  #PMM_SERVER_TOKEN: token

e2e-tests/default-cr/run

@@ -91,33 +91,6 @@ function main() {
 	compare_generation "1" "statefulset" "${cluster}-mongos"
 	compare_generation "1" "psmdb" "${cluster}"
 
-	desc 'install PMM Server'
-	deploy_pmm_server
-	sleep 20
-	kubectl_bin patch psmdb ${cluster} --type=merge --patch '{
-			"spec": {"pmm":{"enabled":true}}
-		}'
-	sleep 120
-	# since psmdb cluster won't work without pmm server running consistency check would be enough
-	wait_cluster_consistency $cluster
-
-	kubectl_bin patch psmdb ${cluster} --type=merge --patch '{
-			"spec": {"pmm":{"enabled":false}}
-		}'
-	sleep 120
-
-	if [[ -n ${OPENSHIFT} ]]; then
-		oc adm policy remove-scc-from-user privileged -z pmm-server
-		if [ -n "$OPERATOR_NS" ]; then
-			oc delete clusterrolebinding pmm-psmdb-operator-cluster-wide
-		else
-			oc delete rolebinding pmm-psmdb-operator-namespace-only
-		fi
-	fi
-	helm uninstall monitoring
-
-	wait_cluster_consistency $cluster
-
 	desc 'enabling arbiter'
 	kubectl_bin patch psmdb ${cluster} --type json -p='[{"op":"replace","path":"/spec/replsets/0/arbiter/enabled","value":true},{"op":"replace","path":"/spec/replsets/0/size","value":4}]'
 	wait_cluster_consistency $cluster

e2e-tests/functions

@@ -15,6 +15,8 @@ SKIP_BACKUPS_TO_AWS_GCP_AZURE=${SKIP_BACKUPS_TO_AWS_GCP_AZURE:-1}
 PMM_SERVER_VER=${PMM_SERVER_VER:-"9.9.9"}
 IMAGE_PMM_CLIENT=${IMAGE_PMM_CLIENT:-"perconalab/pmm-client:dev-latest"}
 IMAGE_PMM_SERVER=${IMAGE_PMM_SERVER:-"perconalab/pmm-server:dev-latest"}
+IMAGE_PMM3_CLIENT=${IMAGE_PMM3_CLIENT:-"perconalab/pmm-client:3.1.0"}
+IMAGE_PMM3_SERVER=${IMAGE_PMM3_SERVER:-"perconalab/pmm-server:3.1.0"}
 CERT_MANAGER_VER="1.17.2"
 MINIO_VER="5.4.0"
 CHAOS_MESH_VER="2.7.1"

e2e-tests/monitoring-2-0/conf/monitoring-2-0.yml

@@ -0,0 +1,31 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    test: monitoring-pmm3
+  labels:
+    app.kubernetes.io/component: mongos
+    app.kubernetes.io/instance: monitoring-pmm3
+    app.kubernetes.io/managed-by: percona-server-mongodb-operator
+    app.kubernetes.io/name: percona-server-mongodb
+    app.kubernetes.io/part-of: percona-server-mongodb
+    test: monitoring-pmm3
+  name: monitoring-pmm3-mongos
+  ownerReferences:
+    - controller: true
+      kind: PerconaServerMongoDB
+      name: monitoring-pmm3
+spec:
+  ports:
+    - name: mongos
+      port: 27019
+      protocol: TCP
+      targetPort: 27019
+  selector:
+    app.kubernetes.io/component: mongos
+    app.kubernetes.io/instance: monitoring-pmm3
+    app.kubernetes.io/managed-by: percona-server-mongodb-operator
+    app.kubernetes.io/name: percona-server-mongodb
+    app.kubernetes.io/part-of: percona-server-mongodb
+  sessionAffinity: None
+  type: ClusterIP

e2e-tests/monitoring-pmm3/compare/service_monitoring-pmm3-mongos.yml

@@ -0,0 +1,29 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/instance: monitoring-pmm3
+    app.kubernetes.io/managed-by: percona-server-mongodb-operator
+    app.kubernetes.io/name: percona-server-mongodb
+    app.kubernetes.io/part-of: percona-server-mongodb
+    app.kubernetes.io/replset: rs0
+  name: monitoring-pmm3-rs0
+  ownerReferences:
+    - controller: true
+      kind: PerconaServerMongoDB
+      name: monitoring-pmm3
+spec:
+  ports:
+    - name: mongodb
+      port: 27019
+      protocol: TCP
+      targetPort: 27019
+  selector:
+    app.kubernetes.io/instance: monitoring-pmm3
+    app.kubernetes.io/managed-by: percona-server-mongodb-operator
+    app.kubernetes.io/name: percona-server-mongodb
+    app.kubernetes.io/part-of: percona-server-mongodb
+    app.kubernetes.io/replset: rs0
+  sessionAffinity: None
+  type: ClusterIP