K8SPSMDB fixes on the deploy_pmm3_server for openshift (#2000)

Co-authored-by: Viacheslav Sarzhan <[email protected]>

Author: gkech

e2e-tests/monitoring-pmm3/run

@@ -62,8 +62,13 @@ verify_custom_cluster_name() {
 }
 
 deploy_pmm3_server() {
-	helm repo remove stable || :
-	helm repo add stable https://charts.helm.sh/stable
+	helm uninstall monitoring || :
+	helm repo remove percona || :
+	kubectl delete clusterrole monitoring --ignore-not-found
+	kubectl delete clusterrolebinding monitoring --ignore-not-found
+	helm repo add percona https://percona.github.io/percona-helm-charts/
+	helm repo update
+
 	if [[ $OPENSHIFT ]]; then
 		oc create sa pmm-server
 		oc adm policy add-scc-to-user privileged -z pmm-server
@@ -75,16 +80,9 @@ deploy_pmm3_server() {
 			oc create rolebinding pmm-psmdb-operator-namespace-only --role percona-server-mongodb-operator --serviceaccount=$namespace:pmm-server
 			oc patch role/percona-server-mongodb-operator --type json -p='[{"op":"add","path": "/rules/-","value":{"apiGroups":["security.openshift.io"],"resources":["securitycontextconstraints"],"verbs":["use"],"resourceNames":["privileged"]}}]'
 		fi
-		local additional_params="--set platform=openshift --set sa=pmm-server --set supresshttp2=false"
+		local additional_params="--set platform=openshift --set supresshttp2=false --set serviceAccount.create=false --set serviceAccount.name=pmm-server"
 	fi
 
-	helm uninstall monitoring || :
-	helm repo remove percona || :
-	kubectl delete clusterrole monitoring --ignore-not-found
-	kubectl delete clusterrolebinding monitoring --ignore-not-found
-	helm repo add percona https://percona.github.io/percona-helm-charts/
-	helm repo update
-
 	retry 10 60 helm install monitoring percona/pmm \
 		--set fullnameOverride=monitoring-server \
 		--set image.tag=${IMAGE_PMM3_SERVER#*:} \