From 3dccb2d812a537e5097a7a69282704fc1017eead Mon Sep 17 00:00:00 2001 From: Nivedithaa Mahendran Date: Thu, 28 Aug 2025 11:15:18 +0530 Subject: [PATCH 1/3] [patch] inconsistencies in db2 schema used in MREF deployments Issue: #MASCORE-8097 --- .../templates/07-postsync-setup-db2_Job.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml index a0e798131..b5d1d931a 100644 --- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml +++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml @@ -752,7 +752,11 @@ spec: echo "" echo "Construsting JDBC_CONNECTION_URL" echo "--------------------------------------------------------------------------------" - export JDBC_CONNECTION_URL="jdbc:db2://c-${DB2_INSTANCE_NAME}-db2u-engn-svc.${DB2_NAMESPACE}.svc:${DB2_TLS_SERVICEPORT}/${DB2_DBNAME}:sslConnection=true;sslVersion=${DB2_TLS_VERSION};" + if [[ "$MAS_APP_ID" == "facilities" ]]; then + export JDBC_CONNECTION_URL="jdbc:db2://c-${DB2_INSTANCE_NAME}-db2u-engn-svc.${DB2_NAMESPACE}.svc:${DB2_TLS_SERVICEPORT}/${DB2_DBNAME}:sslConnection=true;sslVersion=${DB2_TLS_VERSION};currentSchema={DB2_SCHEMA};" + else + export JDBC_CONNECTION_URL="jdbc:db2://c-${DB2_INSTANCE_NAME}-db2u-engn-svc.${DB2_NAMESPACE}.svc:${DB2_TLS_SERVICEPORT}/${DB2_DBNAME}:sslConnection=true;sslVersion=${DB2_TLS_VERSION};" + fi echo "" echo "Updating Secrets Manager" From 28c6e28d8bcaf3114760b8ba880dcebb142ebe8d Mon Sep 17 00:00:00 2001 From: Nivedithaa Mahendran Date: Tue, 2 Sep 2025 16:48:58 +0530 Subject: [PATCH 2/3] update job version --- .../templates/07-postsync-setup-db2_Job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml index b5d1d931a..c5da549e7 100644 --- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml +++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml @@ -26,7 +26,7 @@ Increment this value whenever you make a change to an immutable field of the Job E.g. passing in a new environment variable. Included in $_job_hash (see below). */}} -{{- $_job_version := "v14" }} +{{- $_job_version := "v15" }} {{- /* 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_digest From b2e20545b0de60665ba87c1c8e938853178ed889 Mon Sep 17 00:00:00 2001 From: Nivedithaa Mahendran Date: Tue, 2 Sep 2025 17:02:18 +0530 Subject: [PATCH 3/3] update --- .../templates/07-postsync-setup-db2_Job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml index 7b3626dfa..b9470ccfd 100644 --- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml +++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml @@ -753,7 +753,7 @@ spec: echo "Construsting JDBC_CONNECTION_URL" echo "--------------------------------------------------------------------------------" if [[ "$MAS_APP_ID" == "facilities" ]]; then - export JDBC_CONNECTION_URL="jdbc:db2://c-${DB2_INSTANCE_NAME}-db2u-engn-svc.${DB2_NAMESPACE}.svc:${DB2_TLS_SERVICEPORT}/${DB2_DBNAME}:sslConnection=true;sslVersion=${DB2_TLS_VERSION};currentSchema={DB2_SCHEMA};" + export JDBC_CONNECTION_URL="jdbc:db2://c-${DB2_INSTANCE_NAME}-db2u-engn-svc.${DB2_NAMESPACE}.svc:${DB2_TLS_SERVICEPORT}/${DB2_DBNAME}:sslConnection=true;sslVersion=${DB2_TLS_VERSION};currentSchema=${DB2_SCHEMA};" else export JDBC_CONNECTION_URL="jdbc:db2://c-${DB2_INSTANCE_NAME}-db2u-engn-svc.${DB2_NAMESPACE}.svc:${DB2_TLS_SERVICEPORT}/${DB2_DBNAME}:sslConnection=true;sslVersion=${DB2_TLS_VERSION};" fi