K8SPG-719 fixes on the deploy_pmm3_server for openshift (#1224)

* K8SPG-719 fixes on the deploy_pmm3_server for openshift

* shfmt

* remove platform specific set

* move init on top of the function

* add retry func

Author: gkech

e2e-tests/functions

@@ -370,9 +370,14 @@ deploy_pmm_server() {
 }
 
 deploy_pmm3_server() {
-	helm uninstall -n "${NAMESPACE}" pmm || :
+	helm uninstall -n "${NAMESPACE}" 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
-		platform=openshift
 		oc create sa pmm-server -n "$NAMESPACE"
 		oc adm policy add-scc-to-user privileged -z pmm-server -n "$NAMESPACE"
 
@@ -384,24 +389,32 @@ deploy_pmm3_server() {
 			oc create rolebinding pmm-pg-operator-namespace-only --role percona-postgresql-operator --serviceaccount=$NAMESPACE:pmm-server -n "${NAMESPACE}"
 			oc patch role/percona-postgresql-operator --type json -p='[{"op":"add","path": "/rules/-","value":{"apiGroups":["security.openshift.io"],"resources":["securitycontextconstraints"],"verbs":["use"],"resourceNames":["privileged"]}}]' -n "$NAMESPACE"
 		fi
-		helm install monitoring --set imageTag=${IMAGE_PMM3_SERVER#*:} --set imageRepo=${IMAGE_PMM3_SERVER%:*} --set platform=$platform --set sa=pmm-server --set supresshttp2=false https://percona-charts.storage.googleapis.com/pmm-server-${PMM_SERVER_VERSION}.tgz -n "$NAMESPACE"
-	else
-		platform=kubernetes
-
-		helm uninstall -n "${NAMESPACE}" 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 install monitoring percona/pmm -n "${NAMESPACE}" \
-			--set fullnameOverride=monitoring \
-			--set image.tag=${IMAGE_PMM3_SERVER#*:} \
-			--set image.repository=${IMAGE_PMM3_SERVER%:*} \
-			--set service.type=LoadBalancer \
-			--set platform="$platform" \
-			--force
+		local additional_params="--set platform=openshift --set supresshttp2=false --set serviceAccount.create=false --set serviceAccount.name=pmm-server"
 	fi
+
+	retry 10 60 helm install monitoring percona/pmm -n "${NAMESPACE}" \
+		--set fullnameOverride=monitoring \
+		--set image.tag=${IMAGE_PMM3_SERVER#*:} \
+		--set image.repository=${IMAGE_PMM3_SERVER%:*} \
+		--set service.type=LoadBalancer \
+		$additional_params \
+		--force
+}
+
+retry() {
+	local max=$1
+	local delay=$2
+	shift 2 # cut delay and max args
+	local n=1
+
+	until "$@"; do
+		if [[ $n -ge $max ]]; then
+			echo "The command '$@' has failed after $n attempts."
+			exit 1
+		fi
+		((n++))
+		sleep $delay
+	done
 }
 
 generate_pmm_api_key() {