K8SPXC-1781: [bugfix] cannot use custom proxysql config

build/proxysql-entrypoint.sh

@@ -14,6 +14,10 @@
 }
 
 cp /opt/percona/proxysql.cnf /etc/proxysql
+if [[ -f /etc/proxysql/custom/proxysql.cnf ]]; then
+	cp /etc/proxysql/custom/proxysql.cnf /etc/proxysql/proxysql.cnf
+fi
+
 cp /opt/percona/proxysql-admin.cnf /etc
 
 MYSQL_INTERFACES='0.0.0.0:3306;0.0.0.0:33062'
@@ -25,7 +29,7 @@
 # Percona scheduler
 PERCONA_SCHEDULER_CFG_TMPL=/opt/percona/proxysql_scheduler_config.tmpl
 if [[ -f ${PERCONA_SCHEDULER_CFG_TMPL} && -n ${PERCONA_SCHEDULER_CFG} ]]; then
 	cp ${PERCONA_SCHEDULER_CFG_TMPL} ${PERCONA_SCHEDULER_CFG}
 fi
 
 # internal scheduler
@@ -35,9 +39,9 @@
 sed_in_place "s/threads=2/threads=${MYSQL_THREADS:-2}/g" ${PROXY_CFG}
 
 set +o xtrace # hide sensitive information
 OPERATOR_PASSWORD_ESCAPED=$(sed 's/[][\-\!\#\$\%\&\(\)\*\+\,\.\:\;\<\=\>\?\@\^\_\~\{\}]/\\&/g' <<<"${OPERATOR_PASSWORD}")
 MONITOR_PASSWORD_ESCAPED=$(sed 's/[][\-\!\#\$\%\&\(\)\*\+\,\.\:\;\<\=\>\?\@\^\_\~\{\}]/\\&/g' <<<"${MONITOR_PASSWORD}")
 PROXY_ADMIN_PASSWORD_ESCAPED=$(sed 's/[][\-\!\#\$\%\&\(\)\*\+\,\.\:\;\<\=\>\?\@\^\_\~\{\}]/\\&/g' <<<"${PROXY_ADMIN_PASSWORD}")
 
 sed_in_place "s/\"admin:admin\"/\"${PROXY_ADMIN_USER:-admin}:${PROXY_ADMIN_PASSWORD_ESCAPED:-admin}\"/g" ${PROXY_CFG}
 sed_in_place "s/cluster_username=\"admin\"/cluster_username=\"${PROXY_ADMIN_USER:-admin}\"/g" ${PROXY_CFG}
@@ -55,21 +59,21 @@
 # Percona scheduler
 if [[ -f ${PERCONA_SCHEDULER_CFG} ]]; then
 	set +o xtrace # hide sensitive information
 	sed_in_place "s/SCHEDULER_PROXYSQLPASSWORD/'${PROXY_ADMIN_PASSWORD_ESCAPED:-admin}'/" ${PERCONA_SCHEDULER_CFG}
 	sed_in_place "s/SCHEDULER_CLUSTERPASSWORD/'${OPERATOR_PASSWORD_ESCAPED:-operator}'/" ${PERCONA_SCHEDULER_CFG}
 	sed_in_place "s/SCHEDULER_MONITORPASSWORD/'${MONITOR_PASSWORD_ESCAPED:-monitor}'/" ${PERCONA_SCHEDULER_CFG}
 	set -o xtrace # hide sensitive information
 
 	sed_in_place "s/SCHEDULER_PROXYSQLHOST/'$(hostname -f)'/" ${PERCONA_SCHEDULER_CFG}
 	sed_in_place "s/SCHEDULER_CLUSTERHOST/'${PXC_SERVICE}.$(hostname -f | cut -d '.' -f3-)'/" ${PERCONA_SCHEDULER_CFG}
 	sed_in_place "s/SCHEDULER_CLUSTERPORT/'${CLUSTER_PORT:-3306}'/" ${PERCONA_SCHEDULER_CFG}
 	sed_in_place "s/SCHEDULER_MAXCONNECTIONS/${SCHEDULER_MAXCONNECTIONS}/g" ${PERCONA_SCHEDULER_CFG}
 	sed_in_place "s/SCHEDULER_NODECHECKINTERVAL/${SCHEDULER_NODECHECKINTERVAL}/g" ${PERCONA_SCHEDULER_CFG}
 	sed_in_place "s/SCHEDULER_CHECKTIMEOUT/${SCHEDULER_CHECKTIMEOUT}/g" ${PERCONA_SCHEDULER_CFG}
 	sed_in_place "s/SCHEDULER_PINGTIMEOUT/${SCHEDULER_PINGTIMEOUT}/g" ${PERCONA_SCHEDULER_CFG}
 	sed_in_place "s/SCHEDULER_RETRYDOWN/${SCHEDULER_RETRYDOWN}/g" ${PERCONA_SCHEDULER_CFG}
 	sed_in_place "s/SCHEDULER_RETRYUP/${SCHEDULER_RETRYUP}/g" ${PERCONA_SCHEDULER_CFG}
 	sed_in_place "s/SCHEDULER_WRITERALSOREADER/${SCHEDULER_WRITERALSOREADER}/g" ${PERCONA_SCHEDULER_CFG}
 fi
 
 ## SSL/TLS support
@@ -81,14 +85,14 @@
 if [ -f "${SSL_DIR}/ca.crt" ]; then
 	CA=${SSL_DIR}/ca.crt
 	if [[ -f ${PERCONA_SCHEDULER_CFG} ]]; then
 		sed_in_place "s:^sslCertificatePath.*= .*\"$:sslCertificatePath = \"${SSL_DIR}\":" ${PERCONA_SCHEDULER_CFG}
 	fi
 fi
 SSL_INTERNAL_DIR=${SSL_INTERNAL_DIR:-/etc/proxysql/ssl-internal}
 if [ -f "${SSL_INTERNAL_DIR}/ca.crt" ]; then
 	CA=${SSL_INTERNAL_DIR}/ca.crt
 	if [[ -f ${PERCONA_SCHEDULER_CFG} ]]; then
 		sed_in_place "s:^sslCertificatePath.*= .*\"$:sslCertificatePath = \"${SSL_INTERNAL_DIR}\":" ${PERCONA_SCHEDULER_CFG}
 	fi
 fi
 
@@ -108,9 +112,9 @@
 
 	# Percona scheduler
 	if [[ -f ${PERCONA_SCHEDULER_CFG} ]]; then
 		sed_in_place "s:^sslCa.*=.*\"$:sslCa = \"${CA##*/}\":" ${PERCONA_SCHEDULER_CFG}
 		sed_in_place "s:^sslKey.*=.*\"$:sslKey = \"${KEY##*/}\":" ${PERCONA_SCHEDULER_CFG}
 		sed_in_place "s:^sslClient.*=.*\"$:sslClient = \"${CERT##*/}\":" ${PERCONA_SCHEDULER_CFG}
 	fi
 fi
 
@@ -122,7 +126,7 @@
 	cp "${SSL_DIR}/ca.crt" /var/lib/proxysql/proxysql-ca.pem
 fi
 
 test -e /opt/percona/hookscript/hook.sh && source /opt/percona/hookscript/hook.sh
 
 # Start zombie reaper to clean up processes spawned by commands
 # This is needed because percona-scheduler-admin may not properly reap all child processes
@@ -150,7 +154,7 @@
 MAIN_PID=$!
 
 # Forward signals to main process
 forward_signal() {
        kill -"$1" "$MAIN_PID" 2>/dev/null || true
 }
 trap 'forward_signal TERM' TERM

deploy/cr.yaml

@@ -404,12 +404,14 @@ spec:
 #
 #      admin_variables =
 #      {
-#        admin_credentials="proxyadmin:admin_password"
+#        admin_credentials="admin:admin"
 #        mysql_ifaces="0.0.0.0:6032"
 #        refresh_interval=2000
+#        restapi_enabled=true
+#        restapi_port=6070
 #
-#        cluster_username="proxyadmin"
-#        cluster_password="admin_password"
+#        cluster_username="admin"
+#        cluster_password="admin"
 #        checksum_admin_variables=false
 #        checksum_ldap_variables=false
 #        checksum_mysql_variables=false
@@ -444,11 +446,12 @@ spec:
 #        ping_timeout_server=200
 #        commands_stats=true
 #        sessions_sort=true
-#        have_ssl=true
-#        ssl_p2s_ca="/etc/proxysql/ssl-internal/ca.crt"
-#        ssl_p2s_cert="/etc/proxysql/ssl-internal/tls.crt"
-#        ssl_p2s_key="/etc/proxysql/ssl-internal/tls.key"
+#        have_ssl=false
+#        ssl_p2s_ca=""
+#        ssl_p2s_cert=""
+#        ssl_p2s_key=""
 #        ssl_p2s_cipher="ECDHE-RSA-AES128-GCM-SHA256"
+#        default_authentication_plugin="caching_sha2_password"
 #      }
 #    scheduler:
 #      enabled: false

pkg/pxc/app/statefulset/proxysql.go

@@ -146,7 +146,7 @@ func (c *Proxy) AppContainer(ctx context.Context, _ client.Client, spec *api.Pod
 	if api.ContainsVolume(availableVolumes, proxyConfigVolumeName) {
 		appc.VolumeMounts = append(appc.VolumeMounts, corev1.VolumeMount{
 			Name:      proxyConfigVolumeName,
-			MountPath: "/etc/proxysql/",
+			MountPath: "/etc/proxysql/custom",
 		})
 	}