K8SPXC-1511: Fix broken encryption in PXC 5.7

build/prepare_restored_cluster.sh

@@ -13,7 +13,7 @@
 function get_password() {
 	local user=$1
 
 	escape_special $(</etc/mysql/mysql-users-secret/${user})
 }
 
 MYSQL_VERSION=$(mysqld -V | awk '{print $3}' | awk -F'.' '{print $1"."$2}')
@@ -21,7 +21,7 @@
 
 vault_secret="/etc/mysql/vault-keyring-secret/keyring_vault.conf"
 if [ -f "${vault_secret}" ]; then
-	if [[ $MYSQL_VERSION == '8.0' ]]; then
+	if [[ $MYSQL_VERSION =~ ^(5\.7|8\.0)$ ]]; then
 		sed -i "/\[mysqld\]/a early-plugin-load=keyring_vault.so" $CFG
 		sed -i "/\[mysqld\]/a keyring_vault_config=${vault_secret}" $CFG
 	fi

build/pxc-entrypoint.sh

@@ -500,7 +500,7 @@ fi
 # if vault secret file exists we assume we need to turn on encryption
 vault_secret="/etc/mysql/vault-keyring-secret/keyring_vault.conf"
 if [ -f "$vault_secret" ]; then
-	if [[ $MYSQL_VERSION == '8.0' ]]; then
+	if [[ $MYSQL_VERSION =~ ^(5\.7|8\.0)$ ]]; then
 		sed -i "/\[mysqld\]/a early-plugin-load=keyring_vault.so" $CFG
 		sed -i "/\[mysqld\]/a keyring_vault_config=$vault_secret" $CFG
 	fi

e2e-tests/run-pr.csv

@@ -5,8 +5,10 @@ cross-site,8.0
 custom-users,8.0
 demand-backup-cloud,8.0
 demand-backup-cloud-pxb,8.0
+demand-backup-encrypted-with-tls,5.7
 demand-backup-encrypted-with-tls,8.0
 demand-backup-encrypted-with-tls,8.4
+demand-backup-encrypted-with-tls-pxb,5.7
 demand-backup-encrypted-with-tls-pxb,8.0
 demand-backup-encrypted-with-tls-pxb,8.4
 demand-backup,8.0