From 7c691a89d95b52e3d1349b6def00bb05cda3b996 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Tue, 10 Feb 2026 16:20:50 +0530
Subject: [PATCH 01/77] Add 'type: external' label to custom labels

---
 .../100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sls-applications/100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml b/sls-applications/100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml
index 2e039cc85..1379e0563 100644
--- a/sls-applications/100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml
+++ b/sls-applications/100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml
@@ -9,6 +9,7 @@ metadata:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
 {{- if .Values.custom_labels }}
   labels:
+    type: external
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:

From 1f5159ef38347a3d7f34afebfea89f59af58cc31 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Tue, 10 Feb 2026 16:58:26 +0530
Subject: [PATCH 02/77] Add DNS provider/CIS fields and label type

---
 .../ibm-mas-sls-root/templates/100-ibm-sls-app.yaml         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
index 0d84ab00f..e3c7fd09c 100644
--- a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
+++ b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
@@ -42,6 +42,11 @@ spec:
             ibm_customer_number: "{{ .Values.ibm_sls_standalone.ibm_customer_number }}"
             subscription_id: "{{ .Values.ibm_sls_standalone.subscription_id }}"
             sls_domain: "{{ .Values.ibm_sls_standalone.sls_domain }}"
+            dns_provider: "{{ .Values.ibm_sls_standalone.dns_provider}}"
+            {{- if eq .Values.ibm_sls_standalone.dns_provider "cis" }}
+            cis_service_name: "{{ .Values.ibm_sls_standalone.cis_service_name }}"
+            cis_crn: "{{ .Values.ibm_sls_standalone.cis_crn }}"
+            {{- end }}
             argo_namespace: "{{ .Values.argo.namespace }}"
             sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}"
             sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}"
@@ -56,6 +61,7 @@ spec:
             sls_install_plan: "{{ .Values.ibm_sls_standalone.sls_install_plan }}"
             mongo_spec: {{ .Values.ibm_sls_standalone.mongo_spec | toYaml | nindent 14}}
             {{- if .Values.custom_labels }}
+            type: external
             custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }}
             {{- end }}
             junitreporter:

From be6f5ba4fdcc6787046162d44009779f1a4d9cba Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Tue, 10 Feb 2026 17:41:07 +0530
Subject: [PATCH 03/77] Update 100-ibm-sls-app.yaml

---
 .../ibm-mas-sls-root/templates/100-ibm-sls-app.yaml             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
index e3c7fd09c..d95cdfdc9 100644
--- a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
+++ b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
@@ -43,7 +43,7 @@ spec:
             subscription_id: "{{ .Values.ibm_sls_standalone.subscription_id }}"
             sls_domain: "{{ .Values.ibm_sls_standalone.sls_domain }}"
             dns_provider: "{{ .Values.ibm_sls_standalone.dns_provider}}"
-            {{- if eq .Values.ibm_sls_standalone.dns_provider "cis" }}
+            {{- if contains "cis" .Values.ibm_sls_standalone.dns_provider }}
             cis_service_name: "{{ .Values.ibm_sls_standalone.cis_service_name }}"
             cis_crn: "{{ .Values.ibm_sls_standalone.cis_crn }}"
             {{- end }}

From 9d1a3c41401164bfc2c88af5b6ff4bfe3abf054b Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Tue, 10 Feb 2026 18:08:16 +0530
Subject: [PATCH 04/77] Use string equality for dns_provider check

---
 .../ibm-mas-sls-root/templates/100-ibm-sls-app.yaml           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
index d95cdfdc9..1fa0d7d30 100644
--- a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
+++ b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
@@ -42,8 +42,8 @@ spec:
             ibm_customer_number: "{{ .Values.ibm_sls_standalone.ibm_customer_number }}"
             subscription_id: "{{ .Values.ibm_sls_standalone.subscription_id }}"
             sls_domain: "{{ .Values.ibm_sls_standalone.sls_domain }}"
-            dns_provider: "{{ .Values.ibm_sls_standalone.dns_provider}}"
-            {{- if contains "cis" .Values.ibm_sls_standalone.dns_provider }}
+            dns_provider: "{{ .Values.ibm_sls_standalone.dns_provider }}"
+            {{- if eq (toString .Values.ibm_sls_standalone.dns_provider) 
             cis_service_name: "{{ .Values.ibm_sls_standalone.cis_service_name }}"
             cis_crn: "{{ .Values.ibm_sls_standalone.cis_crn }}"
             {{- end }}

From fb6c35efafeb6d1875bc61ad55387739959b48ed Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Tue, 10 Feb 2026 18:16:35 +0530
Subject: [PATCH 05/77] Update 100-ibm-sls-app.yaml

---
 .../ibm-mas-sls-root/templates/100-ibm-sls-app.yaml             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
index 1fa0d7d30..c990aed7a 100644
--- a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
+++ b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
@@ -43,7 +43,7 @@ spec:
             subscription_id: "{{ .Values.ibm_sls_standalone.subscription_id }}"
             sls_domain: "{{ .Values.ibm_sls_standalone.sls_domain }}"
             dns_provider: "{{ .Values.ibm_sls_standalone.dns_provider }}"
-            {{- if eq (toString .Values.ibm_sls_standalone.dns_provider) 
+            {{- if eq (toString .Values.ibm_sls_standalone.dns_provider) "cis" }} 
             cis_service_name: "{{ .Values.ibm_sls_standalone.cis_service_name }}"
             cis_crn: "{{ .Values.ibm_sls_standalone.cis_crn }}"
             {{- end }}

From b2de25c925b556e7e2e2f0cdf922b4a8cbf69728 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Tue, 10 Feb 2026 18:24:39 +0530
Subject: [PATCH 06/77] Update 100-ibm-sls-app.yaml

---
 .../ibm-mas-sls-root/templates/100-ibm-sls-app.yaml           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
index c990aed7a..d0e15dbd6 100644
--- a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
+++ b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
@@ -42,8 +42,8 @@ spec:
             ibm_customer_number: "{{ .Values.ibm_sls_standalone.ibm_customer_number }}"
             subscription_id: "{{ .Values.ibm_sls_standalone.subscription_id }}"
             sls_domain: "{{ .Values.ibm_sls_standalone.sls_domain }}"
-            dns_provider: "{{ .Values.ibm_sls_standalone.dns_provider }}"
-            {{- if eq (toString .Values.ibm_sls_standalone.dns_provider) "cis" }} 
+            dns_provider: "{{ .Values.ibm_sls_standalone.dns_provider | trim }}"
+            {{- if eq (.Values.ibm_sls_standalone.dns_provider | trim) "cis" }}
             cis_service_name: "{{ .Values.ibm_sls_standalone.cis_service_name }}"
             cis_crn: "{{ .Values.ibm_sls_standalone.cis_crn }}"
             {{- end }}

From 4069997893e3b5c4bbf40709c762e3fc37b2c416 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Tue, 10 Feb 2026 18:34:54 +0530
Subject: [PATCH 07/77] Update 100-ibm-sls-app.yaml

---
 .../ibm-mas-sls-root/templates/100-ibm-sls-app.yaml           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
index d0e15dbd6..a986dd962 100644
--- a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
+++ b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
@@ -42,8 +42,8 @@ spec:
             ibm_customer_number: "{{ .Values.ibm_sls_standalone.ibm_customer_number }}"
             subscription_id: "{{ .Values.ibm_sls_standalone.subscription_id }}"
             sls_domain: "{{ .Values.ibm_sls_standalone.sls_domain }}"
-            dns_provider: "{{ .Values.ibm_sls_standalone.dns_provider | trim }}"
-            {{- if eq (.Values.ibm_sls_standalone.dns_provider | trim) "cis" }}
+            dns_provider: "{{ .Values.ibm_sls_standalone.dns_provider }}"
+            {{- if eq .Values.ibm_sls_standalone.dns_provider "cis" }}
             cis_service_name: "{{ .Values.ibm_sls_standalone.cis_service_name }}"
             cis_crn: "{{ .Values.ibm_sls_standalone.cis_crn }}"
             {{- end }}

From f08a5c37bb3d74218ece1a85d15f3b3fd99d8268 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Tue, 10 Feb 2026 22:37:03 +0530
Subject: [PATCH 08/77] Move 'type: external' label to route.labels

---
 .../100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml b/sls-applications/100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml
index 1379e0563..7c22214b3 100644
--- a/sls-applications/100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml
+++ b/sls-applications/100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml
@@ -9,11 +9,13 @@ metadata:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
 {{- if .Values.custom_labels }}
   labels:
-    type: external
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
   domain: {{ .Values.sls_domain }}
+  route:
+    labels:
+      type: external
   mongo: 
 {{  .Values.mongo_spec | toYaml | indent 4 }}
   license:

From 3bbdb8280885dc30e57b5d855573d79f7ffb3b49 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Wed, 11 Feb 2026 22:55:33 +0530
Subject: [PATCH 09/77] Allow and label OpenShift routes in postsync job

---
 .../templates/07-postsync-update-sm_Job.yaml   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
index ad8ee3b24..d813c95eb 100644
--- a/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
@@ -145,7 +145,15 @@ rules:
     resources:
       - configmaps
 
-
+  - verbs:
+      - get
+      - list
+      - patch
+      - update
+    apiGroups:
+      - route.openshift.io
+    resources:
+      - routes
 
 ---
 kind: RoleBinding
@@ -267,6 +275,14 @@ spec:
               SECRET_NAME_SLS=${ACCOUNT_ID}/${ICN}/${SUBSCRIPTION_ID}/sls
               TAGS="[{\"Key\": \"source\", \"Value\": \"postsync-ibm-sls-update-sm-job\"}, {\"Key\": \"account\", \"Value\": \"${ACCOUNT_ID}\"}, {\"Key\": \"subscription_id\", \"Value\": \"${SUBSCRIPTION_ID}\"}]"
               sm_update_secret $SECRET_NAME_SLS "{\"registration_key\": \"$SLS_REGISTRATION_KEY\", \"ca_b64\": \"$SLS_CA\", \"sls_url\":\"$SLS_URL\" }" "${TAGS}"
+    
+
+              echo "Labeling all routes with type=external"
+
+              SUITE_NAMESPACE="mas-${ICN}-${SUBSCRIPTION_ID}-sls"
+              oc label route --all -n ${SUITE_NAMESPACE} type=external --overwrite
+
+              echo "Route labeling completed"
 
 
       restartPolicy: Never

From d6f4cd8bbd475b00f5c96dc135679a238c816f19 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Wed, 11 Feb 2026 23:04:18 +0530
Subject: [PATCH 10/77] Update 07-postsync-update-sm_Job.yaml

---
 .../templates/07-postsync-update-sm_Job.yaml         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
index d813c95eb..19ffd4c58 100644
--- a/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
@@ -276,13 +276,15 @@ spec:
               TAGS="[{\"Key\": \"source\", \"Value\": \"postsync-ibm-sls-update-sm-job\"}, {\"Key\": \"account\", \"Value\": \"${ACCOUNT_ID}\"}, {\"Key\": \"subscription_id\", \"Value\": \"${SUBSCRIPTION_ID}\"}]"
               sm_update_secret $SECRET_NAME_SLS "{\"registration_key\": \"$SLS_REGISTRATION_KEY\", \"ca_b64\": \"$SLS_CA\", \"sls_url\":\"$SLS_URL\" }" "${TAGS}"
     
-
-              echo "Labeling all routes with type=external"
-
               SUITE_NAMESPACE="mas-${ICN}-${SUBSCRIPTION_ID}-sls"
-              oc label route --all -n ${SUITE_NAMESPACE} type=external --overwrite
 
-              echo "Route labeling completed"
+              export routes=$(oc get routes -n ${SUITE_NAMESPACE} -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}')
+              echo "Add label to routes updated ${routes}"
+
+              for route in $routes; do
+                echo "Adding label to route - ${route}"
+                oc patch route/${route} -p '{"metadata":{"labels":{"type":"external"}}}'
+              done
 
 
       restartPolicy: Never

From b69df441329a0682fa6a2840704bb819480af215 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Wed, 11 Feb 2026 23:13:03 +0530
Subject: [PATCH 11/77] update

---
 .../templates/07-postsync-update-sm_Job.yaml       | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
index 19ffd4c58..9032aef7d 100644
--- a/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
@@ -278,14 +278,22 @@ spec:
     
               SUITE_NAMESPACE="mas-${ICN}-${SUBSCRIPTION_ID}-sls"
 
-              export routes=$(oc get routes -n ${SUITE_NAMESPACE} -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}')
-              echo "Add label to routes updated ${routes}"
+              echo "Fetching routes from ${SUITE_NAMESPACE}"
+
+              routes=$(oc get routes -n ${SUITE_NAMESPACE} -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}')
+
+              echo "Routes found:"
+              echo "${routes}"
 
               for route in $routes; do
                 echo "Adding label to route - ${route}"
-                oc patch route/${route} -p '{"metadata":{"labels":{"type":"external"}}}'
+                  oc patch route ${route} \
+                    -n ${SUITE_NAMESPACE} \
+                    --type=merge \
+                    -p '{"metadata":{"labels":{"type":"external"}}}'
               done
 
+              echo "Route labeling completed"
 
       restartPolicy: Never
 

From 110595ffdde2874b904a6ba2548ff4d036b4a522 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Wed, 11 Feb 2026 23:22:15 +0530
Subject: [PATCH 12/77] Update 07-postsync-update-sm_Job.yaml

---
 .../100-ibm-sls/templates/07-postsync-update-sm_Job.yaml      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
index 9032aef7d..24723db25 100644
--- a/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
@@ -144,14 +144,12 @@ rules:
       - ""
     resources:
       - configmaps
-
   - verbs:
       - get
       - list
       - patch
-      - update
     apiGroups:
-      - route.openshift.io
+      - "route.openshift.io"
     resources:
       - routes
 

From c76091ff1b2b2e6e735ac7058ec290d3b00f2ca2 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Wed, 11 Feb 2026 23:28:25 +0530
Subject: [PATCH 13/77] updated

---
 .../100-ibm-sls/templates/07-postsync-update-sm_Job.yaml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
index 24723db25..e4b678e20 100644
--- a/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_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 := "v3" }}
+{{- $_job_version := "v4" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_digest

From 5dbaee6e16fc0459352dccfeadbf757ecf3fa0f8 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Wed, 11 Feb 2026 23:36:39 +0530
Subject: [PATCH 14/77] new update

---
 .../100-ibm-sls/templates/07-postsync-update-sm_Job.yaml     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
index e4b678e20..467b4d76d 100644
--- a/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
@@ -274,11 +274,10 @@ spec:
               TAGS="[{\"Key\": \"source\", \"Value\": \"postsync-ibm-sls-update-sm-job\"}, {\"Key\": \"account\", \"Value\": \"${ACCOUNT_ID}\"}, {\"Key\": \"subscription_id\", \"Value\": \"${SUBSCRIPTION_ID}\"}]"
               sm_update_secret $SECRET_NAME_SLS "{\"registration_key\": \"$SLS_REGISTRATION_KEY\", \"ca_b64\": \"$SLS_CA\", \"sls_url\":\"$SLS_URL\" }" "${TAGS}"
     
-              SUITE_NAMESPACE="mas-${ICN}-${SUBSCRIPTION_ID}-sls"
 
-              echo "Fetching routes from ${SUITE_NAMESPACE}"
+              echo "Fetching routes from ${namespace}"
 
-              routes=$(oc get routes -n ${SUITE_NAMESPACE} -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}')
+              routes=$(oc get routes -n ${namespace} -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}')
 
               echo "Routes found:"
               echo "${routes}"

From 36ab4439e02af763939e894baa40d614415c42ea Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Tue, 17 Feb 2026 12:10:09 +0530
Subject: [PATCH 15/77] Create 08-ibm-sls-dns_job.yaml

---
 .../templates/08-ibm-sls-dns_job.yaml         | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml

diff --git a/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
new file mode 100644
index 000000000..6f66ff7f8
--- /dev/null
+++ b/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
@@ -0,0 +1,41 @@
+
+apiVersion: v1
+kind: Secret
+metadata:
+  name: ibmcloud-secret
+type: Opaque
+stringData:
+  apikey: PLOd1WOYzr
+
+
+
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: cis-dns-job
+spec:
+  template:
+    spec:
+      restartPolicy: Never
+      containers:
+        - name: ibmcloud-cli
+          image: icr.io/ibmcloud/ibmcloud-cli:latest
+
+          env:
+            - name: IBMCLOUD_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: ibmcloud-secret
+                  key: apikey
+
+          command: ["/bin/sh", "-c"]
+          args:
+            - |
+              echo "Logging into IBM Cloud..."
+              ibmcloud login --apikey $IBMCLOUD_API_KEY -r global
+
+              echo "Setting CIS instance..."
+              ibmcloud cis instance-set "CIS - ibmmasfvt.com"
+
+              echo "Creating DNS record..."
+              ibmcloud cis dns-record-create ibmmasfvt.com mas CNAME apps.cluster.example.com

From 06e7dd7037e049703dc34a9a62128e636717db96 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Tue, 17 Feb 2026 12:54:14 +0530
Subject: [PATCH 16/77] updates

---
 .../100-ibm-sls/templates/08-ibm-sls-dns_job.yaml         | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
index 6f66ff7f8..ce48b7e4c 100644
--- a/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
@@ -1,11 +1,15 @@
 
+{{- $_cli_image_digest := "sha256:55b5d6dd185503f14c112836a9a4899347d28e7b6545e0b9cf21d87f9526fb40" }}
+
+
+
 apiVersion: v1
 kind: Secret
 metadata:
   name: ibmcloud-secret
 type: Opaque
 stringData:
-  apikey: PLOd1WOYzr
+  apikey: 7ZrKJHIExk
 
 
 
@@ -19,7 +23,7 @@ spec:
       restartPolicy: Never
       containers:
         - name: ibmcloud-cli
-          image: icr.io/ibmcloud/ibmcloud-cli:latest
+          image: quay.io/ibmmas/cli@{{ $_cli_image_digest }}
 
           env:
             - name: IBMCLOUD_API_KEY

From 485568ab84b3749a8041e41f820f8984188031de Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Tue, 17 Feb 2026 17:54:00 +0530
Subject: [PATCH 17/77] update logic for dns entry

---
 .../templates/08-ibm-sls-dns_job.yaml         | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
index ce48b7e4c..e28859b6e 100644
--- a/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
@@ -1,16 +1,13 @@
 
 {{- $_cli_image_digest := "sha256:55b5d6dd185503f14c112836a9a4899347d28e7b6545e0b9cf21d87f9526fb40" }}
 
-
-
 apiVersion: v1
 kind: Secret
 metadata:
   name: ibmcloud-secret
 type: Opaque
 stringData:
-  apikey: 7ZrKJHIExk
-
+  apikey: UdAEpxVTjvOBNx9JdcCyxneMQkSGBTJgo0yG0LJ2nNgx
 
 
 apiVersion: batch/v1
@@ -23,7 +20,7 @@ spec:
       restartPolicy: Never
       containers:
         - name: ibmcloud-cli
-          image: quay.io/ibmmas/cli@{{ $_cli_image_digest }}
+          image: quay.io/ibmmas/cli@sha256:55b5d6dd185503f14c112836a9a4899347d28e7b6545e0b9cf21d87f9526fb40
 
           env:
             - name: IBMCLOUD_API_KEY
@@ -38,8 +35,19 @@ spec:
               echo "Logging into IBM Cloud..."
               ibmcloud login --apikey $IBMCLOUD_API_KEY -r global
 
+              echo "Targeting resource group..."
+              ibmcloud target -g Default
+
               echo "Setting CIS instance..."
-              ibmcloud cis instance-set "CIS - ibmmasfvt.com"
+              ibmcloud cis instance-set crn:v1:bluemix:public:internet-svcs:global:a/02fd888448c1415baa2bcd65684e4db3:4c691f74-6c6a-4048-89a6-db022241df9b:
 
               echo "Creating DNS record..."
-              ibmcloud cis dns-record-create ibmmasfvt.com mas CNAME apps.cluster.example.com
+              ibmcloud cis dns-record-create \
+              ibmmasfvt.com \
+              mas \
+              CNAME \
+              apps.cluster.example.com \
+              --proxied=false
+
+              echo "DNS record created successfully!"
+

From 7b0b315007b3622b5ab628e2366a3c3518fc94fa Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Tue, 17 Feb 2026 18:27:30 +0530
Subject: [PATCH 18/77] Update 08-ibm-sls-dns_job.yaml

---
 .../100-ibm-sls/templates/08-ibm-sls-dns_job.yaml           | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
index e28859b6e..59a55666b 100644
--- a/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
@@ -5,6 +5,9 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: ibmcloud-secret
+  annotations:
+    argocd.argoproj.io/sync-wave: "113"
+    argocd.argoproj.io/sync-options: Prune=true
 type: Opaque
 stringData:
   apikey: UdAEpxVTjvOBNx9JdcCyxneMQkSGBTJgo0yG0LJ2nNgx
@@ -14,6 +17,9 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: cis-dns-job
+  annotations:
+    argocd.argoproj.io/sync-wave: "114"
+    argocd.argoproj.io/sync-options: Prune=true
 spec:
   template:
     spec:

From eb8dcbba433c30b6012f6b1c32a7e0c321e4fef4 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Tue, 17 Feb 2026 21:57:32 +0530
Subject: [PATCH 19/77] Update 08-ibm-sls-dns_job.yaml

---
 .../100-ibm-sls/templates/08-ibm-sls-dns_job.yaml     | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
index 59a55666b..1c4c0c875 100644
--- a/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
@@ -10,7 +10,7 @@ metadata:
     argocd.argoproj.io/sync-options: Prune=true
 type: Opaque
 stringData:
-  apikey: UdAEpxVTjvOBNx9JdcCyxneMQkSGBTJgo0yG0LJ2nNgx
+  apikey: 
 
 
 apiVersion: batch/v1
@@ -45,15 +45,10 @@ spec:
               ibmcloud target -g Default
 
               echo "Setting CIS instance..."
-              ibmcloud cis instance-set crn:v1:bluemix:public:internet-svcs:global:a/02fd888448c1415baa2bcd65684e4db3:4c691f74-6c6a-4048-89a6-db022241df9b:
+              ibmcloud cis instance-set crn:v1:bluemix:public:internet-svcs:global:a/02fd888448c1415baa2bcd65684e4db3:4c691f74-6c6a-4048-89a6-db022241df9b::
 
               echo "Creating DNS record..."
-              ibmcloud cis dns-record-create \
-              ibmmasfvt.com \
-              mas \
-              CNAME \
-              apps.cluster.example.com \
-              --proxied=false
+              ibmcloud cis dns-record-create ibmmasfvt.com mas CNAME apps.cluster.example.com --proxied=false
 
               echo "DNS record created successfully!"
 

From f1c185700809af47f51e5bf942cdc18ae1144954 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Wed, 18 Feb 2026 19:26:41 +0530
Subject: [PATCH 20/77] update logic

---
 .../templates/08-ibm-sls-dns_job.yaml         | 97 +++++++++++++++----
 1 file changed, 77 insertions(+), 20 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
index 1c4c0c875..037046234 100644
--- a/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
@@ -1,18 +1,24 @@
 
 {{- $_cli_image_digest := "sha256:55b5d6dd185503f14c112836a9a4899347d28e7b6545e0b9cf21d87f9526fb40" }}
 
-apiVersion: v1
 kind: Secret
+apiVersion: v1
 metadata:
-  name: ibmcloud-secret
+  name: {{ $aws_secret }}
+  namespace: {{ $ns }}
   annotations:
-    argocd.argoproj.io/sync-wave: "113"
-    argocd.argoproj.io/sync-options: Prune=true
-type: Opaque
-stringData:
-  apikey: 
-
+    argocd.argoproj.io/sync-wave: "110"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+data:
+  aws_access_key_id: {{ .Values.sm_aws_access_key_id | b64enc }}
+  aws_secret_access_key: {{ .Values.sm_aws_secret_access_key | b64enc }}
+  ibm_apikey: {{ .Values.ibm_apikey | b64enc }}
+  type: Opaque
 
+---
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -27,28 +33,79 @@ spec:
       containers:
         - name: ibmcloud-cli
           image: quay.io/ibmmas/cli@sha256:55b5d6dd185503f14c112836a9a4899347d28e7b6545e0b9cf21d87f9526fb40
-
+          imagePullPolicy: IfNotPresent
           env:
-            - name: IBMCLOUD_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: ibmcloud-secret
-                  key: apikey
-
+            - name: ACCOUNT_ID
+              value: {{ .Values.account_id }}
+            - name: REGION_ID
+              value: {{ .Values.region_id }}
+            - name: ICN
+              value: '{{ .Values.ibm_customer_number }}'
+            - name: SUBSCRIPTION_ID
+              value: '{{ .Values.subscription_id }}'
+            - name: DOMAIN
+              value: '{{ .Values.sls_domain }}'
+            - name: CIS_SERVICE_NAME
+              value: '{{ .Values.cis_service_name }}'
+            - name: CIS_CRN
+              value: '{{ .Values.cis_crn }}'
+            - name: AVP_TYPE
+              value: "aws"
+            
           command: ["/bin/sh", "-c"]
           args:
             - |
+
+              set -e
+
+              echo "Reading AWS credentials..."
+              SM_AWS_ACCESS_KEY_ID=$(cat /etc/mas/creds/aws/aws_access_key_id)
+              SM_AWS_SECRET_ACCESS_KEY=$(cat/etc/mas/creds/aws/aws_secret_access_key)
+
+              export SM_AWS_REGION=${REGION_ID}
+
+              source /mascli/functions/gitops_utils
+              sm_login
+
+              echo "Fetching IBM API key from AWS Secrets Manager"
+
+              SECRET_NAME_CIS="${ACCOUNT_ID}/${ICN}/cis"
+
+              SECRET_JSON=$(aws secretsmanager get-secret-value \
+                --secret-id ${SECRET_NAME_CIS} \
+                --query SecretString \
+                --output text)
+
+              IBM_APIKEY=$(echo ${SECRET_JSON} | jq -r '.ibm_apikey')
+
+               if [[ -z "${IBM_APIKEY}" || "${IBM_APIKEY}" == "null" ]]; then
+                echo "Failed to fetch ibm_apikey from ${SECRET_NAME_CIS}"
+                exit 1
+              fi
+
               echo "Logging into IBM Cloud..."
-              ibmcloud login --apikey $IBMCLOUD_API_KEY -r global
+              ibmcloud login --apikey ${IBMCLOUD_API_KEY} -r global
 
-              echo "Targeting resource group..."
-              ibmcloud target -g Default
+              #echo "Targeting resource group..."
+              #ibmcloud target -g Default
 
               echo "Setting CIS instance..."
-              ibmcloud cis instance-set crn:v1:bluemix:public:internet-svcs:global:a/02fd888448c1415baa2bcd65684e4db3:4c691f74-6c6a-4048-89a6-db022241df9b::
+              ibmcloud cis instance-set ${CIS_CRN}
+
+              echo "Exporting DOMAIN_NAME..."
+              export DOMAIN_NAME=$CIS_SERVICE_NAME
+
+              echo "Fetching DOMAIN_ID..."
+              DOMAIN_ID=$(ibmcloud cis domains --output json | jq -r ".[] | select(.name==\"$DOMAIN_NAME\") | .id")
+
 
               echo "Creating DNS record..."
-              ibmcloud cis dns-record-create ibmmasfvt.com mas CNAME apps.cluster.example.com --proxied=false
+               ibmcloud cis dns-record-create "$DOMAIN_ID" \
+               --type CNAME \
+               --name "SLS.mas-${ICN}-${SUBSCRIPTION_ID}-SLS" \
+               --content "apps.cluster.example.com" \
+               --proxied false
+
 
               echo "DNS record created successfully!"
 

From 4417a5dad90967e3a304d20cc9e82347af260f3d Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Wed, 18 Feb 2026 19:35:10 +0530
Subject: [PATCH 21/77] Update 08-ibm-sls-dns_job.yaml

---
 sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
index 037046234..53eb2557e 100644
--- a/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
@@ -7,7 +7,7 @@ metadata:
   name: {{ $aws_secret }}
   namespace: {{ $ns }}
   annotations:
-    argocd.argoproj.io/sync-wave: "110"
+    argocd.argoproj.io/sync-wave: "113"
 {{- if .Values.custom_labels }}
   labels:
 {{ .Values.custom_labels | toYaml | indent 4 }}

From 350a8c35054f20f7fbfdd3a26a7de9004a2dff99 Mon Sep 17 00:00:00 2001
From: Darshan Pandya <darshan.pandya@ibm.com>
Date: Wed, 18 Feb 2026 20:25:59 +0530
Subject: [PATCH 22/77] HADR & job label length fix

---
 .../templates/10-postsync-setup-hadr.yaml                   | 3 +++
 .../130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml | 6 +++++-
 .../templates/postdelete-delete-cr.yaml                     | 6 +++++-
 .../templates/postdelete-delete-cr.yaml                     | 6 +++++-
 .../templates/postdelete-delete-cr.yaml                     | 6 +++++-
 .../templates/postdelete-delete-cr.yaml                     | 6 +++++-
 .../templates/postdelete-delete-cr.yaml                     | 6 +++++-
 .../templates/postdelete-delete-cr.yaml                     | 6 +++++-
 .../templates/postdelete-delete-cr.yaml                     | 6 +++++-
 9 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/instance-applications/120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml b/instance-applications/120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml
index fe53bd5b8..d8c7ed44d 100644
--- a/instance-applications/120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml
@@ -446,6 +446,9 @@ spec:
                     echo "Backup type is ${backup_type}"
                     if [[ $backup_type == 'F' || $backup_type == 'N' ]]; then
                       echo "The latest backup ${timestamp} is full backup"
+                      # Get all backup files with the same timestamp from COS
+                      backup_filenames=`oc exec -n ${DB2_NAMESPACE} c-${PRIMARY_DB2_INSTANCE_NAME}-db2u-0 -- su -lc "~/bin/CheckCOS.sh | grep c-${PRIMARY_DB2_INSTANCE_NAME}-db2u-0 | grep -iv keystore | grep ${timestamp} | awk -F '/' '{print \$NF}'" db2inst1`
+                      echo "Backup filenames from COS: ${backup_filenames}"
                     else
                       echo "The latest backup ${timestamp} is not a full backup"
                       timestamp=''
diff --git a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml
index c3badf8f0..3ac8482f2 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml
@@ -9,7 +9,11 @@ Use the build/bin/set-cli-image-digest.sh script to update this value across all
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
 
-{{ $job_name := printf "postdelete-delete-cr-job-%s" $cr_name }}
+{{- /* Truncate job name to stay under 63 character limit for labels */ -}}
+{{- /* postdelete-cr-job- (18) + name (38) + - (1) + hash (6) = 63 chars */ -}}
+{{ $name_hash := $cr_name | sha256sum | trunc 6 }}
+{{ $truncated_name := trunc 38 $cr_name }}
+{{ $job_name := printf "postdelete-cr-job-%s-%s" $truncated_name $name_hash }}
 
 # NOTE: depends on resources created in ibm-mas-suite chart (01-postdelete-crs-resources)
 # The values below must align with the values in that file
diff --git a/instance-applications/130-ibm-kafka-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-kafka-config/templates/postdelete-delete-cr.yaml
index 3333d1bff..05e0e1796 100644
--- a/instance-applications/130-ibm-kafka-config/templates/postdelete-delete-cr.yaml
+++ b/instance-applications/130-ibm-kafka-config/templates/postdelete-delete-cr.yaml
@@ -4,7 +4,11 @@
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
 
-{{ $job_name := printf "postdelete-delete-cr-job-%s" $cr_name }}
+{{- /* Truncate job name to stay under 63 character limit for labels */ -}}
+{{- /* postdelete-cr-job- (18) + name (38) + - (1) + hash (6) = 63 chars */ -}}
+{{ $name_hash := $cr_name | sha256sum | trunc 6 }}
+{{ $truncated_name := trunc 38 $cr_name }}
+{{ $job_name := printf "postdelete-cr-job-%s-%s" $truncated_name $name_hash }}
 
 # NOTE: depends on resources created in ibm-mas-suite chart (01-postdelete-crs-resources)
 # The values below must align with the values in that file
diff --git a/instance-applications/130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml
index 16bb10d57..d28523868 100644
--- a/instance-applications/130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml
+++ b/instance-applications/130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml
@@ -9,7 +9,11 @@ Use the build/bin/set-cli-image-digest.sh script to update this value across all
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
 
-{{ $job_name := printf "postdelete-delete-cr-job-%s" $cr_name }}
+{{- /* Truncate job name to stay under 63 character limit for labels */ -}}
+{{- /* postdelete-cr-job- (18) + name (38) + - (1) + hash (6) = 63 chars */ -}}
+{{ $name_hash := $cr_name | sha256sum | trunc 6 }}
+{{ $truncated_name := trunc 38 $cr_name }}
+{{ $job_name := printf "postdelete-cr-job-%s-%s" $truncated_name $name_hash }}
 
 # NOTE: depends on resources created in ibm-mas-suite chart (01-postdelete-crs-resources)
 # The values below must align with the values in that file
diff --git a/instance-applications/130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml
index 16bb10d57..d28523868 100644
--- a/instance-applications/130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml
+++ b/instance-applications/130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml
@@ -9,7 +9,11 @@ Use the build/bin/set-cli-image-digest.sh script to update this value across all
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
 
-{{ $job_name := printf "postdelete-delete-cr-job-%s" $cr_name }}
+{{- /* Truncate job name to stay under 63 character limit for labels */ -}}
+{{- /* postdelete-cr-job- (18) + name (38) + - (1) + hash (6) = 63 chars */ -}}
+{{ $name_hash := $cr_name | sha256sum | trunc 6 }}
+{{ $truncated_name := trunc 38 $cr_name }}
+{{ $job_name := printf "postdelete-cr-job-%s-%s" $truncated_name $name_hash }}
 
 # NOTE: depends on resources created in ibm-mas-suite chart (01-postdelete-crs-resources)
 # The values below must align with the values in that file
diff --git a/instance-applications/130-ibm-mas-mongo-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-mongo-config/templates/postdelete-delete-cr.yaml
index 836fba49d..ee5f7a7e8 100644
--- a/instance-applications/130-ibm-mas-mongo-config/templates/postdelete-delete-cr.yaml
+++ b/instance-applications/130-ibm-mas-mongo-config/templates/postdelete-delete-cr.yaml
@@ -9,7 +9,11 @@ Use the build/bin/set-cli-image-digest.sh script to update this value across all
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
 
-{{ $job_name := printf "postdelete-delete-cr-job-%s" $cr_name }}
+{{- /* Truncate job name to stay under 63 character limit for labels */ -}}
+{{- /* postdelete-cr-job- (18) + name (38) + - (1) + hash (6) = 63 chars */ -}}
+{{ $name_hash := $cr_name | sha256sum | trunc 6 }}
+{{ $truncated_name := trunc 38 $cr_name }}
+{{ $job_name := printf "postdelete-cr-job-%s-%s" $truncated_name $name_hash }}
 
 # NOTE: depends on resources created in ibm-mas-suite chart (01-postdelete-crs-resources)
 # The values below must align with the values in that file
diff --git a/instance-applications/130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml
index 16bb10d57..d28523868 100644
--- a/instance-applications/130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml
+++ b/instance-applications/130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml
@@ -9,7 +9,11 @@ Use the build/bin/set-cli-image-digest.sh script to update this value across all
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
 
-{{ $job_name := printf "postdelete-delete-cr-job-%s" $cr_name }}
+{{- /* Truncate job name to stay under 63 character limit for labels */ -}}
+{{- /* postdelete-cr-job- (18) + name (38) + - (1) + hash (6) = 63 chars */ -}}
+{{ $name_hash := $cr_name | sha256sum | trunc 6 }}
+{{ $truncated_name := trunc 38 $cr_name }}
+{{ $job_name := printf "postdelete-cr-job-%s-%s" $truncated_name $name_hash }}
 
 # NOTE: depends on resources created in ibm-mas-suite chart (01-postdelete-crs-resources)
 # The values below must align with the values in that file
diff --git a/instance-applications/130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml
index 16bb10d57..d28523868 100644
--- a/instance-applications/130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml
+++ b/instance-applications/130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml
@@ -9,7 +9,11 @@ Use the build/bin/set-cli-image-digest.sh script to update this value across all
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
 
-{{ $job_name := printf "postdelete-delete-cr-job-%s" $cr_name }}
+{{- /* Truncate job name to stay under 63 character limit for labels */ -}}
+{{- /* postdelete-cr-job- (18) + name (38) + - (1) + hash (6) = 63 chars */ -}}
+{{ $name_hash := $cr_name | sha256sum | trunc 6 }}
+{{ $truncated_name := trunc 38 $cr_name }}
+{{ $job_name := printf "postdelete-cr-job-%s-%s" $truncated_name $name_hash }}
 
 # NOTE: depends on resources created in ibm-mas-suite chart (01-postdelete-crs-resources)
 # The values below must align with the values in that file
diff --git a/instance-applications/130-ibm-objectstorage-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-objectstorage-config/templates/postdelete-delete-cr.yaml
index 16bb10d57..d28523868 100644
--- a/instance-applications/130-ibm-objectstorage-config/templates/postdelete-delete-cr.yaml
+++ b/instance-applications/130-ibm-objectstorage-config/templates/postdelete-delete-cr.yaml
@@ -9,7 +9,11 @@ Use the build/bin/set-cli-image-digest.sh script to update this value across all
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
 
-{{ $job_name := printf "postdelete-delete-cr-job-%s" $cr_name }}
+{{- /* Truncate job name to stay under 63 character limit for labels */ -}}
+{{- /* postdelete-cr-job- (18) + name (38) + - (1) + hash (6) = 63 chars */ -}}
+{{ $name_hash := $cr_name | sha256sum | trunc 6 }}
+{{ $truncated_name := trunc 38 $cr_name }}
+{{ $job_name := printf "postdelete-cr-job-%s-%s" $truncated_name $name_hash }}
 
 # NOTE: depends on resources created in ibm-mas-suite chart (01-postdelete-crs-resources)
 # The values below must align with the values in that file

From 088396898d1fd32a00cb1cebca61c6b1ce88e071 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Wed, 18 Feb 2026 21:21:50 +0530
Subject: [PATCH 23/77] updated dns logic

---
 .../{08-ibm-sls-dns_job.yaml => 07-ibm-sls-dns_job.yaml}      | 4 ++--
 ...sync-update-sm_Job.yaml => 08-postsync-update-sm_Job.yaml} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename sls-applications/100-ibm-sls/templates/{08-ibm-sls-dns_job.yaml => 07-ibm-sls-dns_job.yaml} (97%)
 rename sls-applications/100-ibm-sls/templates/{07-postsync-update-sm_Job.yaml => 08-postsync-update-sm_Job.yaml} (100%)

diff --git a/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
similarity index 97%
rename from sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
rename to sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 53eb2557e..986ffc43d 100644
--- a/sls-applications/100-ibm-sls/templates/08-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -7,7 +7,7 @@ metadata:
   name: {{ $aws_secret }}
   namespace: {{ $ns }}
   annotations:
-    argocd.argoproj.io/sync-wave: "113"
+    argocd.argoproj.io/sync-wave: "105"
 {{- if .Values.custom_labels }}
   labels:
 {{ .Values.custom_labels | toYaml | indent 4 }}
@@ -24,7 +24,7 @@ kind: Job
 metadata:
   name: cis-dns-job
   annotations:
-    argocd.argoproj.io/sync-wave: "114"
+    argocd.argoproj.io/sync-wave: "105"
     argocd.argoproj.io/sync-options: Prune=true
 spec:
   template:
diff --git a/sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml
similarity index 100%
rename from sls-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
rename to sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml

From f92f1cd0b81c65334d9459fff92239c45ba75e46 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Wed, 18 Feb 2026 22:04:09 +0530
Subject: [PATCH 24/77] updates01

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 986ffc43d..d761d524c 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -32,7 +32,7 @@ spec:
       restartPolicy: Never
       containers:
         - name: ibmcloud-cli
-          image: quay.io/ibmmas/cli@sha256:55b5d6dd185503f14c112836a9a4899347d28e7b6545e0b9cf21d87f9526fb40
+          image: quay.io/ibmmas/cli@{{ $_cli_image_digest }}
           imagePullPolicy: IfNotPresent
           env:
             - name: ACCOUNT_ID

From 1d720580497a0680a09cbd78b59a773dece66bf3 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Wed, 18 Feb 2026 22:12:38 +0530
Subject: [PATCH 25/77] update02

---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index d761d524c..e0269b198 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -1,6 +1,8 @@
 
 {{- $_cli_image_digest := "sha256:55b5d6dd185503f14c112836a9a4899347d28e7b6545e0b9cf21d87f9526fb40" }}
 
+---
+
 kind: Secret
 apiVersion: v1
 metadata:
@@ -31,9 +33,16 @@ spec:
     spec:
       restartPolicy: Never
       containers:
-        - name: ibmcloud-cli
+        - name: run
           image: quay.io/ibmmas/cli@{{ $_cli_image_digest }}
           imagePullPolicy: IfNotPresent
+          resources:
+            limits:
+              cpu: 200m
+              memory: 512Mi
+            requests:
+              cpu: 10m
+              memory: 64Mi
           env:
             - name: ACCOUNT_ID
               value: {{ .Values.account_id }}

From 1ececcf0d0bf40e147fcb2f9415ae6187e96882d Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Wed, 18 Feb 2026 22:36:05 +0530
Subject: [PATCH 26/77] Update 07-ibm-sls-dns_job.yaml

---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml            | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index e0269b198..21d545feb 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -1,5 +1,6 @@
 
 {{- $_cli_image_digest := "sha256:55b5d6dd185503f14c112836a9a4899347d28e7b6545e0b9cf21d87f9526fb40" }}
+{{ $aws_secret := "aws"}}
 
 ---
 
@@ -7,7 +8,7 @@ kind: Secret
 apiVersion: v1
 metadata:
   name: {{ $aws_secret }}
-  namespace: {{ $ns }}
+  namespace: mas-{{ .Values.ibm_customer_number }}-{{ .Values.subscription_id }}-sls
   annotations:
     argocd.argoproj.io/sync-wave: "105"
 {{- if .Values.custom_labels }}
@@ -69,7 +70,7 @@ spec:
 
               echo "Reading AWS credentials..."
               SM_AWS_ACCESS_KEY_ID=$(cat /etc/mas/creds/aws/aws_access_key_id)
-              SM_AWS_SECRET_ACCESS_KEY=$(cat/etc/mas/creds/aws/aws_secret_access_key)
+              SM_AWS_SECRET_ACCESS_KEY=$(cat /etc/mas/creds/aws/aws_secret_access_key)
 
               export SM_AWS_REGION=${REGION_ID}
 

From ffa503f5e4d5794a4e9fd938641447c6b5668de9 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Wed, 18 Feb 2026 22:43:04 +0530
Subject: [PATCH 27/77] update01

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 21d545feb..6a6f8e8df 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -18,7 +18,6 @@ metadata:
 data:
   aws_access_key_id: {{ .Values.sm_aws_access_key_id | b64enc }}
   aws_secret_access_key: {{ .Values.sm_aws_secret_access_key | b64enc }}
-  ibm_apikey: {{ .Values.ibm_apikey | b64enc }}
   type: Opaque
 
 ---

From 74199e594955f839ab67d62024e3b4be3c1e61c2 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Wed, 18 Feb 2026 23:03:59 +0530
Subject: [PATCH 28/77] update011

---
 .../templates/07-ibm-sls-dns_job.yaml           | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 6a6f8e8df..7b31d8104 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -11,6 +11,7 @@ metadata:
   namespace: mas-{{ .Values.ibm_customer_number }}-{{ .Values.subscription_id }}-sls
   annotations:
     argocd.argoproj.io/sync-wave: "105"
+type: Opaque
 {{- if .Values.custom_labels }}
   labels:
 {{ .Values.custom_labels | toYaml | indent 4 }}
@@ -18,7 +19,6 @@ metadata:
 data:
   aws_access_key_id: {{ .Values.sm_aws_access_key_id | b64enc }}
   aws_secret_access_key: {{ .Values.sm_aws_secret_access_key | b64enc }}
-  type: Opaque
 
 ---
 apiVersion: batch/v1
@@ -27,7 +27,7 @@ metadata:
   name: cis-dns-job
   annotations:
     argocd.argoproj.io/sync-wave: "105"
-    argocd.argoproj.io/sync-options: Prune=true
+    argocd.argoproj.io/sync-options: Replace=true
 spec:
   template:
     spec:
@@ -36,13 +36,10 @@ spec:
         - name: run
           image: quay.io/ibmmas/cli@{{ $_cli_image_digest }}
           imagePullPolicy: IfNotPresent
-          resources:
-            limits:
-              cpu: 200m
-              memory: 512Mi
-            requests:
-              cpu: 10m
-              memory: 64Mi
+          volumeMounts:
+            - name: aws-creds
+              mountPath: /etc/mas/creds/aws
+              readOnly: true
           env:
             - name: ACCOUNT_ID
               value: {{ .Values.account_id }}
@@ -93,7 +90,7 @@ spec:
               fi
 
               echo "Logging into IBM Cloud..."
-              ibmcloud login --apikey ${IBMCLOUD_API_KEY} -r global
+              ibmcloud login --apikey ${IBM_APIKEY} -r global
 
               #echo "Targeting resource group..."
               #ibmcloud target -g Default

From 4f1b7a9ca22eba64909ed60389ff58ab4b2e62b9 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Wed, 18 Feb 2026 23:16:33 +0530
Subject: [PATCH 29/77] Update 07-ibm-sls-dns_job.yaml

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 7b31d8104..15522f11a 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -57,6 +57,9 @@ spec:
               value: '{{ .Values.cis_crn }}'
             - name: AVP_TYPE
               value: "aws"
+          volumeMounts:
+            - name: aws
+              mountPath: /etc/mas/creds/aws
             
           command: ["/bin/sh", "-c"]
           args:

From 4e6c870b7b7eeb86ef45bc9421f0667f7d35028f Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 00:01:27 +0530
Subject: [PATCH 30/77] update

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 15522f11a..e6cae865d 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -25,6 +25,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: cis-dns-job
+  namespace: mas-{{ .Values.ibm_customer_number }}-{{ .Values.subscription_id }}-sls
   annotations:
     argocd.argoproj.io/sync-wave: "105"
     argocd.argoproj.io/sync-options: Replace=true

From 5369deb45ea400d49b8111b9c5c3e7a13b567b30 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 00:13:47 +0530
Subject: [PATCH 31/77] update11

---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index e6cae865d..1c5c3da34 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -61,7 +61,7 @@ spec:
           volumeMounts:
             - name: aws
               mountPath: /etc/mas/creds/aws
-            
+              readOnly: true
           command: ["/bin/sh", "-c"]
           args:
             - |
@@ -119,3 +119,8 @@ spec:
 
               echo "DNS record created successfully!"
 
+      volumes:
+          - name: aws
+            secret:
+              secretName: aws       # make sure this Secret exists in the same namespace
+              defaultMode: 420

From 5faa3db294264762e1bd347c0173e97e934da3e5 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 00:41:28 +0530
Subject: [PATCH 32/77] Update 07-ibm-sls-dns_job.yaml

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 1c5c3da34..55b48f20f 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -27,7 +27,7 @@ metadata:
   name: cis-dns-job
   namespace: mas-{{ .Values.ibm_customer_number }}-{{ .Values.subscription_id }}-sls
   annotations:
-    argocd.argoproj.io/sync-wave: "105"
+    argocd.argoproj.io/sync-wave: "113"
     argocd.argoproj.io/sync-options: Replace=true
 spec:
   template:

From df1760c0c9c750d7c787e8605004e3dc31c76bd5 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 00:52:03 +0530
Subject: [PATCH 33/77] Update 08-postsync-update-sm_Job.yaml

---
 .../templates/08-postsync-update-sm_Job.yaml  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml b/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml
index 467b4d76d..520f366e8 100644
--- a/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml
+++ b/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml
@@ -275,22 +275,22 @@ spec:
               sm_update_secret $SECRET_NAME_SLS "{\"registration_key\": \"$SLS_REGISTRATION_KEY\", \"ca_b64\": \"$SLS_CA\", \"sls_url\":\"$SLS_URL\" }" "${TAGS}"
     
 
-              echo "Fetching routes from ${namespace}"
+              #echo "Fetching routes from ${namespace}"
 
-              routes=$(oc get routes -n ${namespace} -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}')
+              #routes=$(oc get routes -n ${namespace} -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}')
 
               echo "Routes found:"
               echo "${routes}"
 
-              for route in $routes; do
-                echo "Adding label to route - ${route}"
-                  oc patch route ${route} \
-                    -n ${SUITE_NAMESPACE} \
-                    --type=merge \
-                    -p '{"metadata":{"labels":{"type":"external"}}}'
-              done
+              #for route in $routes; do
+                #echo "Adding label to route - ${route}"
+                 # oc patch route ${route} \
+                 #   -n ${SUITE_NAMESPACE} \
+                  #  --type=merge \
+                  #  -p '{"metadata":{"labels":{"type":"external"}}}'
+             # done
 
-              echo "Route labeling completed"
+              #echo "Route labeling completed"
 
       restartPolicy: Never
 

From 083b356e1dd465cc1a520a7fcc2902e4ca5e8aef Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 01:13:05 +0530
Subject: [PATCH 34/77] update10

---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 55b48f20f..21c176ed8 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -30,17 +30,19 @@ metadata:
     argocd.argoproj.io/sync-wave: "113"
     argocd.argoproj.io/sync-options: Replace=true
 spec:
-  template:
+ selector:
+    matchLabels:
+      app: cis-dns-job
+ template:
+    metadata:
+      labels:
+        cis-dns-job: cis-dns-job
     spec:
       restartPolicy: Never
       containers:
         - name: run
           image: quay.io/ibmmas/cli@{{ $_cli_image_digest }}
           imagePullPolicy: IfNotPresent
-          volumeMounts:
-            - name: aws-creds
-              mountPath: /etc/mas/creds/aws
-              readOnly: true
           env:
             - name: ACCOUNT_ID
               value: {{ .Values.account_id }}

From fa46f6915fa4f180beadaaa94fb950ebd0a35769 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 01:26:15 +0530
Subject: [PATCH 35/77] update 11

---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml          | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 21c176ed8..a12ed9dcb 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -30,13 +30,10 @@ metadata:
     argocd.argoproj.io/sync-wave: "113"
     argocd.argoproj.io/sync-options: Replace=true
 spec:
- selector:
-    matchLabels:
-      app: cis-dns-job
- template:
+  template:
     metadata:
       labels:
-        cis-dns-job: cis-dns-job
+        app: cis-dns-job
     spec:
       restartPolicy: Never
       containers:

From fac82f47181d42350f3d28c67019a193c17545da Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 10:50:48 +0530
Subject: [PATCH 36/77] updatw11

---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index a12ed9dcb..063e2ee58 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -30,10 +30,13 @@ metadata:
     argocd.argoproj.io/sync-wave: "113"
     argocd.argoproj.io/sync-options: Replace=true
 spec:
+  selector:
+    matchLabels:
+        app: postsync-ibm-sls-update-sm-job
   template:
     metadata:
       labels:
-        app: cis-dns-job
+        app: postsync-ibm-sls-update-sm-job
     spec:
       restartPolicy: Never
       containers:
@@ -73,6 +76,9 @@ spec:
 
               export SM_AWS_REGION=${REGION_ID}
 
+              echo $SM_AWS_REGION
+
+
               source /mascli/functions/gitops_utils
               sm_login
 

From 0a3ee0e7d2b498b9a051c4776ddde4f354deef01 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 10:54:29 +0530
Subject: [PATCH 37/77] updatw001

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 063e2ee58..32f3c2230 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -30,9 +30,6 @@ metadata:
     argocd.argoproj.io/sync-wave: "113"
     argocd.argoproj.io/sync-options: Replace=true
 spec:
-  selector:
-    matchLabels:
-        app: postsync-ibm-sls-update-sm-job
   template:
     metadata:
       labels:

From e5fe7b8b453a2d6a8b24e6945f792b6c45b89191 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 11:08:22 +0530
Subject: [PATCH 38/77] Update 07-ibm-sls-dns_job.yaml

---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 32f3c2230..691aae80b 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -33,7 +33,7 @@ spec:
   template:
     metadata:
       labels:
-        app: postsync-ibm-sls-update-sm-job
+        app: "postsync-ibm-sls-update-sm-job"
     spec:
       restartPolicy: Never
       containers:
@@ -67,7 +67,7 @@ spec:
 
               set -e
 
-              echo "Reading AWS credentials..."
+              echo "Reading AWS credentials..." 
               SM_AWS_ACCESS_KEY_ID=$(cat /etc/mas/creds/aws/aws_access_key_id)
               SM_AWS_SECRET_ACCESS_KEY=$(cat /etc/mas/creds/aws/aws_secret_access_key)
 

From 287e59749e51968a7c8a68975a4a362da5c390ba Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 11:13:47 +0530
Subject: [PATCH 39/77] update101

---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 691aae80b..c4a807d74 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -43,6 +43,8 @@ spec:
           env:
             - name: ACCOUNT_ID
               value: {{ .Values.account_id }}
+            - name: CLUSTER_ID
+              value: {{ .Values.cluster_id}}
             - name: REGION_ID
               value: {{ .Values.region_id }}
             - name: ICN
@@ -81,7 +83,7 @@ spec:
 
               echo "Fetching IBM API key from AWS Secrets Manager"
 
-              SECRET_NAME_CIS="${ACCOUNT_ID}/${ICN}/cis"
+              SECRET_NAME_CIS="${ACCOUNT_ID}/${CLUSTER_ID}/cis"
 
               SECRET_JSON=$(aws secretsmanager get-secret-value \
                 --secret-id ${SECRET_NAME_CIS} \

From 32cee291c5eb09485c539917bd726a45a78fea74 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 11:19:44 +0530
Subject: [PATCH 40/77] update11

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index c4a807d74..a21260c2b 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -59,6 +59,8 @@ spec:
               value: '{{ .Values.cis_crn }}'
             - name: AVP_TYPE
               value: "aws"
+            - name: IBM_CLI_HOME
+              value: /tmp/.bluemix 
           volumeMounts:
             - name: aws
               mountPath: /etc/mas/creds/aws

From 3a5fd10fd452ae85dbc9cd539021569a12b69f3a Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 11:37:59 +0530
Subject: [PATCH 41/77] update

---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml             | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index a21260c2b..01aff3ce9 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -99,6 +99,10 @@ spec:
                 exit 1
               fi
 
+              echo "Setting IBM CLI home to writable location..."
+              mkdir -p /tmp/.bluemix
+              export IBM_CLI_HOME=/tmp/.bluemix
+
               echo "Logging into IBM Cloud..."
               ibmcloud login --apikey ${IBM_APIKEY} -r global
 

From 381e47df2c2b2deda058ff1bcd8fed3e60d2e1df Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 11:42:09 +0530
Subject: [PATCH 42/77] updatw11

---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 01aff3ce9..27ab633b2 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -100,9 +100,11 @@ spec:
               fi
 
               echo "Setting IBM CLI home to writable location..."
-              mkdir -p /tmp/.bluemix
+              mkdir -p /tmp/.bluemix/plugins
+              touch /tmp/.bluemix/config.json
               export IBM_CLI_HOME=/tmp/.bluemix
-
+              export IBM_CLI_CONFIG=/tmp/.bluemix/config.json
+              
               echo "Logging into IBM Cloud..."
               ibmcloud login --apikey ${IBM_APIKEY} -r global
 

From 1f72d68050aed3ffed114af76442bbcc0ecf516f Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 11:46:33 +0530
Subject: [PATCH 43/77] Update 07-ibm-sls-dns_job.yaml

---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml         | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 27ab633b2..d843839fe 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -100,11 +100,13 @@ spec:
               fi
 
               echo "Setting IBM CLI home to writable location..."
-              mkdir -p /tmp/.bluemix/plugins
-              touch /tmp/.bluemix/config.json
+              mkdir -p /tmp/.bluemix/plugins        # create plugins directory
+              touch /tmp/.bluemix/config.json       # create empty config file
+              chmod -R 777 /tmp/.bluemix            # ensure writable by any user
+
               export IBM_CLI_HOME=/tmp/.bluemix
               export IBM_CLI_CONFIG=/tmp/.bluemix/config.json
-              
+
               echo "Logging into IBM Cloud..."
               ibmcloud login --apikey ${IBM_APIKEY} -r global
 

From 3eea7361d25d850aca18dc1a4ff63c68055f78ce Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 11:54:42 +0530
Subject: [PATCH 44/77] Update 07-ibm-sls-dns_job.yaml

---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml    | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index d843839fe..ff01c736b 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -59,8 +59,8 @@ spec:
               value: '{{ .Values.cis_crn }}'
             - name: AVP_TYPE
               value: "aws"
-            - name: IBM_CLI_HOME
-              value: /tmp/.bluemix 
+            - name: IBMCLOUD_HOME
+              value: /tmp/bluemix
           volumeMounts:
             - name: aws
               mountPath: /etc/mas/creds/aws
@@ -100,12 +100,10 @@ spec:
               fi
 
               echo "Setting IBM CLI home to writable location..."
-              mkdir -p /tmp/.bluemix/plugins        # create plugins directory
-              touch /tmp/.bluemix/config.json       # create empty config file
-              chmod -R 777 /tmp/.bluemix            # ensure writable by any user
+             
 
-              export IBM_CLI_HOME=/tmp/.bluemix
-              export IBM_CLI_CONFIG=/tmp/.bluemix/config.json
+              export IBMCLOUD_HOME=/tmp/bluemix
+              mkdir -p $IBMCLOUD_HOME
 
               echo "Logging into IBM Cloud..."
               ibmcloud login --apikey ${IBM_APIKEY} -r global

From 95ffd4414cfba7fbfc5f674d8e7ea16b5752ced0 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 12:24:18 +0530
Subject: [PATCH 45/77] update

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index ff01c736b..c079c298a 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -106,7 +106,7 @@ spec:
               mkdir -p $IBMCLOUD_HOME
 
               echo "Logging into IBM Cloud..."
-              ibmcloud login --apikey ${IBM_APIKEY} -r global
+              ibmcloud login --apikey ${IBM_APIKEY} -r us-east
 
               #echo "Targeting resource group..."
               #ibmcloud target -g Default

From b65a83df850521ddcc21bdf1d40f80f4ea6bc980 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 12:29:40 +0530
Subject: [PATCH 46/77] update01

---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml        | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index c079c298a..ac02d65c5 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -110,6 +110,15 @@ spec:
 
               #echo "Targeting resource group..."
               #ibmcloud target -g Default
+            
+              # 1. Disable the interactive update check to prevent the [y/N] prompt
+              ibmcloud config --check-version=false
+
+              # 2. Install the Cloud Internet Services (CIS) plug-in
+              # The -f flag forces installation without a confirmation prompt
+              echo "Installing CIS plugin..."
+              ibmcloud plugin install cis -f
+
 
               echo "Setting CIS instance..."
               ibmcloud cis instance-set ${CIS_CRN}

From f8b21f85db01b00efc103a5e755902db25ab1cc9 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 13:20:00 +0530
Subject: [PATCH 47/77] Update 07-ibm-sls-dns_job.yaml

---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml        | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index ac02d65c5..7015045bc 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -127,8 +127,17 @@ spec:
               export DOMAIN_NAME=$CIS_SERVICE_NAME
 
               echo "Fetching DOMAIN_ID..."
+              ibmcloud cis domains --output json
+
               DOMAIN_ID=$(ibmcloud cis domains --output json | jq -r ".[] | select(.name==\"$DOMAIN_NAME\") | .id")
 
+              echo "domain id : $DOMAIN_ID"
+
+              if [ -z "$DOMAIN_ID" ] || [ "$DOMAIN_ID" == "null" ]; then
+              echo "ERROR: Could not find Domain ID for name: $DOMAIN_NAME"
+              exit 1
+              fi
+
 
               echo "Creating DNS record..."
                ibmcloud cis dns-record-create "$DOMAIN_ID" \

From d552f39ee4f4cf10f92f3ab6213177cadcf43c1a Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 13:24:38 +0530
Subject: [PATCH 48/77] Update 07-ibm-sls-dns_job.yaml

---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 7015045bc..a4d47b97e 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -124,8 +124,10 @@ spec:
               ibmcloud cis instance-set ${CIS_CRN}
 
               echo "Exporting DOMAIN_NAME..."
-              export DOMAIN_NAME=$CIS_SERVICE_NAME
+              export DOMAIN_NAME=$(echo "$CIS_SERVICE_NAME" | sed 's/^CIS - //' 
 
+              echo "Cleaned Domain Name: $DOMAIN_NAME"
+              
               echo "Fetching DOMAIN_ID..."
               ibmcloud cis domains --output json
 

From da116ced108650d6f36ba8f7a692c489123b2f08 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 13:32:46 +0530
Subject: [PATCH 49/77] update

---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index a4d47b97e..ba2de7d60 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -124,10 +124,10 @@ spec:
               ibmcloud cis instance-set ${CIS_CRN}
 
               echo "Exporting DOMAIN_NAME..."
-              export DOMAIN_NAME=$(echo "$CIS_SERVICE_NAME" | sed 's/^CIS - //' 
+              export DOMAIN_NAME=$(echo "$CIS_SERVICE_NAME" | sed 's/^CIS - //') 
 
               echo "Cleaned Domain Name: $DOMAIN_NAME"
-              
+
               echo "Fetching DOMAIN_ID..."
               ibmcloud cis domains --output json
 

From 543e250856108c42a6ace436e81a41b0e41166ba Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 13:54:55 +0530
Subject: [PATCH 50/77] updateed

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index ba2de7d60..277d08e1c 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -145,7 +145,7 @@ spec:
                ibmcloud cis dns-record-create "$DOMAIN_ID" \
                --type CNAME \
                --name "SLS.mas-${ICN}-${SUBSCRIPTION_ID}-SLS" \
-               --content "apps.cluster.example.com" \
+               --content "apps.noble6.cp.fyre.ibm.com" \
                --proxied false
 
 

From 84c6cdb72711eda3be4e57128657111dda950abd Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 14:00:11 +0530
Subject: [PATCH 51/77] Update 07-ibm-sls-dns_job.yaml

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 277d08e1c..9afe67194 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -144,7 +144,7 @@ spec:
               echo "Creating DNS record..."
                ibmcloud cis dns-record-create "$DOMAIN_ID" \
                --type CNAME \
-               --name "SLS.mas-${ICN}-${SUBSCRIPTION_ID}-SLS" \
+               --name "SLS-mas-${ICN}-${SUBSCRIPTION_ID}-SLS" \
                --content "apps.noble6.cp.fyre.ibm.com" \
                --proxied false
 

From 8fac3ae20b9dba0a1d9b53c58f5e994eecccd5b7 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 14:12:20 +0530
Subject: [PATCH 52/77] update03

---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 9afe67194..04f1b599d 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -144,9 +144,9 @@ spec:
               echo "Creating DNS record..."
                ibmcloud cis dns-record-create "$DOMAIN_ID" \
                --type CNAME \
-               --name "SLS-mas-${ICN}-${SUBSCRIPTION_ID}-SLS" \
+               --name "SLSs-mas-${ICN}-${SUBSCRIPTION_ID}-SLS" \
                --content "apps.noble6.cp.fyre.ibm.com" \
-               --proxied false
+               --proxied true
 
 
               echo "DNS record created successfully!"

From fd4f16245d0b1af3ee6c508ea1b981d8b4889eaf Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 15:21:46 +0530
Subject: [PATCH 53/77] Update 07-ibm-sls-dns_job.yaml

---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 04f1b599d..f495d4ef5 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -28,7 +28,7 @@ metadata:
   namespace: mas-{{ .Values.ibm_customer_number }}-{{ .Values.subscription_id }}-sls
   annotations:
     argocd.argoproj.io/sync-wave: "113"
-    argocd.argoproj.io/sync-options: Replace=true
+    argocd.argoproj.io/sync-options: Force=true,Replace=true
 spec:
   template:
     metadata:
@@ -144,7 +144,7 @@ spec:
               echo "Creating DNS record..."
                ibmcloud cis dns-record-create "$DOMAIN_ID" \
                --type CNAME \
-               --name "SLSs-mas-${ICN}-${SUBSCRIPTION_ID}-SLS" \
+               --name "SLS.mas-${ICN}-${SUBSCRIPTION_ID}.SLS" \
                --content "apps.noble6.cp.fyre.ibm.com" \
                --proxied true
 

From b48356e7c82e816622294630c486e69711070e22 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 15:33:32 +0530
Subject: [PATCH 54/77] sync option change

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index f495d4ef5..3455f5c12 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -28,7 +28,7 @@ metadata:
   namespace: mas-{{ .Values.ibm_customer_number }}-{{ .Values.subscription_id }}-sls
   annotations:
     argocd.argoproj.io/sync-wave: "113"
-    argocd.argoproj.io/sync-options: Force=true,Replace=true
+    argocd.argoproj.io/sync-options: Force=true
 spec:
   template:
     metadata:

From 94624cb92592b03935a181abc71c976f63c70749 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 15:52:52 +0530
Subject: [PATCH 55/77] comment redundant code

---
 .../templates/07-ibm-sls-dns_job.yaml         | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 3455f5c12..aba3d6a73 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -3,23 +3,21 @@
 {{ $aws_secret := "aws"}}
 
 ---
-
-kind: Secret
-apiVersion: v1
-metadata:
-  name: {{ $aws_secret }}
-  namespace: mas-{{ .Values.ibm_customer_number }}-{{ .Values.subscription_id }}-sls
-  annotations:
-    argocd.argoproj.io/sync-wave: "105"
-type: Opaque
-{{- if .Values.custom_labels }}
-  labels:
-{{ .Values.custom_labels | toYaml | indent 4 }}
-{{- end }}
-data:
-  aws_access_key_id: {{ .Values.sm_aws_access_key_id | b64enc }}
-  aws_secret_access_key: {{ .Values.sm_aws_secret_access_key | b64enc }}
-
+# kind: Secret
+# apiVersion: v1
+# metadata:
+#   name: {{ $aws_secret }}
+#   namespace: mas-{{ .Values.ibm_customer_number }}-{{ .Values.subscription_id }}-sls
+#   annotations:
+#     argocd.argoproj.io/sync-wave: "105"
+# type: Opaque
+# {{- if .Values.custom_labels }}
+#   labels:
+# {{ .Values.custom_labels | toYaml | indent 4 }}
+# {{- end }}
+# data:
+#   aws_access_key_id: {{ .Values.sm_aws_access_key_id | b64enc }}
+#   aws_secret_access_key: {{ .Values.sm_aws_secret_access_key | b64enc }}
 ---
 apiVersion: batch/v1
 kind: Job

From b24faa704704d2e6e8aaa78251f233e34763c083 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Thu, 19 Feb 2026 15:59:47 +0530
Subject: [PATCH 56/77] update path

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index aba3d6a73..3a9f746cb 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -142,7 +142,7 @@ spec:
               echo "Creating DNS record..."
                ibmcloud cis dns-record-create "$DOMAIN_ID" \
                --type CNAME \
-               --name "SLS.mas-${ICN}-${SUBSCRIPTION_ID}.SLS" \
+               --name "SLSt.mas-${ICN}-${SUBSCRIPTION_ID}.SLS" \
                --content "apps.noble6.cp.fyre.ibm.com" \
                --proxied true
 

From f02c31af017df543648ef48546bab6e17b6e0513 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Fri, 20 Feb 2026 15:08:47 +0530
Subject: [PATCH 57/77] update ingress value

---
 .../templates/07-ibm-sls-dns_job.yaml         | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 3a9f746cb..dbb4ee7b5 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -90,6 +90,12 @@ spec:
                 --query SecretString \
                 --output text)
 
+              echo "Fetching OCP_INGRESS from AWS Secrets Manager"
+
+              export PUBLIC_ELB_DNS_NAME_FILE="/tmp/public-elb-dns-name-file.json"
+              sm_get_secret_file ${ACCOUNT_ID}${SECRETS_KEY_SEPERATOR}${CLUSTER_ID}${SECRETS_KEY_SEPERATOR}public-elb ${PUBLIC_ELB_DNS_NAME_FILE}
+              export OCP_INGRESS=$(jq -r .dns $PUBLIC_ELB_DNS_NAME_FILE)
+
               IBM_APIKEY=$(echo ${SECRET_JSON} | jq -r '.ibm_apikey')
 
                if [[ -z "${IBM_APIKEY}" || "${IBM_APIKEY}" == "null" ]]; then
@@ -97,9 +103,12 @@ spec:
                 exit 1
               fi
 
-              echo "Setting IBM CLI home to writable location..."
-             
+              if [[ -z "${OCP_INGRESS}" || "${OCP_INGRESS}" == "null" ]]; then
+              echo "Failed to fetch dns value from public-elb secret"
+              exit 1
+              fi
 
+              echo "Setting IBM CLI home to writable location..."
               export IBMCLOUD_HOME=/tmp/bluemix
               mkdir -p $IBMCLOUD_HOME
 
@@ -138,14 +147,12 @@ spec:
               exit 1
               fi
 
-
               echo "Creating DNS record..."
                ibmcloud cis dns-record-create "$DOMAIN_ID" \
                --type CNAME \
-               --name "SLSt.mas-${ICN}-${SUBSCRIPTION_ID}.SLS" \
-               --content "apps.noble6.cp.fyre.ibm.com" \
-               --proxied true
-
+               --name "SLS.mas-${ICN}-${SUBSCRIPTION_ID}-SLS" \
+               --content "${OCP_INGRESS}" \
+               --proxied false
 
               echo "DNS record created successfully!"
 

From 29d2b7361df3e774862b8448befb9b43ce0930e9 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Fri, 20 Feb 2026 15:15:43 +0530
Subject: [PATCH 58/77] update11

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index dbb4ee7b5..e90636bec 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -93,7 +93,7 @@ spec:
               echo "Fetching OCP_INGRESS from AWS Secrets Manager"
 
               export PUBLIC_ELB_DNS_NAME_FILE="/tmp/public-elb-dns-name-file.json"
-              sm_get_secret_file ${ACCOUNT_ID}${SECRETS_KEY_SEPERATOR}${CLUSTER_ID}${SECRETS_KEY_SEPERATOR}public-elb ${PUBLIC_ELB_DNS_NAME_FILE}
+              sm_get_secret_file ${ACCOUNT_ID}/${CLUSTER_ID}/public-elb ${PUBLIC_ELB_DNS_NAME_FILE}
               export OCP_INGRESS=$(jq -r .dns $PUBLIC_ELB_DNS_NAME_FILE)
 
               IBM_APIKEY=$(echo ${SECRET_JSON} | jq -r '.ibm_apikey')

From 8db9d842a876cd9a978e3dadd2d340451d6d9583 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Fri, 20 Feb 2026 15:35:10 +0530
Subject: [PATCH 59/77] uncomment additional label

---
 .../templates/08-postsync-update-sm_Job.yaml    | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml b/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml
index 520f366e8..df567b668 100644
--- a/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml
+++ b/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml
@@ -182,7 +182,7 @@ metadata:
   namespace: {{ $ns }}
   annotations:
     argocd.argoproj.io/sync-wave: "112"
-    argocd.argoproj.io/sync-options: Prune=true
+    argocd.argoproj.io/sync-options: Force=true
   labels:
     mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
 {{- if .Values.custom_labels }}
@@ -282,15 +282,14 @@ spec:
               echo "Routes found:"
               echo "${routes}"
 
-              #for route in $routes; do
-                #echo "Adding label to route - ${route}"
-                 # oc patch route ${route} \
-                 #   -n ${SUITE_NAMESPACE} \
-                  #  --type=merge \
-                  #  -p '{"metadata":{"labels":{"type":"external"}}}'
-             # done
+              for route in $routes; do
+              echo "Adding label to route - ${route}"
+
+                  oc patch route ${route} \
+                    -n ${SUITE_NAMESPACE} \
+                    --type=merge \
+                    -p '{"metadata":{"labels":{"type":"external"}}}'
 
-              #echo "Route labeling completed"
 
       restartPolicy: Never
 

From 51e58751235e640dc87af70b6135da04c354be20 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Fri, 20 Feb 2026 15:41:27 +0530
Subject: [PATCH 60/77] updatw22

---
 .../templates/08-postsync-update-sm_Job.yaml         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml b/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml
index df567b668..c0749ab52 100644
--- a/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml
+++ b/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml
@@ -275,9 +275,9 @@ spec:
               sm_update_secret $SECRET_NAME_SLS "{\"registration_key\": \"$SLS_REGISTRATION_KEY\", \"ca_b64\": \"$SLS_CA\", \"sls_url\":\"$SLS_URL\" }" "${TAGS}"
     
 
-              #echo "Fetching routes from ${namespace}"
+              echo "Fetching routes from ${namespace}"
 
-              #routes=$(oc get routes -n ${namespace} -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}')
+              routes=$(oc get routes -n ${namespace} -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}')
 
               echo "Routes found:"
               echo "${routes}"
@@ -285,10 +285,10 @@ spec:
               for route in $routes; do
               echo "Adding label to route - ${route}"
 
-                  oc patch route ${route} \
-                    -n ${SUITE_NAMESPACE} \
-                    --type=merge \
-                    -p '{"metadata":{"labels":{"type":"external"}}}'
+              oc patch route ${route} \
+                -n ${SUITE_NAMESPACE} \
+                --type=merge \
+                -p '{"metadata":{"labels":{"type":"external"}}}'
 
 
       restartPolicy: Never

From 2c7630181f3026003b8a01749d6c870e819502f4 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Fri, 20 Feb 2026 16:30:01 +0530
Subject: [PATCH 61/77] update101

---
 .../100-ibm-sls/templates/08-postsync-update-sm_Job.yaml    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml b/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml
index c0749ab52..b9c8932ab 100644
--- a/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml
+++ b/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml
@@ -274,6 +274,8 @@ spec:
               TAGS="[{\"Key\": \"source\", \"Value\": \"postsync-ibm-sls-update-sm-job\"}, {\"Key\": \"account\", \"Value\": \"${ACCOUNT_ID}\"}, {\"Key\": \"subscription_id\", \"Value\": \"${SUBSCRIPTION_ID}\"}]"
               sm_update_secret $SECRET_NAME_SLS "{\"registration_key\": \"$SLS_REGISTRATION_KEY\", \"ca_b64\": \"$SLS_CA\", \"sls_url\":\"$SLS_URL\" }" "${TAGS}"
     
+              # 1. Define the namespace using the environment variables passed to the container
+              namespace="mas-${ICN}-${SUBSCRIPTION_ID}-sls"
 
               echo "Fetching routes from ${namespace}"
 
@@ -283,10 +285,10 @@ spec:
               echo "${routes}"
 
               for route in $routes; do
-              echo "Adding label to route - ${route}"
+                echo "Adding label to route - ${route}"
 
               oc patch route ${route} \
-                -n ${SUITE_NAMESPACE} \
+                -n ${namespace} \
                 --type=merge \
                 -p '{"metadata":{"labels":{"type":"external"}}}'
 

From 5ca108adbd9f4f25fbc258394d0b3b19d3c5a012 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Fri, 20 Feb 2026 16:36:25 +0530
Subject: [PATCH 62/77] udpate

---
 .../100-ibm-sls/templates/08-postsync-update-sm_Job.yaml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml b/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml
index b9c8932ab..07a224b53 100644
--- a/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml
+++ b/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml
@@ -291,7 +291,7 @@ spec:
                 -n ${namespace} \
                 --type=merge \
                 -p '{"metadata":{"labels":{"type":"external"}}}'
-
+              done 
 
       restartPolicy: Never
 

From ca5cd1e234042ea0a9f41e6628d492c5dc755d7b Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Fri, 20 Feb 2026 23:54:42 +0530
Subject: [PATCH 63/77] Revert "HADR & job label length fix"

This reverts commit 350a8c35054f20f7fbfdd3a26a7de9004a2dff99.
---
 .../templates/10-postsync-setup-hadr.yaml                   | 3 ---
 .../130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml | 6 +-----
 .../templates/postdelete-delete-cr.yaml                     | 6 +-----
 .../templates/postdelete-delete-cr.yaml                     | 6 +-----
 .../templates/postdelete-delete-cr.yaml                     | 6 +-----
 .../templates/postdelete-delete-cr.yaml                     | 6 +-----
 .../templates/postdelete-delete-cr.yaml                     | 6 +-----
 .../templates/postdelete-delete-cr.yaml                     | 6 +-----
 .../templates/postdelete-delete-cr.yaml                     | 6 +-----
 9 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/instance-applications/120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml b/instance-applications/120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml
index d8c7ed44d..fe53bd5b8 100644
--- a/instance-applications/120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml
@@ -446,9 +446,6 @@ spec:
                     echo "Backup type is ${backup_type}"
                     if [[ $backup_type == 'F' || $backup_type == 'N' ]]; then
                       echo "The latest backup ${timestamp} is full backup"
-                      # Get all backup files with the same timestamp from COS
-                      backup_filenames=`oc exec -n ${DB2_NAMESPACE} c-${PRIMARY_DB2_INSTANCE_NAME}-db2u-0 -- su -lc "~/bin/CheckCOS.sh | grep c-${PRIMARY_DB2_INSTANCE_NAME}-db2u-0 | grep -iv keystore | grep ${timestamp} | awk -F '/' '{print \$NF}'" db2inst1`
-                      echo "Backup filenames from COS: ${backup_filenames}"
                     else
                       echo "The latest backup ${timestamp} is not a full backup"
                       timestamp=''
diff --git a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml
index 3ac8482f2..c3badf8f0 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml
@@ -9,11 +9,7 @@ Use the build/bin/set-cli-image-digest.sh script to update this value across all
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
 
-{{- /* Truncate job name to stay under 63 character limit for labels */ -}}
-{{- /* postdelete-cr-job- (18) + name (38) + - (1) + hash (6) = 63 chars */ -}}
-{{ $name_hash := $cr_name | sha256sum | trunc 6 }}
-{{ $truncated_name := trunc 38 $cr_name }}
-{{ $job_name := printf "postdelete-cr-job-%s-%s" $truncated_name $name_hash }}
+{{ $job_name := printf "postdelete-delete-cr-job-%s" $cr_name }}
 
 # NOTE: depends on resources created in ibm-mas-suite chart (01-postdelete-crs-resources)
 # The values below must align with the values in that file
diff --git a/instance-applications/130-ibm-kafka-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-kafka-config/templates/postdelete-delete-cr.yaml
index 05e0e1796..3333d1bff 100644
--- a/instance-applications/130-ibm-kafka-config/templates/postdelete-delete-cr.yaml
+++ b/instance-applications/130-ibm-kafka-config/templates/postdelete-delete-cr.yaml
@@ -4,11 +4,7 @@
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
 
-{{- /* Truncate job name to stay under 63 character limit for labels */ -}}
-{{- /* postdelete-cr-job- (18) + name (38) + - (1) + hash (6) = 63 chars */ -}}
-{{ $name_hash := $cr_name | sha256sum | trunc 6 }}
-{{ $truncated_name := trunc 38 $cr_name }}
-{{ $job_name := printf "postdelete-cr-job-%s-%s" $truncated_name $name_hash }}
+{{ $job_name := printf "postdelete-delete-cr-job-%s" $cr_name }}
 
 # NOTE: depends on resources created in ibm-mas-suite chart (01-postdelete-crs-resources)
 # The values below must align with the values in that file
diff --git a/instance-applications/130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml
index d28523868..16bb10d57 100644
--- a/instance-applications/130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml
+++ b/instance-applications/130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml
@@ -9,11 +9,7 @@ Use the build/bin/set-cli-image-digest.sh script to update this value across all
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
 
-{{- /* Truncate job name to stay under 63 character limit for labels */ -}}
-{{- /* postdelete-cr-job- (18) + name (38) + - (1) + hash (6) = 63 chars */ -}}
-{{ $name_hash := $cr_name | sha256sum | trunc 6 }}
-{{ $truncated_name := trunc 38 $cr_name }}
-{{ $job_name := printf "postdelete-cr-job-%s-%s" $truncated_name $name_hash }}
+{{ $job_name := printf "postdelete-delete-cr-job-%s" $cr_name }}
 
 # NOTE: depends on resources created in ibm-mas-suite chart (01-postdelete-crs-resources)
 # The values below must align with the values in that file
diff --git a/instance-applications/130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml
index d28523868..16bb10d57 100644
--- a/instance-applications/130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml
+++ b/instance-applications/130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml
@@ -9,11 +9,7 @@ Use the build/bin/set-cli-image-digest.sh script to update this value across all
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
 
-{{- /* Truncate job name to stay under 63 character limit for labels */ -}}
-{{- /* postdelete-cr-job- (18) + name (38) + - (1) + hash (6) = 63 chars */ -}}
-{{ $name_hash := $cr_name | sha256sum | trunc 6 }}
-{{ $truncated_name := trunc 38 $cr_name }}
-{{ $job_name := printf "postdelete-cr-job-%s-%s" $truncated_name $name_hash }}
+{{ $job_name := printf "postdelete-delete-cr-job-%s" $cr_name }}
 
 # NOTE: depends on resources created in ibm-mas-suite chart (01-postdelete-crs-resources)
 # The values below must align with the values in that file
diff --git a/instance-applications/130-ibm-mas-mongo-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-mongo-config/templates/postdelete-delete-cr.yaml
index ee5f7a7e8..836fba49d 100644
--- a/instance-applications/130-ibm-mas-mongo-config/templates/postdelete-delete-cr.yaml
+++ b/instance-applications/130-ibm-mas-mongo-config/templates/postdelete-delete-cr.yaml
@@ -9,11 +9,7 @@ Use the build/bin/set-cli-image-digest.sh script to update this value across all
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
 
-{{- /* Truncate job name to stay under 63 character limit for labels */ -}}
-{{- /* postdelete-cr-job- (18) + name (38) + - (1) + hash (6) = 63 chars */ -}}
-{{ $name_hash := $cr_name | sha256sum | trunc 6 }}
-{{ $truncated_name := trunc 38 $cr_name }}
-{{ $job_name := printf "postdelete-cr-job-%s-%s" $truncated_name $name_hash }}
+{{ $job_name := printf "postdelete-delete-cr-job-%s" $cr_name }}
 
 # NOTE: depends on resources created in ibm-mas-suite chart (01-postdelete-crs-resources)
 # The values below must align with the values in that file
diff --git a/instance-applications/130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml
index d28523868..16bb10d57 100644
--- a/instance-applications/130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml
+++ b/instance-applications/130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml
@@ -9,11 +9,7 @@ Use the build/bin/set-cli-image-digest.sh script to update this value across all
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
 
-{{- /* Truncate job name to stay under 63 character limit for labels */ -}}
-{{- /* postdelete-cr-job- (18) + name (38) + - (1) + hash (6) = 63 chars */ -}}
-{{ $name_hash := $cr_name | sha256sum | trunc 6 }}
-{{ $truncated_name := trunc 38 $cr_name }}
-{{ $job_name := printf "postdelete-cr-job-%s-%s" $truncated_name $name_hash }}
+{{ $job_name := printf "postdelete-delete-cr-job-%s" $cr_name }}
 
 # NOTE: depends on resources created in ibm-mas-suite chart (01-postdelete-crs-resources)
 # The values below must align with the values in that file
diff --git a/instance-applications/130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml
index d28523868..16bb10d57 100644
--- a/instance-applications/130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml
+++ b/instance-applications/130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml
@@ -9,11 +9,7 @@ Use the build/bin/set-cli-image-digest.sh script to update this value across all
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
 
-{{- /* Truncate job name to stay under 63 character limit for labels */ -}}
-{{- /* postdelete-cr-job- (18) + name (38) + - (1) + hash (6) = 63 chars */ -}}
-{{ $name_hash := $cr_name | sha256sum | trunc 6 }}
-{{ $truncated_name := trunc 38 $cr_name }}
-{{ $job_name := printf "postdelete-cr-job-%s-%s" $truncated_name $name_hash }}
+{{ $job_name := printf "postdelete-delete-cr-job-%s" $cr_name }}
 
 # NOTE: depends on resources created in ibm-mas-suite chart (01-postdelete-crs-resources)
 # The values below must align with the values in that file
diff --git a/instance-applications/130-ibm-objectstorage-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-objectstorage-config/templates/postdelete-delete-cr.yaml
index d28523868..16bb10d57 100644
--- a/instance-applications/130-ibm-objectstorage-config/templates/postdelete-delete-cr.yaml
+++ b/instance-applications/130-ibm-objectstorage-config/templates/postdelete-delete-cr.yaml
@@ -9,11 +9,7 @@ Use the build/bin/set-cli-image-digest.sh script to update this value across all
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
 
-{{- /* Truncate job name to stay under 63 character limit for labels */ -}}
-{{- /* postdelete-cr-job- (18) + name (38) + - (1) + hash (6) = 63 chars */ -}}
-{{ $name_hash := $cr_name | sha256sum | trunc 6 }}
-{{ $truncated_name := trunc 38 $cr_name }}
-{{ $job_name := printf "postdelete-cr-job-%s-%s" $truncated_name $name_hash }}
+{{ $job_name := printf "postdelete-delete-cr-job-%s" $cr_name }}
 
 # NOTE: depends on resources created in ibm-mas-suite chart (01-postdelete-crs-resources)
 # The values below must align with the values in that file

From dadae5fe75f74faec92f202055ec1bad65301ab5 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Sat, 21 Feb 2026 00:02:46 +0530
Subject: [PATCH 64/77] Remove hardcoded 'type: external' label from SLS
 templates

---
 .../ibm-mas-sls-root/templates/100-ibm-sls-app.yaml            | 1 -
 .../100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml       | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
index a986dd962..9e2e19535 100644
--- a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
+++ b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
@@ -61,7 +61,6 @@ spec:
             sls_install_plan: "{{ .Values.ibm_sls_standalone.sls_install_plan }}"
             mongo_spec: {{ .Values.ibm_sls_standalone.mongo_spec | toYaml | nindent 14}}
             {{- if .Values.custom_labels }}
-            type: external
             custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }}
             {{- end }}
             junitreporter:
diff --git a/sls-applications/100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml b/sls-applications/100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml
index 7c22214b3..2e039cc85 100644
--- a/sls-applications/100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml
+++ b/sls-applications/100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml
@@ -13,9 +13,6 @@ metadata:
 {{- end }}
 spec:
   domain: {{ .Values.sls_domain }}
-  route:
-    labels:
-      type: external
   mongo: 
 {{  .Values.mongo_spec | toYaml | indent 4 }}
   license:

From a636e174845e8a25cddb9307b9d2287f136ece80 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Sat, 21 Feb 2026 00:03:56 +0530
Subject: [PATCH 65/77] remove duplicacy

---
 .../templates/07-ibm-sls-dns_job.yaml            | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index e90636bec..eeed0aac8 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -2,22 +2,6 @@
 {{- $_cli_image_digest := "sha256:55b5d6dd185503f14c112836a9a4899347d28e7b6545e0b9cf21d87f9526fb40" }}
 {{ $aws_secret := "aws"}}
 
----
-# kind: Secret
-# apiVersion: v1
-# metadata:
-#   name: {{ $aws_secret }}
-#   namespace: mas-{{ .Values.ibm_customer_number }}-{{ .Values.subscription_id }}-sls
-#   annotations:
-#     argocd.argoproj.io/sync-wave: "105"
-# type: Opaque
-# {{- if .Values.custom_labels }}
-#   labels:
-# {{ .Values.custom_labels | toYaml | indent 4 }}
-# {{- end }}
-# data:
-#   aws_access_key_id: {{ .Values.sm_aws_access_key_id | b64enc }}
-#   aws_secret_access_key: {{ .Values.sm_aws_secret_access_key | b64enc }}
 ---
 apiVersion: batch/v1
 kind: Job

From dde657a3d02cf2a8dfe359916200f704da4d6e34 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Mon, 23 Feb 2026 12:52:41 +0530
Subject: [PATCH 66/77] Guard DNS provider and add job cleanup label

---
 .../ibm-mas-sls-root/templates/100-ibm-sls-app.yaml    | 10 ++++++----
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml      |  4 ++++
 .../templates/08-postsync-update-sm_Job.yaml           |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
index 9e2e19535..af081293f 100644
--- a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
+++ b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
@@ -42,10 +42,12 @@ spec:
             ibm_customer_number: "{{ .Values.ibm_sls_standalone.ibm_customer_number }}"
             subscription_id: "{{ .Values.ibm_sls_standalone.subscription_id }}"
             sls_domain: "{{ .Values.ibm_sls_standalone.sls_domain }}"
-            dns_provider: "{{ .Values.ibm_sls_standalone.dns_provider }}"
-            {{- if eq .Values.ibm_sls_standalone.dns_provider "cis" }}
-            cis_service_name: "{{ .Values.ibm_sls_standalone.cis_service_name }}"
-            cis_crn: "{{ .Values.ibm_sls_standalone.cis_crn }}"
+            {{- if .Values.ibm_sls_standalone.dns_provider }}
+            {{- if eq (lower .Values.ibm_sls_standalone.dns_provider) "cis" }}
+            dns_provider: {{ .Values.ibm_sls_standalone.dns_provider | quote }}
+            cis_service_name: {{ .Values.ibm_sls_standalone.cis_service_name | quote }}
+            cis_crn: {{ .Values.ibm_sls_standalone.cis_crn | quote }}
+            {{- end }}
             {{- end }}
             argo_namespace: "{{ .Values.argo.namespace }}"
             sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}"
diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index eeed0aac8..0b81cdbe7 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -2,6 +2,8 @@
 {{- $_cli_image_digest := "sha256:55b5d6dd185503f14c112836a9a4899347d28e7b6545e0b9cf21d87f9526fb40" }}
 {{ $aws_secret := "aws"}}
 
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
+
 ---
 apiVersion: batch/v1
 kind: Job
@@ -11,6 +13,8 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: "113"
     argocd.argoproj.io/sync-options: Force=true
+  labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
 spec:
   template:
     metadata:
diff --git a/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml b/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml
index 07a224b53..8d34ae679 100644
--- a/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml
+++ b/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml
@@ -182,7 +182,7 @@ metadata:
   namespace: {{ $ns }}
   annotations:
     argocd.argoproj.io/sync-wave: "112"
-    argocd.argoproj.io/sync-options: Force=true
+    argocd.argoproj.io/sync-options: Prune=true
   labels:
     mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
 {{- if .Values.custom_labels }}

From 96a42f188524c794e2a17c59edc757dcff47001b Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Mon, 23 Feb 2026 13:34:35 +0530
Subject: [PATCH 67/77] Quote Helm values; dynamic DNS Job name

---
 .../ibm-mas-sls-root/templates/100-ibm-sls-app.yaml       | 6 +++---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml         | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
index af081293f..c2ab33419 100644
--- a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
+++ b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml
@@ -44,9 +44,9 @@ spec:
             sls_domain: "{{ .Values.ibm_sls_standalone.sls_domain }}"
             {{- if .Values.ibm_sls_standalone.dns_provider }}
             {{- if eq (lower .Values.ibm_sls_standalone.dns_provider) "cis" }}
-            dns_provider: {{ .Values.ibm_sls_standalone.dns_provider | quote }}
-            cis_service_name: {{ .Values.ibm_sls_standalone.cis_service_name | quote }}
-            cis_crn: {{ .Values.ibm_sls_standalone.cis_crn | quote }}
+            dns_provider: "{{ .Values.ibm_sls_standalone.dns_provider }}"
+            cis_service_name: "{{ .Values.ibm_sls_standalone.cis_service_name }}"
+            cis_crn: "{{ .Values.ibm_sls_standalone.cis_crn  }}"
             {{- end }}
             {{- end }}
             argo_namespace: "{{ .Values.argo.namespace }}"
diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 0b81cdbe7..bfb1d143f 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -1,14 +1,18 @@
 
 {{- $_cli_image_digest := "sha256:55b5d6dd185503f14c112836a9a4899347d28e7b6545e0b9cf21d87f9526fb40" }}
 {{ $aws_secret := "aws"}}
-
+{{- $_job_name_prefix := "ibm-sls-dns" }}
 {{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+{{- $_job_version := "v5" }}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }}
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: cis-dns-job
+  name: $_job_name 
   namespace: mas-{{ .Values.ibm_customer_number }}-{{ .Values.subscription_id }}-sls
   annotations:
     argocd.argoproj.io/sync-wave: "113"

From 6baf16b2176995a3f9d2d3c5582529b2debfb581 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Mon, 23 Feb 2026 13:41:38 +0530
Subject: [PATCH 68/77] Update 07-ibm-sls-dns_job.yaml

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index bfb1d143f..02ffc934b 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -12,7 +12,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: $_job_name 
+  name: {{ $_job_name  }}
   namespace: mas-{{ .Values.ibm_customer_number }}-{{ .Values.subscription_id }}-sls
   annotations:
     argocd.argoproj.io/sync-wave: "113"

From 44658680b44df3e34d285d86e199a6af1bf25e29 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Mon, 23 Feb 2026 14:01:07 +0530
Subject: [PATCH 69/77] Wrap DNS Job in dns_provider conditional

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 02ffc934b..b90c317c2 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -7,7 +7,7 @@
 {{- $_job_version := "v5" }}
 {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }}
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
-
+{{- if .Values.ibm_sls_standalone.dns_provider }}
 ---
 apiVersion: batch/v1
 kind: Job

From 3566065c975e1918190d85345e2b2ac9b463a5db Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Mon, 23 Feb 2026 14:07:30 +0530
Subject: [PATCH 70/77] Update 07-ibm-sls-dns_job.yaml

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index b90c317c2..af903a556 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -153,3 +153,4 @@ spec:
             secret:
               secretName: aws       # make sure this Secret exists in the same namespace
               defaultMode: 420
+{{- end }}
\ No newline at end of file

From fd07f5039236b0d248f07aa3951273b29232c1a4 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Mon, 23 Feb 2026 14:16:34 +0530
Subject: [PATCH 71/77] Guard DNS job template with standalone check

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index af903a556..8431de3db 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -7,7 +7,7 @@
 {{- $_job_version := "v5" }}
 {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }}
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
-{{- if .Values.ibm_sls_standalone.dns_provider }}
+{{- if and .Values.ibm_sls_standalone .Values.ibm_sls_standalone.dns_provider }}
 ---
 apiVersion: batch/v1
 kind: Job

From 86dd222726cec35637c5318ef82a3d8bbc13d07a Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Mon, 23 Feb 2026 14:47:01 +0530
Subject: [PATCH 72/77] Update 07-ibm-sls-dns_job.yaml

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 8431de3db..3662b9fab 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -7,7 +7,7 @@
 {{- $_job_version := "v5" }}
 {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }}
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
-{{- if and .Values.ibm_sls_standalone .Values.ibm_sls_standalone.dns_provider }}
+{{- if and .Values.ibm_sls_standalone.dns_provider (eq (lower .Values.ibm_sls_standalone.dns_provider) "cis") }}
 ---
 apiVersion: batch/v1
 kind: Job

From a4061efe6df4c2844569ccb7864f6ebca9d5b1c0 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Mon, 23 Feb 2026 14:52:31 +0530
Subject: [PATCH 73/77] update check

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 3662b9fab..83383f496 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -7,7 +7,7 @@
 {{- $_job_version := "v5" }}
 {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }}
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
-{{- if and .Values.ibm_sls_standalone.dns_provider (eq (lower .Values.ibm_sls_standalone.dns_provider) "cis") }}
+{{- if and .Values.ibm_sls_standalone .Values.ibm_sls_standalone.dns_provider (eq (lower .Values.ibm_sls_standalone.dns_provider) "cis") }}
 ---
 apiVersion: batch/v1
 kind: Job

From fd5ed0f6dc8a2c3c2b52ac3179c8c54e6fb8d10e Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Mon, 23 Feb 2026 14:58:39 +0530
Subject: [PATCH 74/77] Update 07-ibm-sls-dns_job.yaml

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index 83383f496..f4212549f 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -7,7 +7,6 @@
 {{- $_job_version := "v5" }}
 {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }}
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
-{{- if and .Values.ibm_sls_standalone .Values.ibm_sls_standalone.dns_provider (eq (lower .Values.ibm_sls_standalone.dns_provider) "cis") }}
 ---
 apiVersion: batch/v1
 kind: Job
@@ -153,4 +152,3 @@ spec:
             secret:
               secretName: aws       # make sure this Secret exists in the same namespace
               defaultMode: 420
-{{- end }}
\ No newline at end of file

From 1bd835bb30b6c6f568968c2c331dd3aca0518b50 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Mon, 23 Feb 2026 15:21:11 +0530
Subject: [PATCH 75/77] Update 07

---
 sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index f4212549f..b1ef8e17c 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -7,6 +7,7 @@
 {{- $_job_version := "v5" }}
 {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }}
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+{{- if not (empty .Values.ibm_sls_standalone.dns_provider) }}
 ---
 apiVersion: batch/v1
 kind: Job
@@ -152,3 +153,4 @@ spec:
             secret:
               secretName: aws       # make sure this Secret exists in the same namespace
               defaultMode: 420
+{{- end }}

From 59d7221841ffe76a001208cd7dc891a979e086f4 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Mon, 23 Feb 2026 15:33:26 +0530
Subject: [PATCH 76/77] update11

---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index b1ef8e17c..e680e1532 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -7,7 +7,8 @@
 {{- $_job_version := "v5" }}
 {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }}
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
-{{- if not (empty .Values.ibm_sls_standalone.dns_provider) }}
+{{- if .Values.ibm_sls_standalone }}
+  {{- if and .Values.ibm_sls_standalone.dns_provider (eq (lower .Values.ibm_sls_standalone.dns_provider) "cis") }}
 ---
 apiVersion: batch/v1
 kind: Job
@@ -154,3 +155,5 @@ spec:
               secretName: aws       # make sure this Secret exists in the same namespace
               defaultMode: 420
 {{- end }}
+{{- end }}
+

From 77415d02aecbb80333c3c058c6abbc258bcedea5 Mon Sep 17 00:00:00 2001
From: Drashti-Malviya <drashti.malviya@ibm.com>
Date: Mon, 23 Feb 2026 15:54:14 +0530
Subject: [PATCH 77/77] UPDATE 011

---
 .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml             | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
index e680e1532..410f8df02 100644
--- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
+++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml
@@ -7,8 +7,7 @@
 {{- $_job_version := "v5" }}
 {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }}
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
-{{- if .Values.ibm_sls_standalone }}
-  {{- if and .Values.ibm_sls_standalone.dns_provider (eq (lower .Values.ibm_sls_standalone.dns_provider) "cis") }}
+{{- if not (empty .Values.dns_provider) }}
 ---
 apiVersion: batch/v1
 kind: Job
@@ -155,5 +154,4 @@ spec:
               secretName: aws       # make sure this Secret exists in the same namespace
               defaultMode: 420
 {{- end }}
-{{- end }}