K8SPS-162 - Fix mysql x protocol from haproxy (#426)

* K8SPS-162 - Fix mysql x protocol from haproxy

* Fix mysql admin port and x protocol in haproxy

* Fix backend name for admin port in haproxy

* Fix gr-haproxy test, use newer client and add usage of mysqlsh

Author: tplavcic

build/haproxy-global.cfg

@@ -30,13 +30,13 @@
       bind *:33060
       mode tcp
       option clitcpka
-      default_backend mysql-primary
+      default_backend mysql-x
 
     frontend mysql-admin-in
       bind *:33062
       mode tcp
       option clitcpka
-      default_backend mysql-primary
+      default_backend mysql-admin
 
     frontend stats
       bind *:8404

build/haproxy.cfg

@@ -11,3 +11,17 @@
       balance roundrobin
       option external-check
 	  external-check command /opt/percona/haproxy_check_replicas.sh
+
+    backend mysql-x
+      mode tcp
+      option srvtcpka
+      balance roundrobin
+      option external-check
+	  external-check command /opt/percona/haproxy_check_replicas.sh
+
+    backend mysql-admin
+      mode tcp
+      option srvtcpka
+      balance roundrobin
+      option external-check
+	  external-check command /opt/percona/haproxy_check_replicas.sh

build/haproxy_add_mysql_nodes.sh

@@ -65,6 +65,34 @@ function main() {
 		echo "${NODE_LIST_REPL[*]}"
 	) >>"$path_to_haproxy_cfg/haproxy.cfg"
 
+	cat <<-EOF >>"$path_to_haproxy_cfg/haproxy.cfg"
+		    backend mysql-x
+		      mode tcp
+		      option srvtcpka
+		      balance roundrobin
+		      option external-check
+		      external-check command /opt/percona/haproxy_check_replicas.sh
+	EOF
+
+	(
+		IFS=$'\n'
+		echo "${NODE_LIST_MYSQLX[*]}"
+	) >>"$path_to_haproxy_cfg/haproxy.cfg"
+
+	cat <<-EOF >>"$path_to_haproxy_cfg/haproxy.cfg"
+		    backend mysql-admin
+		      mode tcp
+		      option srvtcpka
+		      balance roundrobin
+		      option external-check
+		      external-check command /opt/percona/haproxy_check_replicas.sh
+	EOF
+
+	(
+		IFS=$'\n'
+		echo "${NODE_LIST_ADMIN[*]}"
+	) >>"$path_to_haproxy_cfg/haproxy.cfg"
+
 	haproxy -c -f /opt/percona/haproxy-global.cfg -f $path_to_haproxy_cfg/haproxy.cfg
 
 	# TODO: Can we do something for maintenance mode?

e2e-tests/conf/client.yaml

@@ -7,7 +7,7 @@ metadata:
 spec:
   containers:
   - name: mysql-client
-    image: percona/percona-server:8.0.25
+    image: percona/percona-server:8.0.33
     command:
     - sleep
     - infinity

e2e-tests/functions

@@ -161,6 +161,19 @@ run_mysql() {
 		| (grep -v 'Using a password on the command line interface can be insecure.' || :)
 }
 
+run_mysqlsh() {
+	local command="$1"
+	local uri="$2"
+	local pod="$3"
+
+	client_pod=$(get_client_pod)
+	wait_pod $client_pod 1>&2
+
+	kubectl -n "${NAMESPACE}" exec "${pod:-mysql-client}" -- \
+		bash -c "printf '%s\n' \"${command}\" | mysqlsh --sql --quiet-start=2 $uri" 2>&1 \
+		| tail -n +2
+}
+
 run_curl() {
 	kubectl -n "${NAMESPACE}" exec mysql-client -- bash -c "curl -s -k $*"
 }

e2e-tests/tests/gr-haproxy/03-check-connections.yaml

@@ -19,7 +19,7 @@ commands:
       # proxy_protocol=$(run_mysql "SELECT count(*) FROM myDB.myTable" "-h $(get_haproxy_svc $(get_cluster_name)) -P 3309 -uroot -proot_password")
       # args="${args} --from-literal=proxy_protocol=${proxy_protocol}"
 
-      mysqlx=$(run_mysql "SELECT count(*) FROM myDB.myTable" "-h $(get_haproxy_svc $(get_cluster_name)) -P 33060 -uroot -proot_password")
+      mysqlx=$(run_mysqlsh "SELECT count(*) FROM myDB.myTable" "-h $(get_haproxy_svc $(get_cluster_name)) -P 33060 -uroot -proot_password")
       args="${args} --from-literal=mysqlx=${mysqlx}"
 
       mysql_admin=$(run_mysql "SELECT count(*) FROM myDB.myTable" "-h $(get_haproxy_svc $(get_cluster_name)) -P 33062 -uroot -proot_password")