From f72d0fd0b21ca79fc00ed6cd69800c2ea5137c22 Mon Sep 17 00:00:00 2001 From: Alex Dehn Date: Wed, 14 Jan 2026 11:23:02 +0000 Subject: [PATCH] [SDNC] sdnc-init job fails if istio is not used Add additional parameter --skip-ssl-verify-server-cert to mysql Issue-ID: OOM-3378 Change-Id: I64d98a87d3f5cc92889a61b12f746d7e3d1f59ff Signed-off-by: Alex Dehn --- kubernetes/sdnc/resources/config/bin/createSdnrDb.sh | 2 +- kubernetes/sdnc/resources/config/bin/installSdncDb.sh | 6 +++--- kubernetes/sdnc/templates/sdnrdb-init-job.yaml | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/kubernetes/sdnc/resources/config/bin/createSdnrDb.sh b/kubernetes/sdnc/resources/config/bin/createSdnrDb.sh index 28c703b1bd..e04394fba5 100644 --- a/kubernetes/sdnc/resources/config/bin/createSdnrDb.sh +++ b/kubernetes/sdnc/resources/config/bin/createSdnrDb.sh @@ -22,7 +22,7 @@ echo "Create '${SDNRDBDATABASE}' and user '${SDNRDBUSERNAME}' within maria-galera database cluster" root_user=root -mysql -v -v -u $root_user -p${MYSQL_ROOT_PASSWORD} -Bse "\ +/usr/bin/mariadb -v -v -u $root_user -p${MYSQL_ROOT_PASSWORD} "${SDNC_DB_EXTRA_PARAMETERS}" -Bse "\ CREATE DATABASE IF NOT EXISTS ${SDNRDBDATABASE}; \ CREATE USER IF NOT EXISTS ${SDNRDBUSERNAME}@'%' IDENTIFIED BY '${SDNRDBPASSWORD}'; \ GRANT ALL PRIVILEGES ON ${SDNRDBDATABASE}.* TO '${SDNRDBUSERNAME}'@'%'; \ diff --git a/kubernetes/sdnc/resources/config/bin/installSdncDb.sh b/kubernetes/sdnc/resources/config/bin/installSdncDb.sh index 2406a48c37..a17b440e58 100755 --- a/kubernetes/sdnc/resources/config/bin/installSdncDb.sh +++ b/kubernetes/sdnc/resources/config/bin/installSdncDb.sh @@ -34,7 +34,7 @@ SDNC_DB_DATABASE=${SDNC_DB_DATABASE} # Create tablespace and user account -mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} mysql <<-END +/usr/bin/mariadb -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} "${SDNC_DB_EXTRA_PARAMETERS}" mysql <<-END CREATE DATABASE IF NOT EXISTS ${SDNC_DB_DATABASE}; CREATE USER IF NOT EXISTS '${SDNC_DB_USER}'@'localhost' IDENTIFIED BY '${SDNC_DB_PASSWORD}'; CREATE USER IF NOT EXISTS '${SDNC_DB_USER}'@'%' IDENTIFIED BY '${SDNC_DB_PASSWORD}'; @@ -47,12 +47,12 @@ END # load schema if [ -f ${ETC_DIR}/sdnctl.dump ] then - mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} ${SDNC_DB_DATABASE} < ${ETC_DIR}/sdnctl.dump + /usr/bin/mariadb -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} "${SDNC_DB_EXTRA_PARAMETERS}" ${SDNC_DB_DATABASE} < ${ETC_DIR}/sdnctl.dump fi for datafile in ${ETC_DIR}/*.data.dump do - mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} ${SDNC_DB_DATABASE} < $datafile + /usr/bin/mariadb -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} "${SDNC_DB_EXTRA_PARAMETERS}" ${SDNC_DB_DATABASE} < $datafile done # Create VNIs 100-199 diff --git a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml index 87c8d7cd07..5f159193ed 100755 --- a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml +++ b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml @@ -98,6 +98,10 @@ spec: {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "sdnrdb-secret" "key" "login") | indent 12 }} - name: SDNRDBPASSWORD {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "sdnrdb-secret" "key" "password") | indent 12 }} + {{- if ne (default "" .Values.global.ingress.provider) "istio" }} + - name: SDNC_DB_EXTRA_PARAMETERS + value: "--skip-ssl-verify-server-cert" + {{- end }} {{- else }} - name: SDNRDBURL value: "http://{{ .Values.elasticsearch.service.name | default "sdnrdb"}}.{{.Release.Namespace}}:{{.Values.elasticsearch.service.port | default "9200"}}" -- 2.16.6