From 3690f6292ee60092e2fce63b63bc6d3c95bf2469 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Wed, 5 Feb 2025 19:06:04 +0000
Subject: [PATCH 001/115] [patch] First pass at approach to pinning cli image
 tag

https://jsw.ibm.com/browse/MASCORE-5516
---
 .../templates/06-postsync-configtool-oidc.yaml              | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 79e00c56e..22ec5edcf 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -1,3 +1,5 @@
+{{ $cli_image_tag := "13.2.0" }}
+
 {{ $ns :=                 printf "mas-%s-core" .Values.instance_id }}
 {{ $np_name :=            "postsync-configtool-oidc-np" }}
 {{ $role_name :=          "postsync-configtool-oidc-r" }}
@@ -83,7 +85,7 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ $job_label }}-v2-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $job_label }}-v2-{{ cat (omit .Values "junitreporter" | toYaml) $cli_image_tag | adler32sum }}
   namespace: {{ $ns }}
   annotations:
     argocd.argoproj.io/sync-wave: "145"
@@ -102,7 +104,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From dc2203041005a100c9fbdfa21f18b8c8798a13db Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 6 Feb 2025 16:24:00 +0000
Subject: [PATCH 002/115] Attempt to standardise job name generation

---
 .../06-postsync-configtool-oidc.yaml          | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 22ec5edcf..026e5057c 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -1,4 +1,38 @@
-{{ $cli_image_tag := "13.2.0" }}
+{{- /*
+Use the build/bin/set-cli-image.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "postsync-configtool-oidc-job" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+*/}}
+{{- $_job_version := "v2" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
 
 {{ $ns :=                 printf "mas-%s-core" .Values.instance_id }}
 {{ $np_name :=            "postsync-configtool-oidc-np" }}
@@ -85,7 +119,7 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ $job_label }}-v2-{{ cat (omit .Values "junitreporter" | toYaml) $cli_image_tag | adler32sum }}
+  name: {{ $_job_name }}
   namespace: {{ $ns }}
   annotations:
     argocd.argoproj.io/sync-wave: "145"

From a5b829d88f3199c7fe57e4d67d94d9a02244b462 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 6 Feb 2025 17:03:46 +0000
Subject: [PATCH 003/115] fix

---
 .../templates/06-postsync-configtool-oidc.yaml      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 026e5057c..337dd0471 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -1,12 +1,13 @@
 {{- /*
-Use the build/bin/set-cli-image.sh script to update this value across all charts.
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_job_name_prefix := "postsync-configtool-oidc-job" }}
 
 {{- /*
-Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+Use the build/bin/set-cli-image.sh script to update this value across all charts.
+Included in $_job_hash (see below).
 */}}
-{{- $_job_name_prefix := "postsync-configtool-oidc-job" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
@@ -14,12 +15,14 @@ Any changes to values in this dict will trigger a rerun of the job.
 Since jobs must be idemopotent, it's generally safe to pass in values here that are not
 strictly necessary (i.e. including some values that don't actually influence job behaviour).
 We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
 */}}
 {{- $_job_config_values := omit .Values "junitreporter" }}
 
 {{- /*
 Increment this value whenever you make a change to an immutable field of the Job resource.
 E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
 */}}
 {{- $_job_version := "v2" }}
 
@@ -138,7 +141,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:{{ $cli_image_tag }}
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From e85245cf4b175e5e07c22b4109ca569ae184b2c8 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 6 Feb 2025 17:59:09 +0000
Subject: [PATCH 004/115] set-cli-image-tag.sh helper script

---
 build/bin/set-cli-image-tag.sh | 73 ++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100755 build/bin/set-cli-image-tag.sh

diff --git a/build/bin/set-cli-image-tag.sh b/build/bin/set-cli-image-tag.sh
new file mode 100755
index 000000000..5c5103dcd
--- /dev/null
+++ b/build/bin/set-cli-image-tag.sh
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# Assisted by watsonx Code Assistant
+
+function print_help() {
+  cat << EOM
+Usage: set-cli-image-tag.sh [OPTION]
+Replace value of the \$_cli_image_tag constant with a given tag for all .yaml and .yml files in a given directory (and its sub-directories).
+
+    -d, --root-dir   Directory to (recursively) search for .yml and .yaml files
+    -t, --tag        The new value for \$_cli_image_tag
+    -h, --help       Print this help message and exit
+
+Example:
+    set-cli-image-tag.sh --root-dir /home/tom/workspace/gitops --tag 13.2.1
+EOM
+}
+
+
+# echo "build/bin/copy-tekton.sh -c <ibm-mas/cli directory>"
+# echo ""
+# echo "Example usage: "
+# echo "  build/bin/copy-tekton.sh -c /Users/whitfiea/Work/Git/ibm-mas/cli -v 10.3.0 --saas-task-version 1.0.0-amd64"
+# echo ""
+
+# Process command line arguments
+while [[ $# -gt 0 ]]
+do
+    key="$1"
+    shift
+    case $key in
+        -d|--root-dir)
+        ROOT_DIR=$1
+        shift
+        ;;
+        -t|--tag)
+        TAG=$1
+        shift
+        ;;
+        -h|--help)
+        print_help
+        ;;
+        *)
+        # unknown option
+        echo -e "\nUsage Error: Unsupported flag \"${key}\"\n\n"
+        print_help
+        exit 1
+        ;;
+    esac
+done
+
+: ${ROOT_DIR?"Need to set -d|--root-dir) argument"}
+: ${TAG?"Need to set -t|--tag argument"}
+
+scanned_count=0
+updated_count=0
+for file in $(find ${ROOT_DIR} -type f \( -name "*.yaml" -o -name "*.yml" \)); do
+    (( scanned_count++ ))
+    before_cksum=$(cksum "$file")
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+        sed -Ezi '' 's/(\{\{-?\s*[[:space:]]*\$_cli_image_tag[[:space:]]*:=[[:space:]]*")([^"]*)("[[:space:]]*\}\})/\1'${TAG}'\3/g' ${file}
+    else
+        sed -Ezi 's/(\{\{-?\s*[[:space:]]*\$_cli_image_tag[[:space:]]*:=[[:space:]]*")([^"]*)("[[:space:]]*\}\})/\1'${TAG}'\3/g' ${file}
+    fi
+    after_cksum=$(cksum "$file")
+    if [[ "$before_cksum" != "$after_cksum" ]]; then
+        (( updated_count++ ))
+    fi
+done
+
+echo "Complete:"
+echo "   ${scanned_count} file(s) scanned"
+echo "   ${updated_count} file(s) updated"

From 8da9670793f2ca4d45ae4e116a449f6e990ab4b0 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 6 Feb 2025 17:59:35 +0000
Subject: [PATCH 005/115] remove comment

---
 build/bin/set-cli-image-tag.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/build/bin/set-cli-image-tag.sh b/build/bin/set-cli-image-tag.sh
index 5c5103dcd..893a61a6e 100755
--- a/build/bin/set-cli-image-tag.sh
+++ b/build/bin/set-cli-image-tag.sh
@@ -16,13 +16,6 @@ Example:
 EOM
 }
 
-
-# echo "build/bin/copy-tekton.sh -c <ibm-mas/cli directory>"
-# echo ""
-# echo "Example usage: "
-# echo "  build/bin/copy-tekton.sh -c /Users/whitfiea/Work/Git/ibm-mas/cli -v 10.3.0 --saas-task-version 1.0.0-amd64"
-# echo ""
-
 # Process command line arguments
 while [[ $# -gt 0 ]]
 do

From d49cbe029d5a2c773bef5c59413f1426e2a0ea24 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 6 Feb 2025 18:15:52 +0000
Subject: [PATCH 006/115] fix for darwin

---
 build/bin/set-cli-image-tag.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/bin/set-cli-image-tag.sh b/build/bin/set-cli-image-tag.sh
index 893a61a6e..5185da6b7 100755
--- a/build/bin/set-cli-image-tag.sh
+++ b/build/bin/set-cli-image-tag.sh
@@ -51,9 +51,9 @@ for file in $(find ${ROOT_DIR} -type f \( -name "*.yaml" -o -name "*.yml" \)); d
     (( scanned_count++ ))
     before_cksum=$(cksum "$file")
     if [[ "$OSTYPE" == "darwin"* ]]; then
-        sed -Ezi '' 's/(\{\{-?\s*[[:space:]]*\$_cli_image_tag[[:space:]]*:=[[:space:]]*")([^"]*)("[[:space:]]*\}\})/\1'${TAG}'\3/g' ${file}
+        sed -Ei '' 's/(\{\{-?\s*[[:space:]]*\$_cli_image_tag[[:space:]]*:=[[:space:]]*")([^"]*)("[[:space:]]*\}\})/\1'${TAG}'\3/g' ${file}
     else
-        sed -Ezi 's/(\{\{-?\s*[[:space:]]*\$_cli_image_tag[[:space:]]*:=[[:space:]]*")([^"]*)("[[:space:]]*\}\})/\1'${TAG}'\3/g' ${file}
+        sed -Ei 's/(\{\{-?\s*[[:space:]]*\$_cli_image_tag[[:space:]]*:=[[:space:]]*")([^"]*)("[[:space:]]*\}\})/\1'${TAG}'\3/g' ${file}
     fi
     after_cksum=$(cksum "$file")
     if [[ "$before_cksum" != "$after_cksum" ]]; then

From 5f941084e81158f35b2f2f321e827192670a6a4c Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 6 Feb 2025 18:22:41 +0000
Subject: [PATCH 007/115] fix comment

---
 .../templates/06-postsync-configtool-oidc.yaml                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 337dd0471..50e80ec08 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -4,7 +4,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 {{- $_job_name_prefix := "postsync-configtool-oidc-job" }}
 
 {{- /*
-Use the build/bin/set-cli-image.sh script to update this value across all charts.
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
 {{- $_cli_image_tag := "13.2.0" }}

From 6e17e927dfab3249c64d6b9e31bc7e7a88f97652 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 6 Feb 2025 18:59:28 +0000
Subject: [PATCH 008/115] WIP: verify-job-definitions.sh script

---
 build/bin/verify-job-definitions.sh | 78 +++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100755 build/bin/verify-job-definitions.sh

diff --git a/build/bin/verify-job-definitions.sh b/build/bin/verify-job-definitions.sh
new file mode 100755
index 000000000..b146ddc7e
--- /dev/null
+++ b/build/bin/verify-job-definitions.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+
+# WORK IN PROGRESS
+
+ROOT_DIR="/home/tom/workspaces/structured/saas/gitops/instance-applications/130-ibm-mas-suite"
+
+
+# Any file that contains quay.io/ibmmas/cli, MUST also contain:
+#   {{- $_job_name_prefix := "postsync-configtool-oidc-job" }}
+
+
+files=$(grep -Erl --include '*.yaml' 'quay.io/ibmmas/cli:' ${ROOT_DIR})
+
+scanned_count=0
+valid_count=0
+invalid_count=0
+
+for file in ${files}; do
+    problems=""
+    (( scanned_count++ ))
+
+    grep -Eq '\{\{-?\s*[[:space:]]*\$_cli_image_tag[[:space:]]*:=[[:space:]]*"[^"]+"[[:space:]]*\}\}' $file
+    rc=$?
+    if [[ $rc != 0 ]]; then
+        problems='    Missing {{- $_cli_image_tag := "..." }}\n'
+    fi
+
+    grep -Eq '\{\{-?\s*[[:space:]]*\$_job_name_prefix[[:space:]]*:=[[:space:]]*"[^"]+"[[:space:]]*\}\}' $file
+    rc=$?
+    if [[ $rc != 0 ]]; then
+        problems=${problems}'    Missing {{- $_job_name_prefix := "..." }}\n'
+        # TODO: check actual value <=52 chars in length?
+    fi
+
+    # TODO: check $_job_config_values - a bit different since its value is a dict
+    # TODO: maybe we change how these are specified - at least need to try out some examples where we pick specific values out
+    # grep -Eq '\{\{-?\s*[[:space:]]*\$_job_config_values[[:space:]]*:=[[:space:]]*"[^"]+"[[:space:]]*\}\}' $file
+    # rc=$?
+    # if [[ $rc != 0 ]]; then
+    #     problems='    Missing {{- $_job_config_values := "..." }}\n'
+    # fi
+
+    grep -Eq '\{\{-?\s*[[:space:]]*\$_job_version[[:space:]]*:=[[:space:]]*"[^"]+"[[:space:]]*\}\}' $file
+    rc=$?
+    if [[ $rc != 0 ]]; then
+        problems=${problems}'    Missing {{- $_job_version := "..." }}\n'
+    fi
+
+    # TODO: check $_job_config_values has specific value
+
+    # TODO: check $_job_name has specific value
+
+    # TODO: any line that has "quay.io/ibmmas/cli" only has quay.io/ibmmas/cli:{{ $_cli_image_tag }}
+
+    # TODO: need to relax rules for resources other than Jobs (where immutability is not an issue - e.g. CronJobs)?
+
+    if [[ -n "$problems" ]]; then
+        echo "${file}:"
+        echo -e "${problems}"
+        (( invalid_count++ ))
+    else
+         (( valid_count++ ))
+    fi
+done
+
+echo
+echo "Complete"
+echo "  ${scanned_count} files scanned"
+echo "  ${valid_count} are valid"
+echo "  ${invalid_count} are invalid"
+
+if [[ $invalid_count > 0 ]]; then
+    echo ""
+    echo "Invalid files were found, please see logs above for details"
+    echo "Further documentation available at TODO"
+    exit 1
+fi

From 9e4f0ff9ea8616c4847ed195948dd540f7064729 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Fri, 7 Feb 2025 16:35:12 +0000
Subject: [PATCH 009/115] improve job validation

---
 build/bin/set-cli-image-tag.sh      |  4 +-
 build/bin/verify-job-definitions.sh | 81 ++++++++++++++++++++++-------
 2 files changed, 64 insertions(+), 21 deletions(-)

diff --git a/build/bin/set-cli-image-tag.sh b/build/bin/set-cli-image-tag.sh
index 5185da6b7..fef58d925 100755
--- a/build/bin/set-cli-image-tag.sh
+++ b/build/bin/set-cli-image-tag.sh
@@ -51,9 +51,9 @@ for file in $(find ${ROOT_DIR} -type f \( -name "*.yaml" -o -name "*.yml" \)); d
     (( scanned_count++ ))
     before_cksum=$(cksum "$file")
     if [[ "$OSTYPE" == "darwin"* ]]; then
-        sed -Ei '' 's/(\{\{-?\s*[[:space:]]*\$_cli_image_tag[[:space:]]*:=[[:space:]]*")([^"]*)("[[:space:]]*\}\})/\1'${TAG}'\3/g' ${file}
+        sed -Ei '' 's/(\{\{-?[[:space:]]*\$_cli_image_tag[[:space:]]*:=[[:space:]]*")([^"]*)("[[:space:]]*\}\})/\1'${TAG}'\3/g' ${file}
     else
-        sed -Ei 's/(\{\{-?\s*[[:space:]]*\$_cli_image_tag[[:space:]]*:=[[:space:]]*")([^"]*)("[[:space:]]*\}\})/\1'${TAG}'\3/g' ${file}
+        sed -Ei 's/(\{\{-?[[:space:]]*\$_cli_image_tag[[:space:]]*:=[[:space:]]*")([^"]*)("[[:space:]]*\}\})/\1'${TAG}'\3/g' ${file}
     fi
     after_cksum=$(cksum "$file")
     if [[ "$before_cksum" != "$after_cksum" ]]; then
diff --git a/build/bin/verify-job-definitions.sh b/build/bin/verify-job-definitions.sh
index b146ddc7e..a7fedb8a2 100755
--- a/build/bin/verify-job-definitions.sh
+++ b/build/bin/verify-job-definitions.sh
@@ -6,11 +6,9 @@
 ROOT_DIR="/home/tom/workspaces/structured/saas/gitops/instance-applications/130-ibm-mas-suite"
 
 
-# Any file that contains quay.io/ibmmas/cli, MUST also contain:
-#   {{- $_job_name_prefix := "postsync-configtool-oidc-job" }}
+# Any file that contains quay.io/ibmmas/cli, MUST conform
 
-
-files=$(grep -Erl --include '*.yaml' 'quay.io/ibmmas/cli:' ${ROOT_DIR})
+files=$(grep -Erl --include '*.yaml' 'quay.io/ibmmas/cli' ${ROOT_DIR})
 
 scanned_count=0
 valid_count=0
@@ -20,38 +18,83 @@ for file in ${files}; do
     problems=""
     (( scanned_count++ ))
 
-    grep -Eq '\{\{-?\s*[[:space:]]*\$_cli_image_tag[[:space:]]*:=[[:space:]]*"[^"]+"[[:space:]]*\}\}' $file
+    # Check $_cli_image_tag constant is defined (and is a string)
+    grep -Eq '^[[:space:]]*\{\{-?[[:space:]]+\$_cli_image_tag[[:space:]]*:=[[:space:]]*"[^"]+"[[:space:]]*\}\}' $file
     rc=$?
     if [[ $rc != 0 ]]; then
         problems='    Missing {{- $_cli_image_tag := "..." }}\n'
     fi
 
-    grep -Eq '\{\{-?\s*[[:space:]]*\$_job_name_prefix[[:space:]]*:=[[:space:]]*"[^"]+"[[:space:]]*\}\}' $file
+    # Check $_job_name_prefix constant is defined (and is a string)
+    grep -Eq '^[[:space:]]*\{\{-?[[:space:]]+\$_job_name_prefix[[:space:]]*:=[[:space:]]*"[^"]+"[[:space:]]*\}\}' $file
     rc=$?
-    if [[ $rc != 0 ]]; then
+    if [[ $rc == 0 ]]; then
+        # check $_job_name_prefix is <=52 chars in length
+        while IFS= read -r job_name_prefix; do
+            job_name_prefix_len=$(echo -n "${job_name_prefix}" | wc -m)
+            if [[ $job_name_prefix_len > 52 ]]; then
+                problems=${problems}'    Invalid $_job_name_prefix value found: "'${job_name_prefix}'" (must at most 52 chars but is currently '${job_name_prefix_len}')\n'
+            fi
+       done <<< "$(sed -En 's/^[[:space:]]*\{\{-?[[:space:]]+\$_job_name_prefix[[:space:]]*:=[[:space:]]*"([^"]+)"[[:space:]]*\}\}/\1/p' $file)"
+    else
         problems=${problems}'    Missing {{- $_job_name_prefix := "..." }}\n'
-        # TODO: check actual value <=52 chars in length?
     fi
 
-    # TODO: check $_job_config_values - a bit different since its value is a dict
-    # TODO: maybe we change how these are specified - at least need to try out some examples where we pick specific values out
-    # grep -Eq '\{\{-?\s*[[:space:]]*\$_job_config_values[[:space:]]*:=[[:space:]]*"[^"]+"[[:space:]]*\}\}' $file
-    # rc=$?
-    # if [[ $rc != 0 ]]; then
-    #     problems='    Missing {{- $_job_config_values := "..." }}\n'
-    # fi
+    # Check $_job_config_values constant is defined
+    grep -Eq '^[[:space:]]*\{\{-?[[:space:]]+\$_job_config_values[[:space:]]*:=[^}]+\}' $file
+    rc=$?
+    if [[ $rc != 0 ]]; then
+        problems=${problems}'    Missing {{- $_job_config_values := ... }}\n'
+    fi
 
-    grep -Eq '\{\{-?\s*[[:space:]]*\$_job_version[[:space:]]*:=[[:space:]]*"[^"]+"[[:space:]]*\}\}' $file
+    # Check $_job_version constant is defined (and is a string)
+    grep -Eq '^[[:space:]]*\{\{-?[[:space:]]+\$_job_version[[:space:]]*:=[[:space:]]*"[^"]+"[[:space:]]*\}\}' $file
     rc=$?
     if [[ $rc != 0 ]]; then
         problems=${problems}'    Missing {{- $_job_version := "..." }}\n'
     fi
 
-    # TODO: check $_job_config_values has specific value
+    # check $_job_hash constant is defined
+    grep -Eq '^[[:space:]]*\{\{-?[[:space:]]+\$_job_hash[[:space:]]*:=[^}]+\}' $file
+    rc=$?
+    if [[ $rc == 0 ]]; then
+        # check $_job_hash has correct value
+        while IFS= read -r job_hash_value; do
+            grep -Eq '^[[:space:]]*print[[:space:]]+\([[:space:]]*\$_job_config_values[[:space:]]*\|[[:space:]]*toYaml[[:space:]]*\)[[:space:]]+\$_cli_image_tag[[:space:]]+\$_job_version[[:space:]]*\|[[:space:]]*adler32sum' <<< "$job_hash_value"
+            rc=$?
+            if [[ $rc != 0 ]]; then
+                problems=${problems}'    Invalid $_job_hash value found: "'${job_hash_value}'" (should be "print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum")\n'
+            fi
+        done <<< "$(sed -En 's/^[[:space:]]*\{\{-?[[:space:]]+\$_job_hash[[:space:]]*:=[[:space:]]*([^}]+)\}\}/\1/p' $file)"
+    else
+        problems=${problems}'    Missing {{- $_job_hash := "..." }}\n'
+    fi
+
 
-    # TODO: check $_job_name has specific value
+    # check $_job_name is constant is defined
+    grep -Eq '^[[:space:]]*\{\{-?[[:space:]]*\$_job_name[[:space:]]*:=[^}]+\}' $file
+    rc=$?
+    if [[ $rc == 0 ]]; then
+        # check $_job_name has correct value
+        while IFS= read -r job_name_value; do
+            grep -Eq '^[[:space:]]*join[[:space:]]*"-"[[:space:]]*\([[:space:]]*list[[:space:]]*\$_job_name_prefix[[:space:]]*\$_job_hash[[:space:]]*\)[[:space:]]*' <<< "$job_name_value"
+            rc=$?
+            if [[ $rc != 0 ]]; then
+                problems=${problems}'    Invalid $_job_name value found: "'${job_name_value}'" (should be "join "-" (list $_job_name_prefix $_job_hash)")\n'
+            fi
+        done <<< "$(sed -En 's/^[[:space:]]*\{\{-?[[:space:]]+\$_job_name[[:space:]]*:=[[:space:]]*([^}]+)\}\}/\1/p' $file)"
+    else
+        problems=${problems}'    Missing {{- $_job_name := "..." }}\n'
+    fi
 
-    # TODO: any line that has "quay.io/ibmmas/cli" only has quay.io/ibmmas/cli:{{ $_cli_image_tag }}
+    # Any line that has "quay.io/ibmmas/cli" must match quay.io/ibmmas/cli:{{ $_cli_image_tag }}
+    while IFS= read -r cli_image_ref; do 
+        grep -Eq '\{\{-?[[:space:]]+\$_cli_image_tag[[:space:]]*\}\}' <<< "$cli_image_ref"
+        rc=$?
+        if [[ $rc != 0 ]]; then
+            problems=${problems}'    Invalid CLI image tag found: "'${cli_image_ref}'" (should be "{{ $_cli_image_tag }}")\n'
+        fi
+    done <<< "$(sed -En 's/.*quay\.io\/ibmmas\/cli:(.*)/\1/p' $file)"
 
     # TODO: need to relax rules for resources other than Jobs (where immutability is not an issue - e.g. CronJobs)?
 

From c8d45f6925c5a73e43023ae5e4753038132dccd9 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Fri, 7 Feb 2025 17:35:16 +0000
Subject: [PATCH 010/115] improve validator

---
 build/bin/verify-job-definitions.sh | 74 ++++++++++++++++++++++++-----
 1 file changed, 63 insertions(+), 11 deletions(-)

diff --git a/build/bin/verify-job-definitions.sh b/build/bin/verify-job-definitions.sh
index a7fedb8a2..d2499dcb4 100755
--- a/build/bin/verify-job-definitions.sh
+++ b/build/bin/verify-job-definitions.sh
@@ -3,11 +3,46 @@
 
 # WORK IN PROGRESS
 
-ROOT_DIR="/home/tom/workspaces/structured/saas/gitops/instance-applications/130-ibm-mas-suite"
 
+function print_help() {
+  cat << EOM
+Usage: verify-job-definitions.sh [OPTION]
+TODO description
+
+    -d, --root-dir   Directory to (recursively) search for .yml and .yaml files
+    -t, --tag        The new value for \$_cli_image_tag
+    -h, --help       Print this help message and exit
+
+Example:
+    verify-job-definitions.sh --root-dir /home/tom/workspace/gitops
+EOM
+}
+
+# Process command line arguments
+while [[ $# -gt 0 ]]
+do
+    key="$1"
+    shift
+    case $key in
+        -d|--root-dir)
+        ROOT_DIR=$1
+        shift
+        ;;
+        -h|--help)
+        print_help
+        ;;
+        *)
+        # unknown option
+        echo -e "\nUsage Error: Unsupported flag \"${key}\"\n\n"
+        print_help
+        exit 1
+        ;;
+    esac
+done
 
-# Any file that contains quay.io/ibmmas/cli, MUST conform
+: ${ROOT_DIR?"Need to set -d|--root-dir) argument"}
 
+# Checks are performed against any file where a reference to the cli image is detected
 files=$(grep -Erl --include '*.yaml' 'quay.io/ibmmas/cli' ${ROOT_DIR})
 
 scanned_count=0
@@ -25,10 +60,27 @@ for file in ${files}; do
         problems='    Missing {{- $_cli_image_tag := "..." }}\n'
     fi
 
+    # Any line that has "quay.io/ibmmas/cli" must match quay.io/ibmmas/cli:{{ $_cli_image_tag }}
+    while IFS= read -r cli_image_ref; do 
+        grep -Eq '\{\{-?[[:space:]]+\$_cli_image_tag[[:space:]]*\}\}' <<< "$cli_image_ref"
+        rc=$?
+        if [[ $rc != 0 ]]; then
+            problems=${problems}'    Invalid CLI image tag found: "'${cli_image_ref}'" (should be "{{ $_cli_image_tag }}")\n'
+        fi
+    done <<< "$(sed -En 's/.*quay\.io\/ibmmas\/cli:(.*)/\1/p' $file)"
+
+
+    # TODO: perhaps we do not need to enforce strict rules on job names for those annotated with
+    # argocd.argoproj.io/hook: PreSync, PostSync or PostDelete?
+    # (and argocd.argoproj.io/hook-delete-policy: BeforeHookCreation and/or HookSucceeded?
+    # (ArgoCD handles immutability problems for us in these cases)
+    # perhaps for CronJobs too?
+
     # Check $_job_name_prefix constant is defined (and is a string)
     grep -Eq '^[[:space:]]*\{\{-?[[:space:]]+\$_job_name_prefix[[:space:]]*:=[[:space:]]*"[^"]+"[[:space:]]*\}\}' $file
     rc=$?
     if [[ $rc == 0 ]]; then
+        # TODO: it's sometimes necessary for job prefix names to be generated
         # check $_job_name_prefix is <=52 chars in length
         while IFS= read -r job_name_prefix; do
             job_name_prefix_len=$(echo -n "${job_name_prefix}" | wc -m)
@@ -87,16 +139,16 @@ for file in ${files}; do
         problems=${problems}'    Missing {{- $_job_name := "..." }}\n'
     fi
 
-    # Any line that has "quay.io/ibmmas/cli" must match quay.io/ibmmas/cli:{{ $_cli_image_tag }}
-    while IFS= read -r cli_image_ref; do 
-        grep -Eq '\{\{-?[[:space:]]+\$_cli_image_tag[[:space:]]*\}\}' <<< "$cli_image_ref"
-        rc=$?
-        if [[ $rc != 0 ]]; then
-            problems=${problems}'    Invalid CLI image tag found: "'${cli_image_ref}'" (should be "{{ $_cli_image_tag }}")\n'
-        fi
-    done <<< "$(sed -En 's/.*quay\.io\/ibmmas\/cli:(.*)/\1/p' $file)"
+    # Check the job actually uses $_job_name
+    # This isn't a perfect check - it just verifies that there is at least one instance of name: {{ $_job_name }}
+    # in the file, not that it is assigned to a (the) Job resource.
+    # Definitely possible to fool the validator here, but I think this will catch most cases.
+    grep -Eq '^[[:space:]]+name:[[:space:]]+\{\{[[:space:]]*\$_job_name[[:space:]]*\}\}' $file
+    rc=$?
+    if [[ $rc != 0 ]]; then
+        problems=${problems}'    Missing "name: {{ $_job_name }}"\n'
+    fi
 
-    # TODO: need to relax rules for resources other than Jobs (where immutability is not an issue - e.g. CronJobs)?
 
     if [[ -n "$problems" ]]; then
         echo "${file}:"

From e36f63f08662d4928534357e6e33a04d95c83ad6 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Fri, 7 Feb 2025 17:46:30 +0000
Subject: [PATCH 011/115] wip: allow naming restrictions to be relaxed for
 certain files

---
 build/bin/verify-job-definitions.sh | 159 ++++++++++++++++------------
 1 file changed, 94 insertions(+), 65 deletions(-)

diff --git a/build/bin/verify-job-definitions.sh b/build/bin/verify-job-definitions.sh
index d2499dcb4..419bd213b 100755
--- a/build/bin/verify-job-definitions.sh
+++ b/build/bin/verify-job-definitions.sh
@@ -4,6 +4,20 @@
 # WORK IN PROGRESS
 
 
+
+
+# whitespace-separated list of files to relax job naming restrictions on
+
+# This should only be used in cases where we know Job resource immutability problems when the cli_image_tag is updated
+# will not be hit (e.g. due to use of argocd.argoproj.io/hook-delete-policy)
+
+# TODO: allow to be loaded from a separate file / which is maintained by calls to this script
+# TODO: use paths to files rather than names (relative to root dir?) to avoid accidental matches against
+# files with the same name but under a different directory
+
+RELAX_FILES_LIST="10-postsync-report-starter.yaml 00-presync-report-starter.yaml"
+
+
 function print_help() {
   cat << EOM
 Usage: verify-job-definitions.sh [OPTION]
@@ -76,77 +90,92 @@ for file in ${files}; do
     # (ArgoCD handles immutability problems for us in these cases)
     # perhaps for CronJobs too?
 
-    # Check $_job_name_prefix constant is defined (and is a string)
-    grep -Eq '^[[:space:]]*\{\{-?[[:space:]]+\$_job_name_prefix[[:space:]]*:=[[:space:]]*"[^"]+"[[:space:]]*\}\}' $file
-    rc=$?
-    if [[ $rc == 0 ]]; then
-        # TODO: it's sometimes necessary for job prefix names to be generated
-        # check $_job_name_prefix is <=52 chars in length
-        while IFS= read -r job_name_prefix; do
-            job_name_prefix_len=$(echo -n "${job_name_prefix}" | wc -m)
-            if [[ $job_name_prefix_len > 52 ]]; then
-                problems=${problems}'    Invalid $_job_name_prefix value found: "'${job_name_prefix}'" (must at most 52 chars but is currently '${job_name_prefix_len}')\n'
-            fi
-       done <<< "$(sed -En 's/^[[:space:]]*\{\{-?[[:space:]]+\$_job_name_prefix[[:space:]]*:=[[:space:]]*"([^"]+)"[[:space:]]*\}\}/\1/p' $file)"
-    else
-        problems=${problems}'    Missing {{- $_job_name_prefix := "..." }}\n'
-    fi
+    # Perhaps we could allow devs to specify a list of files to relax job naming restrictions on?
+    # (_cli_image_tag constraints should always be enforced however!)
 
-    # Check $_job_config_values constant is defined
-    grep -Eq '^[[:space:]]*\{\{-?[[:space:]]+\$_job_config_values[[:space:]]*:=[^}]+\}' $file
-    rc=$?
-    if [[ $rc != 0 ]]; then
-        problems=${problems}'    Missing {{- $_job_config_values := ... }}\n'
-    fi
+    relax_for_file=0
+    filename=$(basename $file)
+    for relax_filename in $RELAX_FILES_LIST; do
+        if [[ $filename == $relax_filename ]]; then
+            relax_for_file=1
+            break
+        fi
+    done
 
-    # Check $_job_version constant is defined (and is a string)
-    grep -Eq '^[[:space:]]*\{\{-?[[:space:]]+\$_job_version[[:space:]]*:=[[:space:]]*"[^"]+"[[:space:]]*\}\}' $file
-    rc=$?
-    if [[ $rc != 0 ]]; then
-        problems=${problems}'    Missing {{- $_job_version := "..." }}\n'
-    fi
+    if [[ $relax_for_file == 0 ]]; then
 
-    # check $_job_hash constant is defined
-    grep -Eq '^[[:space:]]*\{\{-?[[:space:]]+\$_job_hash[[:space:]]*:=[^}]+\}' $file
-    rc=$?
-    if [[ $rc == 0 ]]; then
-        # check $_job_hash has correct value
-        while IFS= read -r job_hash_value; do
-            grep -Eq '^[[:space:]]*print[[:space:]]+\([[:space:]]*\$_job_config_values[[:space:]]*\|[[:space:]]*toYaml[[:space:]]*\)[[:space:]]+\$_cli_image_tag[[:space:]]+\$_job_version[[:space:]]*\|[[:space:]]*adler32sum' <<< "$job_hash_value"
-            rc=$?
-            if [[ $rc != 0 ]]; then
-                problems=${problems}'    Invalid $_job_hash value found: "'${job_hash_value}'" (should be "print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum")\n'
-            fi
-        done <<< "$(sed -En 's/^[[:space:]]*\{\{-?[[:space:]]+\$_job_hash[[:space:]]*:=[[:space:]]*([^}]+)\}\}/\1/p' $file)"
-    else
-        problems=${problems}'    Missing {{- $_job_hash := "..." }}\n'
-    fi
+        # Check $_job_name_prefix constant is defined (and is a string)
+        grep -Eq '^[[:space:]]*\{\{-?[[:space:]]+\$_job_name_prefix[[:space:]]*:=[[:space:]]*"[^"]+"[[:space:]]*\}\}' $file
+        rc=$?
+        if [[ $rc == 0 ]]; then
+            # TODO: it's sometimes necessary for job prefix names to be generated
+            # check $_job_name_prefix is <=52 chars in length
+            while IFS= read -r job_name_prefix; do
+                job_name_prefix_len=$(echo -n "${job_name_prefix}" | wc -m)
+                if [[ $job_name_prefix_len > 52 ]]; then
+                    problems=${problems}'    Invalid $_job_name_prefix value found: "'${job_name_prefix}'" (must at most 52 chars but is currently '${job_name_prefix_len}')\n'
+                fi
+        done <<< "$(sed -En 's/^[[:space:]]*\{\{-?[[:space:]]+\$_job_name_prefix[[:space:]]*:=[[:space:]]*"([^"]+)"[[:space:]]*\}\}/\1/p' $file)"
+        else
+            problems=${problems}'    Missing {{- $_job_name_prefix := "..." }}\n'
+        fi
 
+        # Check $_job_config_values constant is defined
+        grep -Eq '^[[:space:]]*\{\{-?[[:space:]]+\$_job_config_values[[:space:]]*:=[^}]+\}' $file
+        rc=$?
+        if [[ $rc != 0 ]]; then
+            problems=${problems}'    Missing {{- $_job_config_values := ... }}\n'
+        fi
 
-    # check $_job_name is constant is defined
-    grep -Eq '^[[:space:]]*\{\{-?[[:space:]]*\$_job_name[[:space:]]*:=[^}]+\}' $file
-    rc=$?
-    if [[ $rc == 0 ]]; then
-        # check $_job_name has correct value
-        while IFS= read -r job_name_value; do
-            grep -Eq '^[[:space:]]*join[[:space:]]*"-"[[:space:]]*\([[:space:]]*list[[:space:]]*\$_job_name_prefix[[:space:]]*\$_job_hash[[:space:]]*\)[[:space:]]*' <<< "$job_name_value"
-            rc=$?
-            if [[ $rc != 0 ]]; then
-                problems=${problems}'    Invalid $_job_name value found: "'${job_name_value}'" (should be "join "-" (list $_job_name_prefix $_job_hash)")\n'
-            fi
-        done <<< "$(sed -En 's/^[[:space:]]*\{\{-?[[:space:]]+\$_job_name[[:space:]]*:=[[:space:]]*([^}]+)\}\}/\1/p' $file)"
-    else
-        problems=${problems}'    Missing {{- $_job_name := "..." }}\n'
-    fi
+        # Check $_job_version constant is defined (and is a string)
+        grep -Eq '^[[:space:]]*\{\{-?[[:space:]]+\$_job_version[[:space:]]*:=[[:space:]]*"[^"]+"[[:space:]]*\}\}' $file
+        rc=$?
+        if [[ $rc != 0 ]]; then
+            problems=${problems}'    Missing {{- $_job_version := "..." }}\n'
+        fi
 
-    # Check the job actually uses $_job_name
-    # This isn't a perfect check - it just verifies that there is at least one instance of name: {{ $_job_name }}
-    # in the file, not that it is assigned to a (the) Job resource.
-    # Definitely possible to fool the validator here, but I think this will catch most cases.
-    grep -Eq '^[[:space:]]+name:[[:space:]]+\{\{[[:space:]]*\$_job_name[[:space:]]*\}\}' $file
-    rc=$?
-    if [[ $rc != 0 ]]; then
-        problems=${problems}'    Missing "name: {{ $_job_name }}"\n'
+        # check $_job_hash constant is defined
+        grep -Eq '^[[:space:]]*\{\{-?[[:space:]]+\$_job_hash[[:space:]]*:=[^}]+\}' $file
+        rc=$?
+        if [[ $rc == 0 ]]; then
+            # check $_job_hash has correct value
+            while IFS= read -r job_hash_value; do
+                grep -Eq '^[[:space:]]*print[[:space:]]+\([[:space:]]*\$_job_config_values[[:space:]]*\|[[:space:]]*toYaml[[:space:]]*\)[[:space:]]+\$_cli_image_tag[[:space:]]+\$_job_version[[:space:]]*\|[[:space:]]*adler32sum' <<< "$job_hash_value"
+                rc=$?
+                if [[ $rc != 0 ]]; then
+                    problems=${problems}'    Invalid $_job_hash value found: "'${job_hash_value}'" (should be "print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum")\n'
+                fi
+            done <<< "$(sed -En 's/^[[:space:]]*\{\{-?[[:space:]]+\$_job_hash[[:space:]]*:=[[:space:]]*([^}]+)\}\}/\1/p' $file)"
+        else
+            problems=${problems}'    Missing {{- $_job_hash := "..." }}\n'
+        fi
+
+
+        # check $_job_name is constant is defined
+        grep -Eq '^[[:space:]]*\{\{-?[[:space:]]*\$_job_name[[:space:]]*:=[^}]+\}' $file
+        rc=$?
+        if [[ $rc == 0 ]]; then
+            # check $_job_name has correct value
+            while IFS= read -r job_name_value; do
+                grep -Eq '^[[:space:]]*join[[:space:]]*"-"[[:space:]]*\([[:space:]]*list[[:space:]]*\$_job_name_prefix[[:space:]]*\$_job_hash[[:space:]]*\)[[:space:]]*' <<< "$job_name_value"
+                rc=$?
+                if [[ $rc != 0 ]]; then
+                    problems=${problems}'    Invalid $_job_name value found: "'${job_name_value}'" (should be "join "-" (list $_job_name_prefix $_job_hash)")\n'
+                fi
+            done <<< "$(sed -En 's/^[[:space:]]*\{\{-?[[:space:]]+\$_job_name[[:space:]]*:=[[:space:]]*([^}]+)\}\}/\1/p' $file)"
+        else
+            problems=${problems}'    Missing {{- $_job_name := "..." }}\n'
+        fi
+
+        # Check the job actually uses $_job_name
+        # This isn't a perfect check - it just verifies that there is at least one instance of name: {{ $_job_name }}
+        # in the file, not that it is assigned to a (the) Job resource.
+        # Definitely possible to fool the validator here, but I think this will catch most cases.
+        grep -Eq '^[[:space:]]+name:[[:space:]]+\{\{[[:space:]]*\$_job_name[[:space:]]*\}\}' $file
+        rc=$?
+        if [[ $rc != 0 ]]; then
+            problems=${problems}'    Missing "name: {{ $_job_name }}"\n'
+        fi
     fi
 
 

From 685f830c5ce8422928e0a322fc0737e0a4f6fad1 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Fri, 7 Feb 2025 17:56:13 +0000
Subject: [PATCH 012/115] start updating jobs to conform to new requirements

---
 build/bin/verify-job-definitions.sh           |  2 +-
 .../templates/04-postsync-manage-verify.yaml  |  7 ++-
 .../04-postsync-maximoit-sanity.yaml          |  8 ++-
 .../04-postsync-maximoit-verify.yaml          |  7 ++-
 .../templates/04-postsync-mvi-sanity.yaml     |  7 ++-
 .../templates/04-postsync-mvi-verify.yaml     |  8 ++-
 .../700-702-postsync-db2-manage.yaml          | 58 +++++++++++++++++--
 .../templates/00-presync-report-starter.yaml  |  7 ++-
 .../templates/10-postsync-report-starter.yaml |  6 +-
 9 files changed, 98 insertions(+), 12 deletions(-)

diff --git a/build/bin/verify-job-definitions.sh b/build/bin/verify-job-definitions.sh
index 419bd213b..b9e7d1f85 100755
--- a/build/bin/verify-job-definitions.sh
+++ b/build/bin/verify-job-definitions.sh
@@ -15,7 +15,7 @@
 # TODO: use paths to files rather than names (relative to root dir?) to avoid accidental matches against
 # files with the same name but under a different directory
 
-RELAX_FILES_LIST="10-postsync-report-starter.yaml 00-presync-report-starter.yaml"
+RELAX_FILES_LIST="10-postsync-report-starter.yaml 00-presync-report-starter.yaml 04-postsync-mvi-verify.yaml 04-postsync-mvi-sanity.yaml 04-postsync-maximoit-verify.yaml 04-postsync-maximoit-sanity.yaml 04-postsync-manage-verify.yaml"
 
 
 function print_help() {
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
index e64abbaf6..1546cce60 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
@@ -1,5 +1,10 @@
 {{- if eq .Values.mas_app_id "manage" }}
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 # A verify test is one that is non disruptive i.e. it won't create new users, i won't call authenticated apis, and it won't creates resources 
 # in the application. This type of test is run on every environment and allows a layer of verification of the app
 
@@ -263,7 +268,7 @@ spec:
       imagePullSecrets: []
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
index 89d4f8f37..67db53c02 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
@@ -1,6 +1,12 @@
 {{- if and (eq .Values.mas_app_id "manage") (.Values.run_sanity_test) }}
 {{- if and (.Values.mas_appws_spec.components) (.Values.mas_appws_spec.components.icd) }}
 
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
 # The control over if these tests run or not is controlled by the `run_sanity_test` boolean in the values
@@ -1839,7 +1845,7 @@ spec:
       imagePullSecrets: []
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
index 6dea61af0..ba25b74e7 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
@@ -1,6 +1,11 @@
 {{- if eq .Values.mas_app_id "manage" }}
 {{- if and (.Values.mas_appws_spec.components) (.Values.mas_appws_spec.components.icd) }}
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
 # The control over if these tests run or not is controlled by the `run_sanity_test` boolean in the values
@@ -440,7 +445,7 @@ spec:
       imagePullSecrets: []
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
index 98181b0ef..8d8ade0cc 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
@@ -1,5 +1,10 @@
 {{- if and (eq .Values.mas_app_id "visualinspection") (.Values.run_sanity_test) }}
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 {{ $ns               :=  .Values.mas_app_namespace }}
 {{ $np_name          :=  "postsync-sanity-mvi-np" }}
 {{ $role_name        :=  "postsync-sanity-mvi-role" }}
@@ -526,7 +531,7 @@ spec:
       imagePullSecrets: []
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
index f33d35eae..d8c2c7401 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
@@ -1,6 +1,12 @@
 {{- if eq .Values.mas_app_id "visualinspection" }}
 
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+
 {{ $ns               :=  .Values.mas_app_namespace }}
 {{ $np_name          :=  "postsync-verify-mvi-np" }}
 {{ $role_name        :=  "postsync-verify-mvi-role" }}
@@ -479,7 +485,7 @@ spec:
       imagePullSecrets: []
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index 360feb426..6a39fdd41 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -1,6 +1,9 @@
 {{- if eq .Values.mas_app_id "manage" }}
 {{- if not (empty .Values.manage_db2u_databases) }}
 
+
+
+
 {{ $manage_ns          := .Values.mas_app_namespace }}
 {{ $np_name            := "postsync-manage-db2-np" }}
 {{ $sa_name            := "postsync-manage-db2-sa" }}
@@ -66,11 +69,58 @@ metadata:
 */}}
 {{- range $i, $db := .Values.manage_db2u_databases }}
 
+
+
+
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- /*
+Although multiple jobs could potentially be run in the same namespace,
+we don't need to differentiate by instance in the name; the _job_hash appended to job name
+will take care of differentiating the jobs.
+*/}}
+{{- $_job_name_prefix := "postsync-manage-db2-job" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := $db }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v2" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print  ( $_job_config_values  |  toYaml ) $_cli_image_tag  $_job_version  |  adler32sum  }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash) }}
+
+
+
+
+
 {{ $db2_namespace      := $db.db2_namespace }}
 {{ $db2_dbname         := $db.db2_dbname }}
 {{ $db2_instance_name  := $db.db2_instance_name }}
-
-{{ $job_name           := printf "postsync-manage-db2-job-%s"  $db2_instance_name }}
 {{ $role_name          := printf "postsync-manage-db2-role-%s" $db2_instance_name }}
 {{ $rb_name            := printf "postsync-manage-db2-rb-%s"   $db2_instance_name }}
 
@@ -140,7 +190,7 @@ metadata:
   # Suffix the Job name with a hash of all chart values
   # This is to ensure that ArgoCD will delete and recreate the job if anything changes in the application config
   # The job is idempotent
-  name: {{ $job_name }}-v2-{{ omit $.Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: "{{ $manage_ns }}"
   annotations:
     argocd.argoproj.io/sync-wave: "702"
@@ -159,7 +209,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
index 47913558d..095ab8139 100644
--- a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
@@ -1,5 +1,10 @@
 {{- if .Values.devops_mongo_uri }}
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 
 {{ $prefix := printf "pre-jreporter-%s" .Values.reporter_name }}
 {{ $secret := printf "%s-devopsuri" $prefix }}
@@ -122,7 +127,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli: {{ $_cli_image_tag }}
           imagePullPolicy: Always
           resources:
             limits:
diff --git a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
index bd91d89ed..643ff0bc5 100644
--- a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
@@ -1,5 +1,9 @@
 {{- if .Values.devops_mongo_uri }}
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{ $preprefix := printf "pre-jreporter-%s" .Values.reporter_name }}
 {{ $time_cm := printf "%s-synctime" $preprefix }}
@@ -123,7 +127,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: Always
           resources:
             limits:

From 6c25808fd17da2a8bdb9e267e0c9034cc9674cf4 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Fri, 7 Feb 2025 18:16:00 +0000
Subject: [PATCH 013/115] allow relax-list to be specified in a config file

relax-files identified by path relative to root dir
---
 .verify-job-definitions/relax-list  |  7 ++++++
 build/bin/verify-job-definitions.sh | 35 ++++++++++++++++-------------
 2 files changed, 27 insertions(+), 15 deletions(-)
 create mode 100644 .verify-job-definitions/relax-list

diff --git a/.verify-job-definitions/relax-list b/.verify-job-definitions/relax-list
new file mode 100644
index 000000000..34491bf7e
--- /dev/null
+++ b/.verify-job-definitions/relax-list
@@ -0,0 +1,7 @@
+sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
+sub-charts/junitreporter/templates/00-presync-report-starter.yaml
+instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
+instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
+instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
+instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
+instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
\ No newline at end of file
diff --git a/build/bin/verify-job-definitions.sh b/build/bin/verify-job-definitions.sh
index b9e7d1f85..9f8480457 100755
--- a/build/bin/verify-job-definitions.sh
+++ b/build/bin/verify-job-definitions.sh
@@ -6,18 +6,6 @@
 
 
 
-# whitespace-separated list of files to relax job naming restrictions on
-
-# This should only be used in cases where we know Job resource immutability problems when the cli_image_tag is updated
-# will not be hit (e.g. due to use of argocd.argoproj.io/hook-delete-policy)
-
-# TODO: allow to be loaded from a separate file / which is maintained by calls to this script
-# TODO: use paths to files rather than names (relative to root dir?) to avoid accidental matches against
-# files with the same name but under a different directory
-
-RELAX_FILES_LIST="10-postsync-report-starter.yaml 00-presync-report-starter.yaml 04-postsync-mvi-verify.yaml 04-postsync-mvi-sanity.yaml 04-postsync-maximoit-verify.yaml 04-postsync-maximoit-sanity.yaml 04-postsync-manage-verify.yaml"
-
-
 function print_help() {
   cat << EOM
 Usage: verify-job-definitions.sh [OPTION]
@@ -56,6 +44,21 @@ done
 
 : ${ROOT_DIR?"Need to set -d|--root-dir) argument"}
 
+
+
+
+# list of files (one file per line, relative to root-dir) to relax job naming restrictions on
+
+# This should only be used in cases where we know Job resource immutability problems when the cli_image_tag is updated
+# will not be hit (e.g. due to use of argocd.argoproj.io/hook-delete-policy)
+
+RELAX_LIST_FILE="${ROOT_DIR}/.verify-job-definitions/relax-list"
+if [[ -f ${RELAX_LIST_FILE} ]]; then
+    RELAX_LIST=$(cat ${RELAX_LIST_FILE})
+fi
+
+
+
 # Checks are performed against any file where a reference to the cli image is detected
 files=$(grep -Erl --include '*.yaml' 'quay.io/ibmmas/cli' ${ROOT_DIR})
 
@@ -64,6 +67,8 @@ valid_count=0
 invalid_count=0
 
 for file in ${files}; do
+
+
     problems=""
     (( scanned_count++ ))
 
@@ -94,9 +99,9 @@ for file in ${files}; do
     # (_cli_image_tag constraints should always be enforced however!)
 
     relax_for_file=0
-    filename=$(basename $file)
-    for relax_filename in $RELAX_FILES_LIST; do
-        if [[ $filename == $relax_filename ]]; then
+    file_relative=${file#"${ROOT_DIR%/}/"}
+    for relax_filename in $RELAX_LIST; do
+        if [[ $file_relative == $relax_filename ]]; then
             relax_for_file=1
             break
         fi

From 04e41ff71c456401e9845c8a32512863c9e2fc2c Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Mon, 10 Feb 2025 13:13:38 +0000
Subject: [PATCH 014/115] updating jobs...

---
 .verify-job-definitions/relax-list                        | 5 ++++-
 .../templates/02-ibm-manage-update_Job.yaml               | 7 ++++++-
 .../templates/04-postsync-add-label_Job.yaml              | 7 ++++++-
 .../templates/04-postsync-manage-sanity.yaml              | 8 +++++++-
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/.verify-job-definitions/relax-list b/.verify-job-definitions/relax-list
index 34491bf7e..8dea84f4c 100644
--- a/.verify-job-definitions/relax-list
+++ b/.verify-job-definitions/relax-list
@@ -4,4 +4,7 @@ instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi
 instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
 instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
 instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
-instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
\ No newline at end of file
+instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
+instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
+instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
+instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
\ No newline at end of file
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
index c94aa4ce6..0b394fbb2 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
@@ -2,6 +2,11 @@
 {{- if and (.Values.mas_appws_spec.settings.db.upgrade) (.Values.mas_appws_spec.settings.db.upgrade.upgradeType) }}
 {{- if (eq .Values.mas_appws_spec.settings.db.upgrade.upgradeType "onlineUpgrade") }}
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $prefix := printf "%s-manage-update" .Values.mas_workspace_id}}
 {{ $np_name   := printf "%s-np" $prefix }}
@@ -124,7 +129,7 @@ spec:
         spec:
           containers:
             - name: run
-              image: quay.io/ibmmas/cli:latest
+              image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
               imagePullPolicy: IfNotPresent
               resources:
                 limits:
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
index b07cb5d3d..bed0c6cef 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
@@ -3,6 +3,11 @@
 # Nevertheless, for consistency with checks against .Values.ingress in other charts, we will also accept the string "true" here.
 {{- if (eq (toString .Values.ingress) "true") }}
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $job_label :=  "mas-app-route-patch" }}
 
@@ -137,7 +142,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
index 524eb23c7..3ceba31f7 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
@@ -1,5 +1,11 @@
 {{- if and (eq .Values.mas_app_id "manage") (.Values.run_sanity_test) }}
 
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
 # The control over if these tests run or not is controlled by the `run_sanity_test` boolean in the values
@@ -1038,7 +1044,7 @@ spec:
       imagePullSecrets: []
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From 62abe6f3a9f4528dff9aedff3663ac3d3e0d621b Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Mon, 10 Feb 2025 13:19:53 +0000
Subject: [PATCH 015/115] more jobs...

---
 .verify-job-definitions/relax-list                       | 4 +++-
 .../templates/00-presync-add-mvi-scc_Job.yaml            | 7 ++++++-
 .../templates/06-postsync-add-mvi-scc_Job.yaml           | 9 ++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.verify-job-definitions/relax-list b/.verify-job-definitions/relax-list
index 8dea84f4c..670e66278 100644
--- a/.verify-job-definitions/relax-list
+++ b/.verify-job-definitions/relax-list
@@ -7,4 +7,6 @@ instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-max
 instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
 instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
 instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
-instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
\ No newline at end of file
+instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
+instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
+instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
\ No newline at end of file
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
index 5c00df68d..b64f542d7 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
@@ -1,6 +1,11 @@
 {{- if .Values.run_sync_hooks }}
  {{- if eq .Values.mas_app_id "visualinspection" }}
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 
 {{ $ns := .Values.mas_app_namespace }}
 {{ $np_name :=    "presync-np-add-mvi-scc-np" }}
@@ -102,7 +107,7 @@ spec:
         - name: run
           # TODO: use a dedicated image with a smaller footprint for this sort of thing?
           # Just using cli for now since it has all the deps we need to talk with AWS SM
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli::{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
index 0322b1ff9..09ea0835b 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
@@ -1,6 +1,11 @@
 {{- if .Values.run_sync_hooks }}
 {{- if eq .Values.mas_app_id "visualinspection" }}
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 
 {{ $ns := .Values.mas_app_namespace }}
 {{ $np_name :=    "postsync-np-add-mvi-scc-np" }}
@@ -100,9 +105,7 @@ spec:
     spec:
       containers:
         - name: run
-          # TODO: use a dedicated image with a smaller footprint for this sort of thing?
-          # Just using cli for now since it has all the deps we need to talk with AWS SM
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli::{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From a9a052d78ff37882d364499de1106310dbd1b2e1 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Mon, 10 Feb 2025 16:22:41 +0000
Subject: [PATCH 016/115] check that there is valid reason for a given file to
 be on the relax list

---
 build/bin/verify-job-definitions.sh | 36 +++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/build/bin/verify-job-definitions.sh b/build/bin/verify-job-definitions.sh
index 9f8480457..ac96e553f 100755
--- a/build/bin/verify-job-definitions.sh
+++ b/build/bin/verify-job-definitions.sh
@@ -107,6 +107,42 @@ for file in ${files}; do
         fi
     done
 
+    # Experimental: check there is a valid reason for this file being added to the relax-list
+    if [[ $relax_for_file == 1 ]]; then
+        # The following awk commands exits 0 if and only if:
+        #   - File does not contain a Job resource 
+        #       Jobs are currently the only resource we use where immutability of the image field is a problem.
+        #       e.g. it's fine to modify the image field of a CronJob resource
+        #   - All Jobs have argocd.argoproj.io/hook
+        #   - No job has JUST argocd.argoproj.io/hook-delete-policy: HookFailed
+        #       HookFailed is the only delete policy where we might encounter immutability issues
+        #       This works because if multiple policies specified, then it must also have either HookSucceeded or BeforeHookCreation
+        #       or, if the annotation is omitted, the policy defaults to BeforeHookCreation
+        awkout=$(awk 'BEGIN { found=0; job_count=0; hook_count=0; hf_detected=0 }
+            /^[[:space:]]*kind:[[:space:]]+Job/ { inJob=1; job_count++ }
+            /^---/ { inJob=0 }
+            inJob && /argocd\.argoproj\.io\/hook:/ { hook_count++ }
+            inJob && /argocd\.argoproj\.io\/hook-delete-policy:[[:space:]]+HookFailed[[:space:]]*$/ { hf_detected=1 }
+            END {
+                if(hook_count!=job_count) {
+                    print "At least one Job is not annotated with argocd.argoproj.io/hook"
+                    exit 1
+                }
+                if(hf_detected==1) {
+                    print "At least one Job with argocd.argoproj.io/hook-delete-policy: HookFailed was detected"
+                    exit 1
+                }
+            }' $file \
+        )
+
+        rc=$?
+        if [[ $rc != 0 ]]; then
+            problems=${problems}'    '${awkout}
+        fi
+
+
+    fi
+
     if [[ $relax_for_file == 0 ]]; then
 
         # Check $_job_name_prefix constant is defined (and is a string)

From 721d9711e5e44d34b28d4c4c2b949110e66c3b77 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Mon, 10 Feb 2025 16:56:58 +0000
Subject: [PATCH 017/115] determine dynamically if a naming restrictions should
 be applied for a file, replacing need for the relax-list

---
 .gitignore                          |  1 +
 .verify-job-definitions/relax-list  | 12 ----
 build/bin/verify-job-definitions.sh | 96 +++++++++--------------------
 3 files changed, 30 insertions(+), 79 deletions(-)
 delete mode 100644 .verify-job-definitions/relax-list

diff --git a/.gitignore b/.gitignore
index 9040287ac..77189f41c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ __pycache__/main.cpython-39.pyc
 site
 .venv
 .DS_Store
+build/bin/awktest.sh
diff --git a/.verify-job-definitions/relax-list b/.verify-job-definitions/relax-list
deleted file mode 100644
index 670e66278..000000000
--- a/.verify-job-definitions/relax-list
+++ /dev/null
@@ -1,12 +0,0 @@
-sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
-sub-charts/junitreporter/templates/00-presync-report-starter.yaml
-instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
-instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
-instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
-instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
-instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
-instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
-instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
-instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
-instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
-instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
\ No newline at end of file
diff --git a/build/bin/verify-job-definitions.sh b/build/bin/verify-job-definitions.sh
index ac96e553f..688dc1bce 100755
--- a/build/bin/verify-job-definitions.sh
+++ b/build/bin/verify-job-definitions.sh
@@ -47,18 +47,6 @@ done
 
 
 
-# list of files (one file per line, relative to root-dir) to relax job naming restrictions on
-
-# This should only be used in cases where we know Job resource immutability problems when the cli_image_tag is updated
-# will not be hit (e.g. due to use of argocd.argoproj.io/hook-delete-policy)
-
-RELAX_LIST_FILE="${ROOT_DIR}/.verify-job-definitions/relax-list"
-if [[ -f ${RELAX_LIST_FILE} ]]; then
-    RELAX_LIST=$(cat ${RELAX_LIST_FILE})
-fi
-
-
-
 # Checks are performed against any file where a reference to the cli image is detected
 files=$(grep -Erl --include '*.yaml' 'quay.io/ibmmas/cli' ${ROOT_DIR})
 
@@ -89,61 +77,35 @@ for file in ${files}; do
     done <<< "$(sed -En 's/.*quay\.io\/ibmmas\/cli:(.*)/\1/p' $file)"
 
 
-    # TODO: perhaps we do not need to enforce strict rules on job names for those annotated with
-    # argocd.argoproj.io/hook: PreSync, PostSync or PostDelete?
-    # (and argocd.argoproj.io/hook-delete-policy: BeforeHookCreation and/or HookSucceeded?
-    # (ArgoCD handles immutability problems for us in these cases)
-    # perhaps for CronJobs too?
-
-    # Perhaps we could allow devs to specify a list of files to relax job naming restrictions on?
-    # (_cli_image_tag constraints should always be enforced however!)
-
-    relax_for_file=0
-    file_relative=${file#"${ROOT_DIR%/}/"}
-    for relax_filename in $RELAX_LIST; do
-        if [[ $file_relative == $relax_filename ]]; then
-            relax_for_file=1
-            break
-        fi
-    done
-
-    # Experimental: check there is a valid reason for this file being added to the relax-list
-    if [[ $relax_for_file == 1 ]]; then
-        # The following awk commands exits 0 if and only if:
-        #   - File does not contain a Job resource 
-        #       Jobs are currently the only resource we use where immutability of the image field is a problem.
-        #       e.g. it's fine to modify the image field of a CronJob resource
-        #   - All Jobs have argocd.argoproj.io/hook
-        #   - No job has JUST argocd.argoproj.io/hook-delete-policy: HookFailed
-        #       HookFailed is the only delete policy where we might encounter immutability issues
-        #       This works because if multiple policies specified, then it must also have either HookSucceeded or BeforeHookCreation
-        #       or, if the annotation is omitted, the policy defaults to BeforeHookCreation
-        awkout=$(awk 'BEGIN { found=0; job_count=0; hook_count=0; hf_detected=0 }
-            /^[[:space:]]*kind:[[:space:]]+Job/ { inJob=1; job_count++ }
-            /^---/ { inJob=0 }
-            inJob && /argocd\.argoproj\.io\/hook:/ { hook_count++ }
-            inJob && /argocd\.argoproj\.io\/hook-delete-policy:[[:space:]]+HookFailed[[:space:]]*$/ { hf_detected=1 }
-            END {
-                if(hook_count!=job_count) {
-                    print "At least one Job is not annotated with argocd.argoproj.io/hook"
-                    exit 1
-                }
-                if(hf_detected==1) {
-                    print "At least one Job with argocd.argoproj.io/hook-delete-policy: HookFailed was detected"
-                    exit 1
-                }
-            }' $file \
-        )
-
-        rc=$?
-        if [[ $rc != 0 ]]; then
-            problems=${problems}'    '${awkout}
-        fi
-
-
-    fi
-
-    if [[ $relax_for_file == 0 ]]; then
+    # Experimental: attempt to dynamically detect if we can relax job naming restrictions for this file
+    # The following awk commands exits 0 if and only if:
+    #   - File does not contain a Job resource 
+    #       Jobs are currently the only resource we use where immutability of the image field is a problem.
+    #       e.g. it's fine to modify the image field of a CronJob resource
+    #   - All Jobs have argocd.argoproj.io/hook
+    #   - No job has JUST argocd.argoproj.io/hook-delete-policy: HookFailed
+    #       HookFailed is the only delete policy where we might encounter immutability issues
+    #       This works because if multiple policies specified, then it must also have either HookSucceeded or BeforeHookCreation
+    #       or, if the annotation is omitted, the policy defaults to BeforeHookCreation
+    awkout=$(awk 'BEGIN { found=0; job_count=0; hook_count=0; hf_detected=0 }
+        /^[[:space:]]*kind:[[:space:]]+Job/ { inJob=1; job_count++ }
+        /^---/ { inJob=0 }
+        inJob && /argocd\.argoproj\.io\/hook:/ { hook_count++ }
+        inJob && /argocd\.argoproj\.io\/hook-delete-policy:[[:space:]]+HookFailed[[:space:]]*$/ { hf_detected=1 }
+        END {
+            if(hook_count!=job_count) {
+                print "At least one Job is not annotated with argocd.argoproj.io/hook"
+                exit 1
+            }
+            if(hf_detected==1) {
+                print "At least one Job with argocd.argoproj.io/hook-delete-policy: HookFailed was detected"
+                exit 1
+            }
+        }' $file \
+    )
+    enforce_job_naming_conventions=$?
+    
+    if [[ $enforce_job_naming_conventions == 1 ]]; then
 
         # Check $_job_name_prefix constant is defined (and is a string)
         grep -Eq '^[[:space:]]*\{\{-?[[:space:]]+\$_job_name_prefix[[:space:]]*:=[[:space:]]*"[^"]+"[[:space:]]*\}\}' $file

From acd0b8c7a38197e16dc680b8f419e8033813a79a Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Mon, 10 Feb 2025 17:02:00 +0000
Subject: [PATCH 018/115] ... more jobs

---
 .../templates/05-postsync-add-label_Job.yaml  | 44 ++++++++++++++++++-
 .../templates/postdelete-delete-cr.yaml       |  7 ++-
 .../templates/05-postsync-add-label_Job.yaml  |  8 +++-
 3 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
index aec39fe62..31e797f10 100644
--- a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
@@ -4,6 +4,46 @@
 # Rather than change the suite app (and force it to resync in all existing envs), we'll instead fix the check here to look for either boolean true OR the string "true".
 {{- if (eq (toString .Values.ingress) "true") }}
 
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "mas-route-patch" }}
+
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v2" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
+
 {{ $job_label :=  "mas-route-patch" }}
 ---
 # Permit outbound communication by the Job pods
@@ -96,7 +136,7 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: mas-route-patch-v2-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: mas-{{ .Values.instance_id }}-core
   annotations:
     argocd.argoproj.io/sync-wave: "142"
@@ -115,7 +155,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
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 6cb19c92d..aaf3b5b1f 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
@@ -1,5 +1,10 @@
 {{- if .Values.use_postdelete_hooks }}
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
@@ -42,7 +47,7 @@ spec:
         - name: run
           # TODO: use a dedicated image with a smaller footprint for this sort of thing?
           # Just using cli for now since it has all the deps we need to talk with AWS SM
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
index aa69bcbab..f0147cdaa 100644
--- a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
@@ -4,6 +4,12 @@
 # Rather than change the workspace app (and force it to resync in all existing envs), we'll instead fix the check here to look for either boolean true OR the string "true".
 {{- if (eq (toString .Values.ingress) "true") }}
 {{ $job_label :=  "mas-ws-route-patch" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 ---
 # Permit outbound communication by the Job pods
 # (Needed to communicate with the K8S HTTP API and AWS SM)
@@ -126,7 +132,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From f77d6dd74a8d2303bfad1341340732e9e73a97ea Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Mon, 10 Feb 2025 17:10:02 +0000
Subject: [PATCH 019/115] improve job name: {{ $_jo _name }} validation using
 awk

---
 build/bin/verify-job-definitions.sh | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/build/bin/verify-job-definitions.sh b/build/bin/verify-job-definitions.sh
index 688dc1bce..56bc8e035 100755
--- a/build/bin/verify-job-definitions.sh
+++ b/build/bin/verify-job-definitions.sh
@@ -111,7 +111,6 @@ for file in ${files}; do
         grep -Eq '^[[:space:]]*\{\{-?[[:space:]]+\$_job_name_prefix[[:space:]]*:=[[:space:]]*"[^"]+"[[:space:]]*\}\}' $file
         rc=$?
         if [[ $rc == 0 ]]; then
-            # TODO: it's sometimes necessary for job prefix names to be generated
             # check $_job_name_prefix is <=52 chars in length
             while IFS= read -r job_name_prefix; do
                 job_name_prefix_len=$(echo -n "${job_name_prefix}" | wc -m)
@@ -170,14 +169,21 @@ for file in ${files}; do
             problems=${problems}'    Missing {{- $_job_name := "..." }}\n'
         fi
 
-        # Check the job actually uses $_job_name
-        # This isn't a perfect check - it just verifies that there is at least one instance of name: {{ $_job_name }}
-        # in the file, not that it is assigned to a (the) Job resource.
-        # Definitely possible to fool the validator here, but I think this will catch most cases.
-        grep -Eq '^[[:space:]]+name:[[:space:]]+\{\{[[:space:]]*\$_job_name[[:space:]]*\}\}' $file
+        # Check all jobs actually use $_job_name
+        awkout=$(awk 'BEGIN { job_count=0; valid_name_count=0; }
+            /^[[:space:]]*kind:[[:space:]]+Job/ { inJob=1; job_count++ }
+            /^---/ { inJob=0 }
+            inJob && /name:[[:space:]]+\{\{[[:space:]]*\$_job_name[[:space:]]*\}\}/ { valid_name_count++ }
+            END {
+                if(valid_name_count!=job_count) {
+                    print "At least one Job does not have name: {{ $_job_name }}"
+                    exit 1
+                }
+            }' $file \
+        )
         rc=$?
         if [[ $rc != 0 ]]; then
-            problems=${problems}'    Missing "name: {{ $_job_name }}"\n'
+            problems=${problems}'    '${awkout}'\n'
         fi
     fi
 

From d2ddf5ebb41fa460cd7d3fee1463f8327dbc168a Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Mon, 10 Feb 2025 17:14:45 +0000
Subject: [PATCH 020/115] more jobs

---
 .../templates/00-presync-create-db2-user_Job.yaml          | 6 +++++-
 .../templates/postdelete-delete-cr.yaml                    | 7 ++++++-
 .../templates/postdelete-delete-db2-user_Job.yaml          | 6 +++++-
 .../templates/postdelete-delete-cr.yaml                    | 6 +++++-
 .../templates/postdelete-delete-cr.yaml                    | 7 ++++++-
 .../templates/postdelete-delete-cr.yaml                    | 7 ++++++-
 .../templates/postdelete-delete-cr.yaml                    | 7 ++++++-
 .../templates/postdelete-delete-cr.yaml                    | 7 ++++++-
 .../templates/postdelete-delete-cr.yaml                    | 7 ++++++-
 9 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
index f8d14d856..c66adf790 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
@@ -1,5 +1,9 @@
 {{- if eq .Values.jdbc_type "incluster-db2" }}
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{ $ns := printf "mas-%s-core" .Values.instance_id }}
 {{ $prefix := printf "pre-jdbc-usr-%s" .Values.mas_config_name }}
@@ -166,7 +170,7 @@ spec:
         - name: run
           # TODO: use a dedicated image with a smaller footprint for this sort of thing?
           # Just using cli for now since it has all the deps we need to talk with AWS SM
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
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 52d98c386..a8745d875 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
@@ -1,5 +1,10 @@
 {{- if .Values.use_postdelete_hooks }}
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
@@ -40,7 +45,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
index d181e692b..d0603f8f6 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
@@ -1,5 +1,9 @@
 {{- if and ( eq .Values.jdbc_type "incluster-db2" ) ( .Values.use_postdelete_hooks ) }}
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{ $ns := printf "mas-%s-syncres" .Values.instance_id }}
 {{ $prefix := printf "post-jdbc-usr-%s" .Values.mas_config_name }}
@@ -31,7 +35,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
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 6cb19c92d..63a56b2ef 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
@@ -15,6 +15,10 @@
 {{ $job_label := "postdelete-delete-cr-job" }}
 {{ $ns := printf "mas-%s-core" .Values.instance_id }}
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
 
 ---
 apiVersion: batch/v1
@@ -42,7 +46,7 @@ spec:
         - name: run
           # TODO: use a dedicated image with a smaller footprint for this sort of thing?
           # Just using cli for now since it has all the deps we need to talk with AWS SM
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
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 6cb19c92d..aaf3b5b1f 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
@@ -1,5 +1,10 @@
 {{- if .Values.use_postdelete_hooks }}
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
@@ -42,7 +47,7 @@ spec:
         - name: run
           # TODO: use a dedicated image with a smaller footprint for this sort of thing?
           # Just using cli for now since it has all the deps we need to talk with AWS SM
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
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 6cb19c92d..aaf3b5b1f 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
@@ -1,5 +1,10 @@
 {{- if .Values.use_postdelete_hooks }}
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
@@ -42,7 +47,7 @@ spec:
         - name: run
           # TODO: use a dedicated image with a smaller footprint for this sort of thing?
           # Just using cli for now since it has all the deps we need to talk with AWS SM
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
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 31de3ec6a..1049f6288 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
@@ -1,5 +1,10 @@
 {{- if .Values.use_postdelete_hooks }}
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
@@ -42,7 +47,7 @@ spec:
         - name: run
           # TODO: use a dedicated image with a smaller footprint for this sort of thing?
           # Just using cli for now since it has all the deps we need to talk with AWS SM
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
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 6cb19c92d..aaf3b5b1f 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
@@ -1,5 +1,10 @@
 {{- if .Values.use_postdelete_hooks }}
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
@@ -42,7 +47,7 @@ spec:
         - name: run
           # TODO: use a dedicated image with a smaller footprint for this sort of thing?
           # Just using cli for now since it has all the deps we need to talk with AWS SM
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
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 6cb19c92d..aaf3b5b1f 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
@@ -1,5 +1,10 @@
 {{- if .Values.use_postdelete_hooks }}
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
 {{ $cr_api_version := .Values.mas_config_api_version }}
@@ -42,7 +47,7 @@ spec:
         - name: run
           # TODO: use a dedicated image with a smaller footprint for this sort of thing?
           # Just using cli for now since it has all the deps we need to talk with AWS SM
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From 595bfdf0c11c7b8214652edcd6a263d12520ee3d Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Mon, 10 Feb 2025 17:48:11 +0000
Subject: [PATCH 021/115] more jobs

---
 .../templates/08-ibm-cp4d-post-verify.yaml    | 43 +++++++++++++++++-
 .../templates/09-ibm-cp4d_services_base.yaml  | 44 ++++++++++++++++++-
 .../templates/00-presync-await-crd_Job.yaml   |  7 ++-
 .../templates/04-db2u-Backup_Cron.yaml        |  8 +++-
 .../templates/07-postsync-setup-db2_Job.yaml  | 44 ++++++++++++++++++-
 .../templates/02-ibm-spss-post-verify.yaml    | 43 +++++++++++++++++-
 .../templates/02-ibm-wsl-post-verify.yaml     | 43 +++++++++++++++++-
 7 files changed, 220 insertions(+), 12 deletions(-)

diff --git a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
index bf20c007b..3f9058b64 100644
--- a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
@@ -1,8 +1,47 @@
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "cpd-post-verify-job" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v1" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
+
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: cpd-post-verify-job-v1-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: "{{ .Values.cpd_operators_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "089"
@@ -20,7 +59,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
index 2ac6c7f7f..a60ad3869 100644
--- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
@@ -1,8 +1,48 @@
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "cpd-base-sa-patch-job" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v1" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
+
+
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: cpd-base-sa-patch-job-v1-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: "{{ .Values.cpd_operators_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "089"
@@ -20,7 +60,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
index f9d54ec7e..dab94b3ff 100644
--- a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
@@ -1,3 +1,8 @@
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 ---
 # Service account that is authorized to read k8s secrets (needed by the job)
 kind: ServiceAccount
@@ -80,7 +85,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
index 5b07bcdc5..7f0c2c989 100644
--- a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
@@ -1,4 +1,10 @@
 {{- if and .Values.db2_backup_bucket_name (not (contains "sdb" .Values.db2_instance_name)) }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 #apiVersion: batch/v1beta1
 kind: CronJob
 apiVersion: batch/v1
@@ -21,7 +27,7 @@ spec:
         spec:
           containers:
             - name: "db2-backup-job-v1-{{ .Values.db2_instance_name }}"
-              image: quay.io/ibmmas/cli:latest
+              image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
               command:
                 - oc
                 - rsh
diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index 20ca29bf1..ec4e35b22 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -1,4 +1,44 @@
 {{- if not (contains "sdb" .Values.db2_instance_name) }}
+
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "postsync-setup-db2" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v6" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
+
 ---
 kind: Secret
 apiVersion: v1
@@ -108,7 +148,7 @@ kind: Job
 metadata:
   # Suffix the Job name with a hash of all chart values
   # This is to ensure that ArgoCD will delete and recreate the job if (and only if) anything changes in the DB2 config
-  name: postsync-setup-db2-{{ .Values.db2_instance_name }}-v6-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: "{{ .Values.db2_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "129"
@@ -126,7 +166,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
index 87547292e..06915d480 100644
--- a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
+++ b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
@@ -1,3 +1,42 @@
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "cpd-spss-post-verify-job" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v1" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
+
 ---
 kind: ServiceAccount
 apiVersion: v1
@@ -91,7 +130,7 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: cpd-spss-post-verify-job-v1-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: "{{ .Values.cpd_operators_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "096"
@@ -109,7 +148,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
index 61ac30337..66d4f8e62 100644
--- a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
+++ b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
@@ -1,3 +1,42 @@
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "cpd-wsl-post-verify" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v2" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
+
 ---
 kind: ServiceAccount
 apiVersion: v1
@@ -74,7 +113,7 @@ type: Opaque
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: cpd-wsl-post-verify-v2-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: "{{ .Values.cpd_operators_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "094"
@@ -92,7 +131,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From 58d7b92eaf31de58419053bc2c8b14235e74317c Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Mon, 10 Feb 2025 17:56:07 +0000
Subject: [PATCH 022/115] more jobs

---
 .../templates/01-ibm-mas_suite_certs_Job.yaml | 43 ++++++++++++++++-
 .../templates/01-ibm-mas_suite_dns_Job.yaml   | 43 ++++++++++++++++-
 .../PostDelete-aws-docdb-remove-user_Job.yaml |  9 +++-
 .../templates/07-postsync-update-sm_Job.yaml  | 48 ++++++++++++++++---
 .../templates/04-ibm-cp4d_prereqs_ops.yaml    | 43 ++++++++++++++++-
 .../templates/04-ibm-cp4d_upg_cleanup.yaml    | 43 ++++++++++++++++-
 .../templates/03-ibm-cp4d-mcs_patch_sa.yaml   | 44 ++++++++++++++++-
 .../07-ibm-cp4d_patch_zenservice.yaml         | 43 ++++++++++++++++-
 8 files changed, 296 insertions(+), 20 deletions(-)

diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
index 635f17ece..5914a161b 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
@@ -1,10 +1,49 @@
 {{- if and (eq .Values.dns_provider "cis") (.Values.mas_manual_cert_mgmt) }}
 {{- if not (empty .Values.manual_certs) }}
+
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "ibm-suite-certs" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v1" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: ibm-suite-certs-v1-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: mas-{{ .Values.instance_id }}-syncres
   annotations:
     argocd.argoproj.io/sync-wave: "003"
@@ -23,7 +62,7 @@ spec:
     spec:
       containers:
         - name: suite-certs-role-run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
 
           env:
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
index 1cd947f87..ff6ba648b 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
@@ -1,9 +1,48 @@
 {{- if and (eq .Values.dns_provider "cis") (not .Values.mas_manual_cert_mgmt) }}
+
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "ibm-suite-dns" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v1" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: ibm-suite-dns-v1-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: mas-{{ .Values.instance_id }}-syncres
   annotations:
     argocd.argoproj.io/sync-wave: "003"
@@ -22,7 +61,7 @@ spec:
     spec:
       containers:
         - name: suite-dns-role-run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
 
           env:
diff --git a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
index 93003337f..98c4c0d0e 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
@@ -1,6 +1,13 @@
 {{- if not (empty .Values.docdb) }}
 ---
 
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+
 # Deletes user "masinst_${MAS_INSTANCE_ID}" from docdb an deletes the acc/cluster/instance/mongo#password secret from AWS SM
 
 apiVersion: batch/v1
@@ -25,7 +32,7 @@ spec:
     spec:
       containers:
         - name: aws-docdb-process-user
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           env:
 
diff --git a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
index d3501b9c6..c421e933c 100644
--- a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
+++ b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
@@ -1,5 +1,44 @@
 {{- if .Values.run_sync_hooks }}
 
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "postsync-ibm-sls-update-sm-job" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v2" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
+
 {{ $ns := printf "mas-%s-sls" .Values.instance_id}}
 {{ $aws_secret := "aws"}}
 {{ $np_name :=    "postsync-ibm-sls-update-sm-np" }}
@@ -111,12 +150,7 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  # Generate the job name by suffixing the label with a hash of all chart values
-  # This is to ensure that ArgoCD will delete and recreate the job if (and only if) anything changes
-  # Any change to instance config will trigger a rerun of the job. 
-  # We can refine this in future to only take into account a subset of instance config (perhaps just values under ibm_sls?).
-  # But the job is idempotent and quick so no real harm in running it when we don't actually need to.
-  name: {{ $job_label }}-v2-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: {{ $ns }}
   annotations:
     argocd.argoproj.io/sync-wave: "112"
@@ -136,7 +170,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
index d0c6f73ef..78eee7332 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
@@ -1,3 +1,42 @@
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "patch-common-service-job" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v1" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
+
 ---
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
@@ -69,7 +108,7 @@ spec:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: patch-common-service-job-v1-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: "{{ .Values.cpd_operators_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "088"
@@ -87,7 +126,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
index 8b39f9d8a..332e3a9b9 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
@@ -1,3 +1,42 @@
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "cpd-upg-cleanup" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v1" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
+
 ---
 # this job cleans up existing operators that might cause the cp4d upgrade to fail in the case of an upgrade.
 # If the operators exist but are the expected versions, nothing will be done by this job. 
@@ -8,7 +47,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: cpd-upg-cleanup-v1-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: "{{ .Values.cpd_operators_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "086"
@@ -26,7 +65,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
index 89433bfc9..755960ffb 100644
--- a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
@@ -4,11 +4,51 @@
 
 {{- if .Values.cpd_product_version }}
 {{- if le (semver .Values.cpd_product_version | (semver "5.0.0").Compare) 0 }}
+
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "cpd-mcs-sa-patch-job" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v1" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
+
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: cpd-mcs-sa-patch-job-v1-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: "{{ .Values.cpd_operators_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "084"
@@ -26,7 +66,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
index d3ee521b7..b8b569ae9 100644
--- a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
@@ -1,8 +1,47 @@
+
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "cpd-patch-zenservices" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v4" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: cpd-patch-zenservices-v4-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: "{{ .Values.cpd_operators_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "088"
@@ -20,7 +59,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From 3e759f3a183d111a3b9a3187e08afc977ff0aaba Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Mon, 10 Feb 2025 18:06:40 +0000
Subject: [PATCH 023/115] more jobs

---
 .../templates/08-CronJob.yaml                 |  9 +++-
 .../templates/02-cluster-verify_Job.yaml      | 43 ++++++++++++++++-
 .../templates/03-cluster-promoter_Job.yaml    | 42 ++++++++++++++++-
 .../templates/00-aws-docdb-add-user_Job.yaml  | 43 ++++++++++++++++-
 .../templates/01-ibm-cp4d-presync.yaml        | 47 ++++++++++++++++---
 5 files changed, 170 insertions(+), 14 deletions(-)

diff --git a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
index f81715299..59ef71ec5 100644
--- a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
+++ b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
@@ -1,3 +1,10 @@
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+
 ---
 apiVersion: batch/v1
 kind: CronJob
@@ -42,7 +49,7 @@ spec:
           # Additionally, it writes the DB2 certificate to a persistent volume.
           initContainers:
             - name: update-agent-cr
-              image: quay.io/ibmmas/cli:latest
+              image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
               imagePullPolicy: IfNotPresent              
               volumeMounts:
                 - name: instana-db2-jks
diff --git a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
index c534ff42c..ef5862f44 100644
--- a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
@@ -1,3 +1,42 @@
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "cluster-verify" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v2" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
+
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -35,7 +74,7 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: cluster-verify-{{ .Values.cluster_id }}-v2-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: mas-syncres
   annotations:
     argocd.argoproj.io/sync-wave: "202"
@@ -54,7 +93,7 @@ spec:
     spec:
       containers:
         - name: cluster-verify
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           env:
             - name: ACCOUNT_ID
diff --git a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
index 680174466..e1e6ddd17 100644
--- a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
@@ -1,8 +1,46 @@
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "cluster-promoter" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v1" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: cluster-promoter-{{ .Values.cluster_id }}-v1-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: mas-syncres
   annotations:
     argocd.argoproj.io/sync-wave: "205"
@@ -21,7 +59,7 @@ spec:
     spec:
       containers:
         - name: cluster-promoter
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           env:
             - name: ACCOUNT_ID
diff --git a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
index 95b61c56c..571a2dd20 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
@@ -1,4 +1,43 @@
 {{- if not (empty .Values.docdb) }}
+
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "aws-docdb-add-user" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v2" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
 ---
 
 # Username of generated user will always be "masinst_${MAS_INSTANCE_ID}"
@@ -10,7 +49,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: aws-docdb-add-user-v2-{{ .Values.docdb | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: mas-{{ .Values.instance_id }}-syncres
   annotations:
     argocd.argoproj.io/sync-wave: "00"
@@ -29,7 +68,7 @@ spec:
     spec:
       containers:
         - name: aws-docdb-process-user
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           env:
 
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
index 9156a5566..c1782e956 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
@@ -1,5 +1,43 @@
 {{- if not (empty .Values.cpd_product_version) }}
 
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "presync-cpd-olm-job" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v2" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
 ---
 kind: ServiceAccount
 apiVersion: v1
@@ -65,12 +103,7 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  # Generate the job name by suffixing with a hash of all chart values
-  # This is to ensure that ArgoCD will delete and recreate the job if (and only if) anything changes
-  # Any change to cluster config will trigger a rerun of the job.
-  # The job is idempotent and quick so no real harm in running it when we don't actually need to.
-  # The v1 in the name allows use to change this if there is a modification needed that is not in the yaml
-  name: presync-cpd-olm-job-v2-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: mas-{{ .Values.instance_id }}-syncres
   annotations:
     argocd.argoproj.io/sync-wave: "003"
@@ -88,7 +121,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From eeb8103343b9831ab11d6df8ac222c23ecb2967b Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Mon, 10 Feb 2025 18:16:21 +0000
Subject: [PATCH 024/115] all jobs done

---
 .../templates/04-postsync-update-sm_Job.yaml  | 41 +++++++++++++++-
 .../templates/08-postsync-update-sm_Job.yaml  | 48 +++++++++++++++---
 .../postdelete-MarketplaceConfigs.yaml        |  8 ++-
 .../templates/postdelete-ProfileBundles.yaml  |  7 ++-
 .../templates/04-postsync-update-sm_Job.yaml  | 49 ++++++++++++++++---
 5 files changed, 134 insertions(+), 19 deletions(-)

diff --git a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
index 6e2dc0dc1..94126b068 100644
--- a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
@@ -8,6 +8,43 @@ TODO:
 
 {{- if .Values.run_sync_hooks }}
 
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "postsync-rhcm-update-sm-job" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v2" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
 {{ $ns := "cert-manager-operator"}}
 {{ $aws_secret := "aws"}}
 {{ $role_name  :=  "postsync-rhcm-update-sm-r" }}
@@ -101,7 +138,7 @@ metadata:
   # Any change to cluster config will trigger a rerun of the job.
   # The job is idempotent and quick so no real harm in running it when we don't actually need to.
   # The v1 in the name allows use to change this if there is a modification needed that is not in the yaml
-  name: postsync-rhcm-update-sm-job-v2-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: {{ $ns }}
   annotations:
     argocd.argoproj.io/sync-wave: "015"
@@ -119,7 +156,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: Always
           resources:
             limits:
diff --git a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
index 3865b7a6f..f187813d8 100644
--- a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
+++ b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
@@ -1,5 +1,43 @@
 {{- if .Values.run_sync_hooks }}
 
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "postsync-ibm-dro-update-sm-job" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v2" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
 {{ $ns := .Values.dro_namespace}}
 {{ $aws_secret := "aws"}}
 {{ $role_name :=  "postsync-ibm-dro-update-sm-r" }}
@@ -83,13 +121,7 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  # Generate the job name by suffixing with a hash of all chart values
-  # This is to ensure that ArgoCD will delete and recreate the job if (and only if) anything changes
-  # Any change to cluster config will trigger a rerun of the job. 
-  # We can refine this in future to only take into account a subset of instance config (perhaps just values under ibm_dro?).
-  # But the job is idempotent and quick so no real harm in running it when we don't actually need to.
-  # The v1 in the name allows use to change this if there is a modification needed that is not in the yaml
-  name: postsync-ibm-dro-update-sm-job-v2-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: {{ $ns }}
   annotations:
     argocd.argoproj.io/sync-wave: "028"
@@ -107,7 +139,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
index 04f6b7b5c..366936803 100644
--- a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
+++ b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
@@ -1,4 +1,10 @@
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+
 {{ $job_name := "postdelete-delete-marketplaceconfigs-job" }}
 
 # NOTE: depends on resources created in ibm-dro chart (postdelete-MarketplaceConfigs-resources)
@@ -32,7 +38,7 @@ spec:
         - name: run
           # TODO: use a dedicated image with a smaller footprint for this sort of thing?
           # Just using cli for now since it has all the deps we need to talk with AWS SM
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
index 4a616c4b1..eb58c34f8 100644
--- a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
+++ b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
@@ -1,4 +1,9 @@
 
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
 {{ $job_name := "postdelete-delete-profilebundles-job" }}
 
 # NOTE: depends on resources created in the cis-compliance chart (psotdelete-ProfileBundles-resources)
@@ -36,7 +41,7 @@ spec:
         - name: run
           # TODO: use a dedicated image with a smaller footprint for this sort of thing?
           # Just using cli for now since it has all the deps we need to talk with AWS SM
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
index 3bd30b797..73da8b7bf 100644
--- a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
@@ -1,14 +1,49 @@
 {{- range $key, $value := $.Values.custom_sa_details }}
+
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "postsync-custom-sa-update-sm-job" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := printf "%s $s" $key $value }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v1" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
+
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
-  # Generate the job name by suffixing with a hash of all chart values
-  # This is to ensure that ArgoCD will delete and recreate the job if (and only if) anything changes
-  # Any change to cluster config will trigger a rerun of the job.
-  # The job is idempotent and quick so no real harm in running it when we don't actually need to.
-  # The v1 in the name allows use to change this if there is a modification needed that is not in the yaml
-  name: postsync-custom-sa-update-sm-job-v1-{{ $key }}-{{ omit $.Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: {{ $.Values.custom_sa_namespace }}
   annotations:
     argocd.argoproj.io/sync-wave: "064"
@@ -26,7 +61,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From 140b61468deef2bc62ca466302b8e47f5e2599b8 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 11 Feb 2025 11:26:19 +0000
Subject: [PATCH 025/115] fix

---
 .../junitreporter/templates/00-presync-report-starter.yaml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
index 095ab8139..981ab9311 100644
--- a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
@@ -127,7 +127,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli: {{ $_cli_image_tag }}
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: Always
           resources:
             limits:

From 728bac974bd885328a96a692cf73da92b2973e37 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 11 Feb 2025 12:43:20 +0000
Subject: [PATCH 026/115] Add verify-job-definitions.sh to lint action

---
 .github/workflows/lint.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index f075ed9d1..8ed40ed00 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -32,6 +32,10 @@ jobs:
           for DIR in $(find $GITHUB_WORKSPACE/root-applications -type d -maxdepth 1 -mindepth 1 ); do
             $GITHUB_WORKSPACE/build/bin/helm-lint.sh -p $DIR || exit 1
           done
+
+      - name: Verify Job Definitions
+        run: |
+          $GITHUB_WORKSPACE/build/bin/verify-job-definitions.sh --root-dir $GITHUB_WORKSPACE || exit 1
   
   # Uncomment when namespaces are removed
   # kind-check:

From bb1a1139820be13be1d22a0071c7573a27b5332a Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 11 Feb 2025 12:44:29 +0000
Subject: [PATCH 027/115] deliberate make job invalid to check if action fails

---
 .../templates/05-postsync-add-label_Job.yaml                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
index f0147cdaa..4ad2d8487 100644
--- a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
@@ -132,7 +132,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
+          image: quay.io/ibmmas/cli:latest
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From 1abe89018e9c6986ba5fd5b8a6d59f25c3ad64f1 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 11 Feb 2025 12:46:08 +0000
Subject: [PATCH 028/115] deliberate invalidate another job

---
 .../templates/07-postsync-setup-db2_Job.yaml  | 41 +------------------
 1 file changed, 2 insertions(+), 39 deletions(-)

diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index ec4e35b22..0faf07c1b 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -1,42 +1,5 @@
 {{- if not (contains "sdb" .Values.db2_instance_name) }}
 
-{{- /*
-Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
-*/}}
-{{- $_job_name_prefix := "postsync-setup-db2" }}
-
-{{- /*
-Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
-Included in $_job_hash (see below).
-*/}}
-{{- $_cli_image_tag := "13.2.0" }}
-
-{{- /*
-A dict of values that influence the behaviour of the job in some way.
-Any changes to values in this dict will trigger a rerun of the job.
-Since jobs must be idemopotent, it's generally safe to pass in values here that are not
-strictly necessary (i.e. including some values that don't actually influence job behaviour).
-We may want to refine this further though for jobs that can take a long time to complete.
-Included in $_job_hash (see below).
-*/}}
-{{- $_job_config_values := omit .Values "junitreporter" }}
-
-{{- /*
-Increment this value whenever you make a change to an immutable field of the Job resource.
-E.g. passing in a new environment variable.
-Included in $_job_hash (see below).
-*/}}
-{{- $_job_version := "v6" }}
-
-{{- /*
-10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
-This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
-immutable field of any existing Job resource.
-*/}}
-{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
-
-{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
-
 
 
 ---
@@ -148,7 +111,7 @@ kind: Job
 metadata:
   # Suffix the Job name with a hash of all chart values
   # This is to ensure that ArgoCD will delete and recreate the job if (and only if) anything changes in the DB2 config
-  name: {{ $_job_name }}
+  name: "asdadsad"
   namespace: "{{ .Values.db2_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "129"
@@ -166,7 +129,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
+          image: quay.io/ibmmas/cli:latest
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From 233c11c051615a79ebaa6fc5aa3c66c7504d592d Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 11 Feb 2025 12:47:22 +0000
Subject: [PATCH 029/115] Revert "deliberate make job invalid to check if
 action fails"

This reverts commit bb1a1139820be13be1d22a0071c7573a27b5332a.
---
 .../templates/05-postsync-add-label_Job.yaml                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
index 4ad2d8487..f0147cdaa 100644
--- a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
@@ -132,7 +132,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From a4c07245e068e8101bcac809de5668c8db0a4f46 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 11 Feb 2025 12:47:26 +0000
Subject: [PATCH 030/115] Revert "deliberate invalidate another job"

This reverts commit 1abe89018e9c6986ba5fd5b8a6d59f25c3ad64f1.
---
 .../templates/07-postsync-setup-db2_Job.yaml  | 41 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index 0faf07c1b..ec4e35b22 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -1,5 +1,42 @@
 {{- if not (contains "sdb" .Values.db2_instance_name) }}
 
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "postsync-setup-db2" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v6" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
 
 
 ---
@@ -111,7 +148,7 @@ kind: Job
 metadata:
   # Suffix the Job name with a hash of all chart values
   # This is to ensure that ArgoCD will delete and recreate the job if (and only if) anything changes in the DB2 config
-  name: "asdadsad"
+  name: {{ $_job_name }}
   namespace: "{{ .Values.db2_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "129"
@@ -129,7 +166,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From 17aebf7c431d2a84fbdeb7ec2a2a7d1171a5adf0 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 11 Feb 2025 14:02:04 +0000
Subject: [PATCH 031/115] testing cli_image_tag update

---
 .../templates/04-postsync-update-sm_Job.yaml                    | 2 +-
 .../020-ibm-dro/templates/08-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/postdelete-MarketplaceConfigs.yaml                | 2 +-
 .../templates/postdelete-ProfileBundles.yaml                    | 2 +-
 .../055-instana-agent-operator/templates/08-CronJob.yaml        | 2 +-
 .../060-custom-sa/templates/04-postsync-update-sm_Job.yaml      | 2 +-
 .../200-cluster-promotion/templates/02-cluster-verify_Job.yaml  | 2 +-
 .../templates/03-cluster-promoter_Job.yaml                      | 2 +-
 .../010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml  | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml        | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml   | 2 +-
 .../templates/PostDelete-aws-docdb-remove-user_Job.yaml         | 2 +-
 .../100-ibm-sls/templates/07-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/04-ibm-cp4d_prereqs_ops.yaml                      | 2 +-
 .../templates/04-ibm-cp4d_upg_cleanup.yaml                      | 2 +-
 .../110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml        | 2 +-
 .../110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml    | 2 +-
 .../110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml         | 2 +-
 .../110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml       | 2 +-
 .../templates/00-presync-await-crd_Job.yaml                     | 2 +-
 .../120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml    | 2 +-
 .../templates/07-postsync-setup-db2_Job.yaml                    | 2 +-
 .../120-ibm-spss/templates/02-ibm-spss-post-verify.yaml         | 2 +-
 .../120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml           | 2 +-
 .../templates/00-presync-create-db2-user_Job.yaml               | 2 +-
 .../130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml     | 2 +-
 .../templates/postdelete-delete-db2-user_Job.yaml               | 2 +-
 .../130-ibm-kafka-config/templates/postdelete-delete-cr.yaml    | 2 +-
 .../130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml | 2 +-
 .../130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml  | 2 +-
 .../templates/06-postsync-configtool-oidc.yaml                  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../templates/05-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/00-presync-add-mvi-scc_Job.yaml                   | 2 +-
 .../templates/06-postsync-add-mvi-scc_Job.yaml                  | 2 +-
 .../templates/02-ibm-manage-update_Job.yaml                     | 2 +-
 .../templates/04-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/04-postsync-manage-sanity.yaml                    | 2 +-
 .../templates/04-postsync-manage-verify.yaml                    | 2 +-
 .../templates/04-postsync-maximoit-sanity.yaml                  | 2 +-
 .../templates/04-postsync-maximoit-verify.yaml                  | 2 +-
 .../templates/04-postsync-mvi-sanity.yaml                       | 2 +-
 .../templates/04-postsync-mvi-verify.yaml                       | 2 +-
 .../templates/700-702-postsync-db2-manage.yaml                  | 2 +-
 .../junitreporter/templates/00-presync-report-starter.yaml      | 2 +-
 .../junitreporter/templates/10-postsync-report-starter.yaml     | 2 +-
 51 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
index 94126b068..2024dc1fd 100644
--- a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
@@ -17,7 +17,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
index f187813d8..d25501948 100644
--- a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
+++ b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
index 366936803..127f95f6b 100644
--- a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
+++ b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 {{ $job_name := "postdelete-delete-marketplaceconfigs-job" }}
diff --git a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
index eb58c34f8..230d8b543 100644
--- a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
+++ b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $job_name := "postdelete-delete-profilebundles-job" }}
 
diff --git a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
index 59ef71ec5..702440ee3 100644
--- a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
+++ b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 ---
diff --git a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
index 73da8b7bf..13c0cf343 100644
--- a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
index ef5862f44..2e5bc6d34 100644
--- a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
index e1e6ddd17..455df9e89 100644
--- a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
index 571a2dd20..01d66c474 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
index c1782e956..3c04f4066 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
index 5914a161b..fa44650f2 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
index ff6ba648b..8a1664f93 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
index 98c4c0d0e..acd685e27 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 # Deletes user "masinst_${MAS_INSTANCE_ID}" from docdb an deletes the acc/cluster/instance/mongo#password secret from AWS SM
diff --git a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
index c421e933c..105f49f3c 100644
--- a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
+++ b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
index 78eee7332..def7eb883 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
index 332e3a9b9..031108e71 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
index 755960ffb..d2a0b6184 100644
--- a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
index b8b569ae9..d62e6e619 100644
--- a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
@@ -8,7 +8,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
index 3f9058b64..8f4f8a55b 100644
--- a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
index a60ad3869..42c7376ec 100644
--- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
index dab94b3ff..e8133747c 100644
--- a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
@@ -1,7 +1,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 ---
 # Service account that is authorized to read k8s secrets (needed by the job)
diff --git a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
index 7f0c2c989..383195e08 100644
--- a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 #apiVersion: batch/v1beta1
 kind: CronJob
diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index ec4e35b22..cc1ed9731 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
index 06915d480..5b2b196b8 100644
--- a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
+++ b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
index 66d4f8e62..9671ccc6a 100644
--- a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
+++ b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
index c66adf790..5f999baed 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $ns := printf "mas-%s-core" .Values.instance_id }}
 {{ $prefix := printf "pre-jdbc-usr-%s" .Values.mas_config_name }}
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 a8745d875..a52e9e736 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
index d0603f8f6..fc6bb882b 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $ns := printf "mas-%s-syncres" .Values.instance_id }}
 {{ $prefix := printf "post-jdbc-usr-%s" .Values.mas_config_name }}
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 63a56b2ef..254232198 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
@@ -18,7 +18,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 ---
 apiVersion: batch/v1
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 aaf3b5b1f..f875e5860 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 aaf3b5b1f..f875e5860 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 1049f6288..38e8dce7f 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 aaf3b5b1f..f875e5860 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 aaf3b5b1f..f875e5860 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
index 31e797f10..579f708f4 100644
--- a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 50e80ec08..425e26fe6 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
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 aaf3b5b1f..f875e5860 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
index f0147cdaa..ebd3df18c 100644
--- a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
@@ -8,7 +8,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 ---
 # Permit outbound communication by the Job pods
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
index b64f542d7..5589363f7 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
index 09ea0835b..660ba8898 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
index 0b394fbb2..cef294539 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $prefix := printf "%s-manage-update" .Values.mas_workspace_id}}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
index bed0c6cef..9453b5a13 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
@@ -6,7 +6,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $job_label :=  "mas-app-route-patch" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
index 3ceba31f7..dddd1918c 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
index 1546cce60..a23876fa5 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 # A verify test is one that is non disruptive i.e. it won't create new users, i won't call authenticated apis, and it won't creates resources 
 # in the application. This type of test is run on every environment and allows a layer of verification of the app
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
index 67db53c02..94fef2b11 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
index ba25b74e7..ca3d713ec 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
index 8d8ade0cc..bd8444dc4 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $ns               :=  .Values.mas_app_namespace }}
 {{ $np_name          :=  "postsync-sanity-mvi-np" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
index d8c2c7401..ca775795e 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 {{ $ns               :=  .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index 6a39fdd41..19f9097fb 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -86,7 +86,7 @@ will take care of differentiating the jobs.
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
index 981ab9311..175f585cd 100644
--- a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 {{ $prefix := printf "pre-jreporter-%s" .Values.reporter_name }}
diff --git a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
index 643ff0bc5..4103b2cfc 100644
--- a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $preprefix := printf "pre-jreporter-%s" .Values.reporter_name }}
 {{ $time_cm := printf "%s-synctime" $preprefix }}

From 8fbaa5ac41a0830e1ee2e157940562a682dffd4d Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 11 Feb 2025 17:03:25 +0000
Subject: [PATCH 032/115] Add pre-commit hook

---
 .github/workflows/lint.yaml         |   2 +-
 .pre-commit-config.yaml             |  10 +++
 CONTRIBUTING.md                     |  20 ++++++
 build/bin/verify-job-definitions.sh | 101 ++++++++++++++++++----------
 4 files changed, 95 insertions(+), 38 deletions(-)
 create mode 100644 .pre-commit-config.yaml
 create mode 100644 CONTRIBUTING.md

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 8ed40ed00..ac33eb695 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -35,7 +35,7 @@ jobs:
 
       - name: Verify Job Definitions
         run: |
-          $GITHUB_WORKSPACE/build/bin/verify-job-definitions.sh --root-dir $GITHUB_WORKSPACE || exit 1
+          $GITHUB_WORKSPACE/build/bin/verify-job-definitions.sh $GITHUB_WORKSPACE || exit 1
   
   # Uncomment when namespaces are removed
   # kind-check:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 000000000..40627fa95
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,10 @@
+repos:
+  - repo: local
+    hooks:
+      - id: verify-jobs
+        name: verify-jobs
+        entry: "./build/bin/verify-job-definitions.sh"
+        language: script
+        types: [file]
+        files: \.(yml|yaml)$
+        pass_filenames: true
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..d3e6d258a
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,20 @@
+Contributing to MAS Gitops
+===============================================================================
+
+Pre-Commit Hooks
+-------------------------------------------------------------------------------d
+
+```bash
+python -m pip install pre-commit --upgrade
+pre-commit install
+```
+
+Manually run the pre-commit hooks against changed files
+```bash
+pre-commit run
+```
+
+Manually run the pre-commit hooks against all files
+```bash
+pre-commit run -a
+```
diff --git a/build/bin/verify-job-definitions.sh b/build/bin/verify-job-definitions.sh
index 56bc8e035..fdffd1517 100755
--- a/build/bin/verify-job-definitions.sh
+++ b/build/bin/verify-job-definitions.sh
@@ -1,58 +1,75 @@
 #!/bin/bash
 
-
-# WORK IN PROGRESS
-
-
-
-
 function print_help() {
   cat << EOM
-Usage: verify-job-definitions.sh [OPTION]
+Usage: verify-job-definitions.sh [OPTION] [PATH]....
 TODO description
-
-    -d, --root-dir   Directory to (recursively) search for .yml and .yaml files
-    -t, --tag        The new value for \$_cli_image_tag
-    -h, --help       Print this help message and exit
+    -h      Print this help message and exit
 
 Example:
-    verify-job-definitions.sh --root-dir /home/tom/workspace/gitops
+    verify-job-definitions.sh /home/tom/workspace/gitops
+    verify-job-definitions.sh /home/tom/workspace/gitops/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
 EOM
 }
 
-# Process command line arguments
-while [[ $# -gt 0 ]]
+while getopts h flag
 do
-    key="$1"
-    shift
-    case $key in
-        -d|--root-dir)
-        ROOT_DIR=$1
-        shift
+    case "${flag}" in
+        h) 
+            print_help
+            exit 0
         ;;
-        -h|--help)
-        print_help
-        ;;
-        *)
-        # unknown option
-        echo -e "\nUsage Error: Unsupported flag \"${key}\"\n\n"
-        print_help
-        exit 1
+        ?)
+            print_help
+            exit 1
         ;;
+
     esac
 done
+shift $((OPTIND - 1))
+
+
+# if single PATH, check if it's a dir
+#   if so, scan it for yaml files containing references to quay.io/ibmmas/cli
+#   otherwise, we'll treat it as a file
+if [[ $# == 1 ]]; then
+    path=$1
+    if [[ -d $path ]]; then
+        files=$(grep -Erl --include '*.yaml' 'quay.io/ibmmas/cli' ${path})
+        echo "Checking all YAML files with quay.io/ibmmas/cli references under directory ${path}"
+        echo "---------"
+        shift
+    fi
+fi
 
-: ${ROOT_DIR?"Need to set -d|--root-dir) argument"}
-
-
-
+# if >1 path, all must be files
+file_count=$#
+while [[ $# -gt 0 ]]
+do
+    path=$1
+    if [[ -d $path ]]; then
+        echo "Only a single [PATH] can be specified when referencing a directory"
+        print_help
+        exit 1
+    elif [[ -f $path ]]; then
+        files="${files} ${path}"
+    else
+        echo "Specified [PATH] $path is not valid"
+        print_help
+        exit 1
+    fi
+    shift
+done
 
-# Checks are performed against any file where a reference to the cli image is detected
-files=$(grep -Erl --include '*.yaml' 'quay.io/ibmmas/cli' ${ROOT_DIR})
+if [[ $file_count -gt 0 ]]; then
+    echo "Checking $file_count files"
+    echo "---------"
+fi
 
 scanned_count=0
 valid_count=0
 invalid_count=0
+skipped_count=0
 
 for file in ${files}; do
 
@@ -60,6 +77,15 @@ for file in ${files}; do
     problems=""
     (( scanned_count++ ))
 
+    # Skip the file if it does not contain a reference to quay.io/ibmmas/cli
+    grep -Eq 'quay.io/ibmmas/cli' ${file}
+    rc=$?
+    if [[ $rc != 0 ]]; then
+        (( skipped_count++ ))
+        continue
+    fi
+
+
     # Check $_cli_image_tag constant is defined (and is a string)
     grep -Eq '^[[:space:]]*\{\{-?[[:space:]]+\$_cli_image_tag[[:space:]]*:=[[:space:]]*"[^"]+"[[:space:]]*\}\}' $file
     rc=$?
@@ -199,9 +225,10 @@ done
 
 echo
 echo "Complete"
-echo "  ${scanned_count} files scanned"
-echo "  ${valid_count} are valid"
-echo "  ${invalid_count} are invalid"
+echo "  ${scanned_count} file(s) scanned"
+echo "     ${valid_count} valid"
+echo "     ${invalid_count} invalid"
+echo "     ${skipped_count} skipped"
 
 if [[ $invalid_count > 0 ]]; then
     echo ""

From 9922087b3f636a30e2c2a1c2e95417e775ad93d4 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 11 Feb 2025 18:25:34 +0000
Subject: [PATCH 033/115] docs

---
 build/bin/verify-job-definitions.sh | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/build/bin/verify-job-definitions.sh b/build/bin/verify-job-definitions.sh
index fdffd1517..d488ff176 100755
--- a/build/bin/verify-job-definitions.sh
+++ b/build/bin/verify-job-definitions.sh
@@ -3,12 +3,36 @@
 function print_help() {
   cat << EOM
 Usage: verify-job-definitions.sh [OPTION] [PATH]....
-TODO description
+
+Check that YAML files containing a reference to the quay.io/ibmmas/cli image conform to the following constraints:
+    - The \$_cli_image_tag constant is defined
+    - The \$_cli_image_tag constant is used for all quay.io/ibmmas/cli image tags
+
+Additional constraints are imposed for YAML files containing Job definitions that lack the argocd.argoproj.io/hook annotation, 
+or have the annotation but apply only the HookFailed argocd.argoproj.io/hook-delete-policy.
+
+These additional constraints are intended to protect against making changes to the Job
+(e.g. updating \$_cli_image_tag, or changing some other immutable Job field) without also updating the
+Job name accordingly:
+    - The \$_job_name_prefix constant is defined, and is at most 5 chars in length
+    - The \$_job_config_values constant is defined
+    - The \$_job_version constant is defined
+    - The \$_job_hash constant is defined and has the correct value
+    - The \$_job_name constant is defined and has the correct value
+    - The \$_job_name constant is used as the name of the Job
+
+[PATH]... can be either:
+    - A single directory: the script will check all files under this directory (recursive)
+    - Any number of paths to individual YAML files
+
+[OPTION]:
     -h      Print this help message and exit
 
 Example:
     verify-job-definitions.sh /home/tom/workspace/gitops
-    verify-job-definitions.sh /home/tom/workspace/gitops/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
+    verify-job-definitions.sh \\
+        /home/tom/workspace/gitops/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml \\
+        /home/tom/workspace/gitops/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
 EOM
 }
 

From 494d83be2b3bd372a786721349c24cd0c50e9a4e Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 11 Feb 2025 18:40:25 +0000
Subject: [PATCH 034/115] docs

---
 CONTRIBUTING.md                     | 6 +++++-
 build/bin/verify-job-definitions.sh | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d3e6d258a..5da5d84e5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,9 @@ Contributing to MAS Gitops
 ===============================================================================
 
 Pre-Commit Hooks
--------------------------------------------------------------------------------d
+-------------------------------------------------------------------------------
+
+A custom pre-commit hook to automatically verify that various requirements are met in template files can be enabled by running the following commands:
 
 ```bash
 python -m pip install pre-commit --upgrade
@@ -18,3 +20,5 @@ Manually run the pre-commit hooks against all files
 ```bash
 pre-commit run -a
 ```
+
+The same logic invoked by the commit hook logic is run and enforced by the "lint" Github Action.
\ No newline at end of file
diff --git a/build/bin/verify-job-definitions.sh b/build/bin/verify-job-definitions.sh
index d488ff176..3dab8f691 100755
--- a/build/bin/verify-job-definitions.sh
+++ b/build/bin/verify-job-definitions.sh
@@ -256,7 +256,6 @@ echo "     ${skipped_count} skipped"
 
 if [[ $invalid_count > 0 ]]; then
     echo ""
-    echo "Invalid files were found, please see logs above for details"
-    echo "Further documentation available at TODO"
+    echo "Invalid files were found, please consult logs above for details"
     exit 1
 fi

From dc99a7c780c8bc32a59c4f244a29647b9ee174a2 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 11 Feb 2025 18:55:21 +0000
Subject: [PATCH 035/115] break jobs on purpose

---
 .../templates/07-postsync-setup-db2_Job.yaml                  | 2 +-
 .../templates/700-702-postsync-db2-manage.yaml                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index cc1ed9731..bc527c1e5 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tagx := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index 19f9097fb..e54d70327 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -110,7 +110,7 @@ Included in $_job_hash (see below).
 This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
 immutable field of any existing Job resource.
 */}}
-{{- $_job_hash := print  ( $_job_config_values  |  toYaml ) $_cli_image_tag  $_job_version  |  adler32sum  }}
+{{- $_job_hashx := print  ( $_job_config_values  |  toYaml ) $_cli_image_tag  $_job_version  |  adler32sum  }}
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash) }}
 
@@ -209,7 +209,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
+          image: quay.io/ibmmas/cli:latest
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From eeef018285d3e36ec47b975ada239d7cdf2fbc56 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 11 Feb 2025 18:57:41 +0000
Subject: [PATCH 036/115] break jobs on purpose

---
 .../templates/07-postsync-setup-db2_Job.yaml                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index bc527c1e5..6377bed62 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tagx := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
@@ -166,7 +166,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
+          image: quay.io/ibmmas/cli:latest
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From eeece3b953e9671bae15a865c1bc7e583a47e5c1 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 11 Feb 2025 18:58:25 +0000
Subject: [PATCH 037/115] beak jobs on purpose

---
 .../templates/700-702-postsync-db2-manage.yaml                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index e54d70327..9837bc708 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -112,7 +112,7 @@ immutable field of any existing Job resource.
 */}}
 {{- $_job_hashx := print  ( $_job_config_values  |  toYaml ) $_cli_image_tag  $_job_version  |  adler32sum  }}
 
-{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash) }}
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hashx) }}
 
 
 

From 61f877340993a0dcbcccfcab4627b55974bfcea8 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 11 Feb 2025 19:02:01 +0000
Subject: [PATCH 038/115] fix jobs

---
 .../templates/07-postsync-setup-db2_Job.yaml                | 2 +-
 .../templates/700-702-postsync-db2-manage.yaml              | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index 6377bed62..cc1ed9731 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -166,7 +166,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index 9837bc708..19f9097fb 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -110,9 +110,9 @@ Included in $_job_hash (see below).
 This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
 immutable field of any existing Job resource.
 */}}
-{{- $_job_hashx := print  ( $_job_config_values  |  toYaml ) $_cli_image_tag  $_job_version  |  adler32sum  }}
+{{- $_job_hash := print  ( $_job_config_values  |  toYaml ) $_cli_image_tag  $_job_version  |  adler32sum  }}
 
-{{- $_job_name := join "-" (list $_job_name_prefix $_job_hashx) }}
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash) }}
 
 
 
@@ -209,7 +209,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From a02028e26ca1f50a50931a0f017bbcbfc6495ab1 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Wed, 12 Feb 2025 10:59:59 +0000
Subject: [PATCH 039/115] set-cli-image-tag 13.4.0

---
 .../templates/04-postsync-update-sm_Job.yaml                    | 2 +-
 .../020-ibm-dro/templates/08-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/postdelete-MarketplaceConfigs.yaml                | 2 +-
 .../templates/postdelete-ProfileBundles.yaml                    | 2 +-
 .../055-instana-agent-operator/templates/08-CronJob.yaml        | 2 +-
 .../060-custom-sa/templates/04-postsync-update-sm_Job.yaml      | 2 +-
 .../200-cluster-promotion/templates/02-cluster-verify_Job.yaml  | 2 +-
 .../templates/03-cluster-promoter_Job.yaml                      | 2 +-
 .../010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml  | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml        | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml   | 2 +-
 .../templates/PostDelete-aws-docdb-remove-user_Job.yaml         | 2 +-
 .../100-ibm-sls/templates/07-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/04-ibm-cp4d_prereqs_ops.yaml                      | 2 +-
 .../templates/04-ibm-cp4d_upg_cleanup.yaml                      | 2 +-
 .../110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml        | 2 +-
 .../110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml    | 2 +-
 .../110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml         | 2 +-
 .../110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml       | 2 +-
 .../templates/00-presync-await-crd_Job.yaml                     | 2 +-
 .../120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml    | 2 +-
 .../templates/07-postsync-setup-db2_Job.yaml                    | 2 +-
 .../120-ibm-spss/templates/02-ibm-spss-post-verify.yaml         | 2 +-
 .../120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml           | 2 +-
 .../templates/00-presync-create-db2-user_Job.yaml               | 2 +-
 .../130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml     | 2 +-
 .../templates/postdelete-delete-db2-user_Job.yaml               | 2 +-
 .../130-ibm-kafka-config/templates/postdelete-delete-cr.yaml    | 2 +-
 .../130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml | 2 +-
 .../130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml  | 2 +-
 .../templates/06-postsync-configtool-oidc.yaml                  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../templates/05-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/00-presync-add-mvi-scc_Job.yaml                   | 2 +-
 .../templates/06-postsync-add-mvi-scc_Job.yaml                  | 2 +-
 .../templates/02-ibm-manage-update_Job.yaml                     | 2 +-
 .../templates/04-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/04-postsync-manage-sanity.yaml                    | 2 +-
 .../templates/04-postsync-manage-verify.yaml                    | 2 +-
 .../templates/04-postsync-maximoit-sanity.yaml                  | 2 +-
 .../templates/04-postsync-maximoit-verify.yaml                  | 2 +-
 .../templates/04-postsync-mvi-sanity.yaml                       | 2 +-
 .../templates/04-postsync-mvi-verify.yaml                       | 2 +-
 .../templates/700-702-postsync-db2-manage.yaml                  | 2 +-
 .../junitreporter/templates/00-presync-report-starter.yaml      | 2 +-
 .../junitreporter/templates/10-postsync-report-starter.yaml     | 2 +-
 51 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
index 2024dc1fd..1386926db 100644
--- a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
@@ -17,7 +17,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
index d25501948..ddba737ab 100644
--- a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
+++ b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
index 127f95f6b..77b675d9c 100644
--- a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
+++ b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 
 {{ $job_name := "postdelete-delete-marketplaceconfigs-job" }}
diff --git a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
index 230d8b543..0052acd11 100644
--- a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
+++ b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{ $job_name := "postdelete-delete-profilebundles-job" }}
 
diff --git a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
index 702440ee3..bd36889d1 100644
--- a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
+++ b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 
 ---
diff --git a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
index 13c0cf343..b0c6a7ea6 100644
--- a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
index 2e5bc6d34..0fa2165ed 100644
--- a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
index 455df9e89..6cd2a78ff 100644
--- a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
index 01d66c474..5c59a2cd7 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
index 3c04f4066..a355e2ed8 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
index fa44650f2..22d931759 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
index 8a1664f93..72b38cebd 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
index acd685e27..b94f6533e 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 
 # Deletes user "masinst_${MAS_INSTANCE_ID}" from docdb an deletes the acc/cluster/instance/mongo#password secret from AWS SM
diff --git a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
index 105f49f3c..f9b6f1a6b 100644
--- a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
+++ b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
index def7eb883..2c7f656fc 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
index 031108e71..02ce92886 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
index d2a0b6184..528ac5e30 100644
--- a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
index d62e6e619..ed7f1e614 100644
--- a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
@@ -8,7 +8,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
index 8f4f8a55b..230034c84 100644
--- a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
index 42c7376ec..eafe823a3 100644
--- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
index e8133747c..bbda81bf2 100644
--- a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
@@ -1,7 +1,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 ---
 # Service account that is authorized to read k8s secrets (needed by the job)
diff --git a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
index 383195e08..97f9e8abe 100644
--- a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 #apiVersion: batch/v1beta1
 kind: CronJob
diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index cc1ed9731..4c3f6b82a 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
index 5b2b196b8..7d39ac154 100644
--- a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
+++ b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
index 9671ccc6a..7541510ef 100644
--- a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
+++ b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
index 5f999baed..0d303822e 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{ $ns := printf "mas-%s-core" .Values.instance_id }}
 {{ $prefix := printf "pre-jdbc-usr-%s" .Values.mas_config_name }}
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 a52e9e736..f12b503e5 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
index fc6bb882b..bc79e6cfa 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{ $ns := printf "mas-%s-syncres" .Values.instance_id }}
 {{ $prefix := printf "post-jdbc-usr-%s" .Values.mas_config_name }}
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 254232198..460676756 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
@@ -18,7 +18,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 ---
 apiVersion: batch/v1
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 f875e5860..8de83ca18 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 f875e5860..8de83ca18 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 38e8dce7f..ba7c80e39 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 f875e5860..8de83ca18 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 f875e5860..8de83ca18 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
index 579f708f4..bb6ec9885 100644
--- a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 425e26fe6..03821794b 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
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 f875e5860..8de83ca18 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
index ebd3df18c..81933929a 100644
--- a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
@@ -8,7 +8,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 ---
 # Permit outbound communication by the Job pods
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
index 5589363f7..bcadac681 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
index 660ba8898..70b7bd9bf 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
index cef294539..3fa9de049 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $prefix := printf "%s-manage-update" .Values.mas_workspace_id}}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
index 9453b5a13..1d8780188 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
@@ -6,7 +6,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $job_label :=  "mas-app-route-patch" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
index dddd1918c..539a005de 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
index a23876fa5..1bbdf87b1 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 # A verify test is one that is non disruptive i.e. it won't create new users, i won't call authenticated apis, and it won't creates resources 
 # in the application. This type of test is run on every environment and allows a layer of verification of the app
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
index 94fef2b11..36e85bc59 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
index ca3d713ec..227e3f8aa 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
index bd8444dc4..213b1b1d6 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{ $ns               :=  .Values.mas_app_namespace }}
 {{ $np_name          :=  "postsync-sanity-mvi-np" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
index ca775795e..6e0b28956 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 
 {{ $ns               :=  .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index 19f9097fb..6dfee63f4 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -86,7 +86,7 @@ will take care of differentiating the jobs.
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
index 175f585cd..5bc1e68d2 100644
--- a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 
 {{ $prefix := printf "pre-jreporter-%s" .Values.reporter_name }}
diff --git a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
index 4103b2cfc..4cf767a36 100644
--- a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 {{ $preprefix := printf "pre-jreporter-%s" .Values.reporter_name }}
 {{ $time_cm := printf "%s-synctime" $preprefix }}

From 550451765080544478fffed16ce0116cd153c3d1 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Wed, 12 Feb 2025 11:09:14 +0000
Subject: [PATCH 040/115] cli-image-tag 13.4.1

---
 .../templates/04-postsync-update-sm_Job.yaml                    | 2 +-
 .../020-ibm-dro/templates/08-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/postdelete-MarketplaceConfigs.yaml                | 2 +-
 .../templates/postdelete-ProfileBundles.yaml                    | 2 +-
 .../055-instana-agent-operator/templates/08-CronJob.yaml        | 2 +-
 .../060-custom-sa/templates/04-postsync-update-sm_Job.yaml      | 2 +-
 .../200-cluster-promotion/templates/02-cluster-verify_Job.yaml  | 2 +-
 .../templates/03-cluster-promoter_Job.yaml                      | 2 +-
 .../010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml  | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml        | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml   | 2 +-
 .../templates/PostDelete-aws-docdb-remove-user_Job.yaml         | 2 +-
 .../100-ibm-sls/templates/07-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/04-ibm-cp4d_prereqs_ops.yaml                      | 2 +-
 .../templates/04-ibm-cp4d_upg_cleanup.yaml                      | 2 +-
 .../110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml        | 2 +-
 .../110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml    | 2 +-
 .../110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml         | 2 +-
 .../110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml       | 2 +-
 .../templates/00-presync-await-crd_Job.yaml                     | 2 +-
 .../120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml    | 2 +-
 .../templates/07-postsync-setup-db2_Job.yaml                    | 2 +-
 .../120-ibm-spss/templates/02-ibm-spss-post-verify.yaml         | 2 +-
 .../120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml           | 2 +-
 .../templates/00-presync-create-db2-user_Job.yaml               | 2 +-
 .../130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml     | 2 +-
 .../templates/postdelete-delete-db2-user_Job.yaml               | 2 +-
 .../130-ibm-kafka-config/templates/postdelete-delete-cr.yaml    | 2 +-
 .../130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml | 2 +-
 .../130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml  | 2 +-
 .../templates/06-postsync-configtool-oidc.yaml                  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../templates/05-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/00-presync-add-mvi-scc_Job.yaml                   | 2 +-
 .../templates/06-postsync-add-mvi-scc_Job.yaml                  | 2 +-
 .../templates/02-ibm-manage-update_Job.yaml                     | 2 +-
 .../templates/04-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/04-postsync-manage-sanity.yaml                    | 2 +-
 .../templates/04-postsync-manage-verify.yaml                    | 2 +-
 .../templates/04-postsync-maximoit-sanity.yaml                  | 2 +-
 .../templates/04-postsync-maximoit-verify.yaml                  | 2 +-
 .../templates/04-postsync-mvi-sanity.yaml                       | 2 +-
 .../templates/04-postsync-mvi-verify.yaml                       | 2 +-
 .../templates/700-702-postsync-db2-manage.yaml                  | 2 +-
 .../junitreporter/templates/00-presync-report-starter.yaml      | 2 +-
 .../junitreporter/templates/10-postsync-report-starter.yaml     | 2 +-
 51 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
index 1386926db..2024dc1fd 100644
--- a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
@@ -17,7 +17,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
index ddba737ab..d25501948 100644
--- a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
+++ b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
index 77b675d9c..127f95f6b 100644
--- a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
+++ b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 {{ $job_name := "postdelete-delete-marketplaceconfigs-job" }}
diff --git a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
index 0052acd11..230d8b543 100644
--- a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
+++ b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $job_name := "postdelete-delete-profilebundles-job" }}
 
diff --git a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
index bd36889d1..702440ee3 100644
--- a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
+++ b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 ---
diff --git a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
index b0c6a7ea6..13c0cf343 100644
--- a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
index 0fa2165ed..2e5bc6d34 100644
--- a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
index 6cd2a78ff..455df9e89 100644
--- a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
index 5c59a2cd7..01d66c474 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
index a355e2ed8..3c04f4066 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
index 22d931759..fa44650f2 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
index 72b38cebd..8a1664f93 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
index b94f6533e..acd685e27 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 # Deletes user "masinst_${MAS_INSTANCE_ID}" from docdb an deletes the acc/cluster/instance/mongo#password secret from AWS SM
diff --git a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
index f9b6f1a6b..105f49f3c 100644
--- a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
+++ b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
index 2c7f656fc..def7eb883 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
index 02ce92886..031108e71 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
index 528ac5e30..d2a0b6184 100644
--- a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
index ed7f1e614..d62e6e619 100644
--- a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
@@ -8,7 +8,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
index 230034c84..8f4f8a55b 100644
--- a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
index eafe823a3..42c7376ec 100644
--- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
index bbda81bf2..e8133747c 100644
--- a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
@@ -1,7 +1,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 ---
 # Service account that is authorized to read k8s secrets (needed by the job)
diff --git a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
index 97f9e8abe..383195e08 100644
--- a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 #apiVersion: batch/v1beta1
 kind: CronJob
diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index 4c3f6b82a..cc1ed9731 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
index 7d39ac154..5b2b196b8 100644
--- a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
+++ b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
index 7541510ef..9671ccc6a 100644
--- a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
+++ b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
index 0d303822e..5f999baed 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $ns := printf "mas-%s-core" .Values.instance_id }}
 {{ $prefix := printf "pre-jdbc-usr-%s" .Values.mas_config_name }}
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 f12b503e5..a52e9e736 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
index bc79e6cfa..fc6bb882b 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $ns := printf "mas-%s-syncres" .Values.instance_id }}
 {{ $prefix := printf "post-jdbc-usr-%s" .Values.mas_config_name }}
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 460676756..254232198 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
@@ -18,7 +18,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 ---
 apiVersion: batch/v1
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 8de83ca18..f875e5860 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 8de83ca18..f875e5860 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 ba7c80e39..38e8dce7f 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 8de83ca18..f875e5860 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 8de83ca18..f875e5860 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
index bb6ec9885..579f708f4 100644
--- a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 03821794b..425e26fe6 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
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 8de83ca18..f875e5860 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
index 81933929a..ebd3df18c 100644
--- a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
@@ -8,7 +8,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 ---
 # Permit outbound communication by the Job pods
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
index bcadac681..5589363f7 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
index 70b7bd9bf..660ba8898 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
index 3fa9de049..cef294539 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $prefix := printf "%s-manage-update" .Values.mas_workspace_id}}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
index 1d8780188..9453b5a13 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
@@ -6,7 +6,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $job_label :=  "mas-app-route-patch" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
index 539a005de..dddd1918c 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
index 1bbdf87b1..a23876fa5 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 # A verify test is one that is non disruptive i.e. it won't create new users, i won't call authenticated apis, and it won't creates resources 
 # in the application. This type of test is run on every environment and allows a layer of verification of the app
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
index 36e85bc59..94fef2b11 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
index 227e3f8aa..ca3d713ec 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
index 213b1b1d6..bd8444dc4 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $ns               :=  .Values.mas_app_namespace }}
 {{ $np_name          :=  "postsync-sanity-mvi-np" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
index 6e0b28956..ca775795e 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 {{ $ns               :=  .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index 6dfee63f4..19f9097fb 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -86,7 +86,7 @@ will take care of differentiating the jobs.
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
index 5bc1e68d2..175f585cd 100644
--- a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 {{ $prefix := printf "pre-jreporter-%s" .Values.reporter_name }}
diff --git a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
index 4cf767a36..4103b2cfc 100644
--- a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $preprefix := printf "pre-jreporter-%s" .Values.reporter_name }}
 {{ $time_cm := printf "%s-synctime" $preprefix }}

From c41736bb97b58ceed80e4b4ca03d20cc3f04f6b2 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Wed, 12 Feb 2025 11:12:39 +0000
Subject: [PATCH 041/115] cli-image-tag 13.3.0

---
 .../templates/04-postsync-update-sm_Job.yaml                    | 2 +-
 .../020-ibm-dro/templates/08-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/postdelete-MarketplaceConfigs.yaml                | 2 +-
 .../templates/postdelete-ProfileBundles.yaml                    | 2 +-
 .../055-instana-agent-operator/templates/08-CronJob.yaml        | 2 +-
 .../060-custom-sa/templates/04-postsync-update-sm_Job.yaml      | 2 +-
 .../200-cluster-promotion/templates/02-cluster-verify_Job.yaml  | 2 +-
 .../templates/03-cluster-promoter_Job.yaml                      | 2 +-
 .../010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml  | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml        | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml   | 2 +-
 .../templates/PostDelete-aws-docdb-remove-user_Job.yaml         | 2 +-
 .../100-ibm-sls/templates/07-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/04-ibm-cp4d_prereqs_ops.yaml                      | 2 +-
 .../templates/04-ibm-cp4d_upg_cleanup.yaml                      | 2 +-
 .../110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml        | 2 +-
 .../110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml    | 2 +-
 .../110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml         | 2 +-
 .../110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml       | 2 +-
 .../templates/00-presync-await-crd_Job.yaml                     | 2 +-
 .../120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml    | 2 +-
 .../templates/07-postsync-setup-db2_Job.yaml                    | 2 +-
 .../120-ibm-spss/templates/02-ibm-spss-post-verify.yaml         | 2 +-
 .../120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml           | 2 +-
 .../templates/00-presync-create-db2-user_Job.yaml               | 2 +-
 .../130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml     | 2 +-
 .../templates/postdelete-delete-db2-user_Job.yaml               | 2 +-
 .../130-ibm-kafka-config/templates/postdelete-delete-cr.yaml    | 2 +-
 .../130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml | 2 +-
 .../130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml  | 2 +-
 .../templates/06-postsync-configtool-oidc.yaml                  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../templates/05-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/00-presync-add-mvi-scc_Job.yaml                   | 2 +-
 .../templates/06-postsync-add-mvi-scc_Job.yaml                  | 2 +-
 .../templates/02-ibm-manage-update_Job.yaml                     | 2 +-
 .../templates/04-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/04-postsync-manage-sanity.yaml                    | 2 +-
 .../templates/04-postsync-manage-verify.yaml                    | 2 +-
 .../templates/04-postsync-maximoit-sanity.yaml                  | 2 +-
 .../templates/04-postsync-maximoit-verify.yaml                  | 2 +-
 .../templates/04-postsync-mvi-sanity.yaml                       | 2 +-
 .../templates/04-postsync-mvi-verify.yaml                       | 2 +-
 .../templates/700-702-postsync-db2-manage.yaml                  | 2 +-
 .../junitreporter/templates/00-presync-report-starter.yaml      | 2 +-
 .../junitreporter/templates/10-postsync-report-starter.yaml     | 2 +-
 51 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
index 2024dc1fd..e76343645 100644
--- a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
@@ -17,7 +17,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
index d25501948..987dfa6c1 100644
--- a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
+++ b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
index 127f95f6b..e90a17e8d 100644
--- a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
+++ b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 
 {{ $job_name := "postdelete-delete-marketplaceconfigs-job" }}
diff --git a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
index 230d8b543..8badaa268 100644
--- a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
+++ b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{ $job_name := "postdelete-delete-profilebundles-job" }}
 
diff --git a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
index 702440ee3..07b3fb14c 100644
--- a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
+++ b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 
 ---
diff --git a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
index 13c0cf343..e67f9c027 100644
--- a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
index 2e5bc6d34..3c6fb92d0 100644
--- a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
index 455df9e89..2a037ec19 100644
--- a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
index 01d66c474..36c3af06a 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
index 3c04f4066..a2f270db8 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
index fa44650f2..ac48a591c 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
index 8a1664f93..f76412ae8 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
index acd685e27..c5793fcde 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 
 # Deletes user "masinst_${MAS_INSTANCE_ID}" from docdb an deletes the acc/cluster/instance/mongo#password secret from AWS SM
diff --git a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
index 105f49f3c..ff195f0e3 100644
--- a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
+++ b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
index def7eb883..4ea3a50c4 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
index 031108e71..df518a34a 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
index d2a0b6184..2170c44d8 100644
--- a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
index d62e6e619..b9f5c82b1 100644
--- a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
@@ -8,7 +8,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
index 8f4f8a55b..206b10df2 100644
--- a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
index 42c7376ec..b06bafdeb 100644
--- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
index e8133747c..a729d783a 100644
--- a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
@@ -1,7 +1,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 ---
 # Service account that is authorized to read k8s secrets (needed by the job)
diff --git a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
index 383195e08..e334bbe1b 100644
--- a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 #apiVersion: batch/v1beta1
 kind: CronJob
diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index cc1ed9731..df3d93258 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
index 5b2b196b8..f419d06d6 100644
--- a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
+++ b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
index 9671ccc6a..516d22f00 100644
--- a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
+++ b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
index 5f999baed..4a487ecc8 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{ $ns := printf "mas-%s-core" .Values.instance_id }}
 {{ $prefix := printf "pre-jdbc-usr-%s" .Values.mas_config_name }}
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 a52e9e736..33bbbc483 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
index fc6bb882b..ad4cac7da 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{ $ns := printf "mas-%s-syncres" .Values.instance_id }}
 {{ $prefix := printf "post-jdbc-usr-%s" .Values.mas_config_name }}
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 254232198..e91a484d1 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
@@ -18,7 +18,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 ---
 apiVersion: batch/v1
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 f875e5860..2c725397c 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 f875e5860..2c725397c 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 38e8dce7f..7ba886e21 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 f875e5860..2c725397c 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 f875e5860..2c725397c 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
index 579f708f4..2cbd2d902 100644
--- a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 425e26fe6..f7b6c5c2f 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
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 f875e5860..2c725397c 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
index ebd3df18c..1de534858 100644
--- a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
@@ -8,7 +8,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 ---
 # Permit outbound communication by the Job pods
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
index 5589363f7..dfa168129 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
index 660ba8898..9b2f0b1c5 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
index cef294539..45b4cc573 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $prefix := printf "%s-manage-update" .Values.mas_workspace_id}}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
index 9453b5a13..bae3eb2a0 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
@@ -6,7 +6,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $job_label :=  "mas-app-route-patch" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
index dddd1918c..7cc6c509d 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
index a23876fa5..2744cdba3 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 # A verify test is one that is non disruptive i.e. it won't create new users, i won't call authenticated apis, and it won't creates resources 
 # in the application. This type of test is run on every environment and allows a layer of verification of the app
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
index 94fef2b11..e0374868a 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
index ca3d713ec..08e745b09 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
index bd8444dc4..4080f4cce 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{ $ns               :=  .Values.mas_app_namespace }}
 {{ $np_name          :=  "postsync-sanity-mvi-np" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
index ca775795e..d978dfb4d 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 
 {{ $ns               :=  .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index 19f9097fb..0f7b1e622 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -86,7 +86,7 @@ will take care of differentiating the jobs.
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
index 175f585cd..cce561b32 100644
--- a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 
 {{ $prefix := printf "pre-jreporter-%s" .Values.reporter_name }}
diff --git a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
index 4103b2cfc..12e12c518 100644
--- a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.3.0" }}
 
 {{ $preprefix := printf "pre-jreporter-%s" .Values.reporter_name }}
 {{ $time_cm := printf "%s-synctime" $preprefix }}

From 08d94a6368658bfaf5f9e40f070a808572173a98 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Wed, 12 Feb 2025 11:17:35 +0000
Subject: [PATCH 042/115] cli-image-tag 13.2.0

---
 .../templates/04-postsync-update-sm_Job.yaml                    | 2 +-
 .../020-ibm-dro/templates/08-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/postdelete-MarketplaceConfigs.yaml                | 2 +-
 .../templates/postdelete-ProfileBundles.yaml                    | 2 +-
 .../055-instana-agent-operator/templates/08-CronJob.yaml        | 2 +-
 .../060-custom-sa/templates/04-postsync-update-sm_Job.yaml      | 2 +-
 .../200-cluster-promotion/templates/02-cluster-verify_Job.yaml  | 2 +-
 .../templates/03-cluster-promoter_Job.yaml                      | 2 +-
 .../010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml  | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml        | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml   | 2 +-
 .../templates/PostDelete-aws-docdb-remove-user_Job.yaml         | 2 +-
 .../100-ibm-sls/templates/07-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/04-ibm-cp4d_prereqs_ops.yaml                      | 2 +-
 .../templates/04-ibm-cp4d_upg_cleanup.yaml                      | 2 +-
 .../110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml        | 2 +-
 .../110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml    | 2 +-
 .../110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml         | 2 +-
 .../110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml       | 2 +-
 .../templates/00-presync-await-crd_Job.yaml                     | 2 +-
 .../120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml    | 2 +-
 .../templates/07-postsync-setup-db2_Job.yaml                    | 2 +-
 .../120-ibm-spss/templates/02-ibm-spss-post-verify.yaml         | 2 +-
 .../120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml           | 2 +-
 .../templates/00-presync-create-db2-user_Job.yaml               | 2 +-
 .../130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml     | 2 +-
 .../templates/postdelete-delete-db2-user_Job.yaml               | 2 +-
 .../130-ibm-kafka-config/templates/postdelete-delete-cr.yaml    | 2 +-
 .../130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml | 2 +-
 .../130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml  | 2 +-
 .../templates/06-postsync-configtool-oidc.yaml                  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../templates/05-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/00-presync-add-mvi-scc_Job.yaml                   | 2 +-
 .../templates/06-postsync-add-mvi-scc_Job.yaml                  | 2 +-
 .../templates/02-ibm-manage-update_Job.yaml                     | 2 +-
 .../templates/04-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/04-postsync-manage-sanity.yaml                    | 2 +-
 .../templates/04-postsync-manage-verify.yaml                    | 2 +-
 .../templates/04-postsync-maximoit-sanity.yaml                  | 2 +-
 .../templates/04-postsync-maximoit-verify.yaml                  | 2 +-
 .../templates/04-postsync-mvi-sanity.yaml                       | 2 +-
 .../templates/04-postsync-mvi-verify.yaml                       | 2 +-
 .../templates/700-702-postsync-db2-manage.yaml                  | 2 +-
 .../junitreporter/templates/00-presync-report-starter.yaml      | 2 +-
 .../junitreporter/templates/10-postsync-report-starter.yaml     | 2 +-
 51 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
index e76343645..94126b068 100644
--- a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
@@ -17,7 +17,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
index 987dfa6c1..f187813d8 100644
--- a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
+++ b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
index e90a17e8d..366936803 100644
--- a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
+++ b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 
 {{ $job_name := "postdelete-delete-marketplaceconfigs-job" }}
diff --git a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
index 8badaa268..eb58c34f8 100644
--- a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
+++ b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{ $job_name := "postdelete-delete-profilebundles-job" }}
 
diff --git a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
index 07b3fb14c..59ef71ec5 100644
--- a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
+++ b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 
 ---
diff --git a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
index e67f9c027..73da8b7bf 100644
--- a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
index 3c6fb92d0..ef5862f44 100644
--- a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
index 2a037ec19..e1e6ddd17 100644
--- a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
index 36c3af06a..571a2dd20 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
index a2f270db8..c1782e956 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
index ac48a591c..5914a161b 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
index f76412ae8..ff6ba648b 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
index c5793fcde..98c4c0d0e 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 
 # Deletes user "masinst_${MAS_INSTANCE_ID}" from docdb an deletes the acc/cluster/instance/mongo#password secret from AWS SM
diff --git a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
index ff195f0e3..c421e933c 100644
--- a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
+++ b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
index 4ea3a50c4..78eee7332 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
index df518a34a..332e3a9b9 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
index 2170c44d8..755960ffb 100644
--- a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
index b9f5c82b1..b8b569ae9 100644
--- a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
@@ -8,7 +8,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
index 206b10df2..3f9058b64 100644
--- a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
index b06bafdeb..a60ad3869 100644
--- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
index a729d783a..dab94b3ff 100644
--- a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
@@ -1,7 +1,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 ---
 # Service account that is authorized to read k8s secrets (needed by the job)
diff --git a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
index e334bbe1b..7f0c2c989 100644
--- a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 #apiVersion: batch/v1beta1
 kind: CronJob
diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index df3d93258..ec4e35b22 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
index f419d06d6..06915d480 100644
--- a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
+++ b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
index 516d22f00..66d4f8e62 100644
--- a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
+++ b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
index 4a487ecc8..c66adf790 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{ $ns := printf "mas-%s-core" .Values.instance_id }}
 {{ $prefix := printf "pre-jdbc-usr-%s" .Values.mas_config_name }}
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 33bbbc483..a8745d875 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
index ad4cac7da..d0603f8f6 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{ $ns := printf "mas-%s-syncres" .Values.instance_id }}
 {{ $prefix := printf "post-jdbc-usr-%s" .Values.mas_config_name }}
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 e91a484d1..63a56b2ef 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
@@ -18,7 +18,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 ---
 apiVersion: batch/v1
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 2c725397c..aaf3b5b1f 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 2c725397c..aaf3b5b1f 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 7ba886e21..1049f6288 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 2c725397c..aaf3b5b1f 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 2c725397c..aaf3b5b1f 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
index 2cbd2d902..31e797f10 100644
--- a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index f7b6c5c2f..50e80ec08 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
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 2c725397c..aaf3b5b1f 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
index 1de534858..f0147cdaa 100644
--- a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
@@ -8,7 +8,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 ---
 # Permit outbound communication by the Job pods
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
index dfa168129..b64f542d7 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
index 9b2f0b1c5..09ea0835b 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
index 45b4cc573..0b394fbb2 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $prefix := printf "%s-manage-update" .Values.mas_workspace_id}}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
index bae3eb2a0..bed0c6cef 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
@@ -6,7 +6,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $job_label :=  "mas-app-route-patch" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
index 7cc6c509d..3ceba31f7 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
index 2744cdba3..1546cce60 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 # A verify test is one that is non disruptive i.e. it won't create new users, i won't call authenticated apis, and it won't creates resources 
 # in the application. This type of test is run on every environment and allows a layer of verification of the app
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
index e0374868a..67db53c02 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
index 08e745b09..ba25b74e7 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
index 4080f4cce..8d8ade0cc 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{ $ns               :=  .Values.mas_app_namespace }}
 {{ $np_name          :=  "postsync-sanity-mvi-np" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
index d978dfb4d..d8c2c7401 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 
 {{ $ns               :=  .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index 0f7b1e622..6a39fdd41 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -86,7 +86,7 @@ will take care of differentiating the jobs.
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
index cce561b32..981ab9311 100644
--- a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 
 {{ $prefix := printf "pre-jreporter-%s" .Values.reporter_name }}
diff --git a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
index 12e12c518..643ff0bc5 100644
--- a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.3.0" }}
+{{- $_cli_image_tag := "13.2.0" }}
 
 {{ $preprefix := printf "pre-jreporter-%s" .Values.reporter_name }}
 {{ $time_cm := printf "%s-synctime" $preprefix }}

From 7c9db74085660973b0b25f22d2284376bea57cb4 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Wed, 12 Feb 2025 12:03:12 +0000
Subject: [PATCH 043/115] testing argocd.argoproj.io/sync-options: Replace=true
 behaviour

---
 .../templates/test-job-with-replace.yaml      | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml

diff --git a/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml b/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
new file mode 100644
index 000000000..b7312bf16
--- /dev/null
+++ b/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
@@ -0,0 +1,42 @@
+---
+
+{{ $ns :=                 printf "mas-%s-core" .Values.instance_id }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.2.0" }}
+
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: "test-job-with-replace"
+  namespace: {{ $ns }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "145"
+    argocd.argoproj.io/sync-options: Replace=true
+spec:
+  template:
+    spec:
+      containers:
+        - name: run
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
+          imagePullPolicy: IfNotPresent
+          resources:
+            limits:
+              cpu: 200m
+              memory: 512Mi
+            requests:
+              cpu: 10m
+              memory: 64Mi
+
+          command:
+            - /bin/sh
+            - -c
+            - |
+              echo "done"
+              
+      restartPolicy: Never
+      serviceAccountName: "default"
+  backoffLimit: 4
+

From ebd1ebc443fcfd657982173ca00ad123f1f1506b Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Wed, 12 Feb 2025 12:06:23 +0000
Subject: [PATCH 044/115] testing update to immutable job field with
 replace=True

---
 .../130-ibm-mas-suite/templates/test-job-with-replace.yaml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml b/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
index b7312bf16..5f6989c08 100644
--- a/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 apiVersion: batch/v1
 kind: Job

From a7d3cfe325a721c5cb85e7b6d9f8353043bec42e Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Wed, 12 Feb 2025 12:18:06 +0000
Subject: [PATCH 045/115] add job label

---
 .../130-ibm-mas-suite/templates/test-job-with-replace.yaml     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml b/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
index 5f6989c08..ab8b2c17e 100644
--- a/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
@@ -17,6 +17,9 @@ metadata:
     argocd.argoproj.io/sync-options: Replace=true
 spec:
   template:
+    metadata:
+      labels:
+        app: "test-job-with-replace"
     spec:
       containers:
         - name: run

From 971367a9ef64a2c709e4b66bdddab4685f972d0b Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Wed, 12 Feb 2025 12:20:40 +0000
Subject: [PATCH 046/115] testing update to immutable job field with Replace =
 True

---
 .../130-ibm-mas-suite/templates/test-job-with-replace.yaml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml b/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
index ab8b2c17e..05347d885 100644
--- a/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 apiVersion: batch/v1
 kind: Job

From 603c7cabe6bce262b1fe1bd601a7c506e5946420 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Wed, 12 Feb 2025 13:00:38 +0000
Subject: [PATCH 047/115] experimenting with helm hook annotations instead

---
 .../130-ibm-mas-suite/templates/test-job-with-replace.yaml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml b/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
index 05347d885..a9519d3f7 100644
--- a/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
@@ -13,8 +13,8 @@ metadata:
   name: "test-job-with-replace"
   namespace: {{ $ns }}
   annotations:
-    argocd.argoproj.io/sync-wave: "145"
-    argocd.argoproj.io/sync-options: Replace=true
+    helm.sh/hook: post-install,post-upgrade
+    helm.sh/hook-weight: "1" # Ensure this runs after actual resources are deployed
 spec:
   template:
     metadata:

From 9624bf45cbda99a7b8185536355ca5876c686a2c Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Wed, 12 Feb 2025 13:13:24 +0000
Subject: [PATCH 048/115] test immutable field update with helm hook annots

---
 .../130-ibm-mas-suite/templates/test-job-with-replace.yaml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml b/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
index a9519d3f7..ab8b2c17e 100644
--- a/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 apiVersion: batch/v1
 kind: Job
@@ -13,8 +13,8 @@ metadata:
   name: "test-job-with-replace"
   namespace: {{ $ns }}
   annotations:
-    helm.sh/hook: post-install,post-upgrade
-    helm.sh/hook-weight: "1" # Ensure this runs after actual resources are deployed
+    argocd.argoproj.io/sync-wave: "145"
+    argocd.argoproj.io/sync-options: Replace=true
 spec:
   template:
     metadata:

From f818a11358899055b006512b56d1c5e8320a65e5 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Wed, 12 Feb 2025 13:14:37 +0000
Subject: [PATCH 049/115] Revert "test immutable field update with helm hook
 annots"

This reverts commit 9624bf45cbda99a7b8185536355ca5876c686a2c.
---
 .../130-ibm-mas-suite/templates/test-job-with-replace.yaml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml b/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
index ab8b2c17e..a9519d3f7 100644
--- a/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.4.0" }}
 
 apiVersion: batch/v1
 kind: Job
@@ -13,8 +13,8 @@ metadata:
   name: "test-job-with-replace"
   namespace: {{ $ns }}
   annotations:
-    argocd.argoproj.io/sync-wave: "145"
-    argocd.argoproj.io/sync-options: Replace=true
+    helm.sh/hook: post-install,post-upgrade
+    helm.sh/hook-weight: "1" # Ensure this runs after actual resources are deployed
 spec:
   template:
     metadata:

From 913a60293b79f74928479b3553bb80c1bbac160c Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Wed, 12 Feb 2025 13:15:24 +0000
Subject: [PATCH 050/115] test immutable job field update with helm hook annots

---
 .../130-ibm-mas-suite/templates/test-job-with-replace.yaml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml b/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
index a9519d3f7..29809dbe3 100644
--- a/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 apiVersion: batch/v1
 kind: Job

From b85a2a74517e3a4d475eec1d486a448254760e4f Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Wed, 12 Feb 2025 13:29:39 +0000
Subject: [PATCH 051/115] update to cli 13.4.1 ahead of tonight's fvtsaas run

---
 .../templates/04-postsync-update-sm_Job.yaml                    | 2 +-
 .../020-ibm-dro/templates/08-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/postdelete-MarketplaceConfigs.yaml                | 2 +-
 .../templates/postdelete-ProfileBundles.yaml                    | 2 +-
 .../055-instana-agent-operator/templates/08-CronJob.yaml        | 2 +-
 .../060-custom-sa/templates/04-postsync-update-sm_Job.yaml      | 2 +-
 .../200-cluster-promotion/templates/02-cluster-verify_Job.yaml  | 2 +-
 .../templates/03-cluster-promoter_Job.yaml                      | 2 +-
 .../010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml  | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml        | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml   | 2 +-
 .../templates/PostDelete-aws-docdb-remove-user_Job.yaml         | 2 +-
 .../100-ibm-sls/templates/07-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/04-ibm-cp4d_prereqs_ops.yaml                      | 2 +-
 .../templates/04-ibm-cp4d_upg_cleanup.yaml                      | 2 +-
 .../110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml        | 2 +-
 .../110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml    | 2 +-
 .../110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml         | 2 +-
 .../110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml       | 2 +-
 .../templates/00-presync-await-crd_Job.yaml                     | 2 +-
 .../120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml    | 2 +-
 .../templates/07-postsync-setup-db2_Job.yaml                    | 2 +-
 .../120-ibm-spss/templates/02-ibm-spss-post-verify.yaml         | 2 +-
 .../120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml           | 2 +-
 .../templates/00-presync-create-db2-user_Job.yaml               | 2 +-
 .../130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml     | 2 +-
 .../templates/postdelete-delete-db2-user_Job.yaml               | 2 +-
 .../130-ibm-kafka-config/templates/postdelete-delete-cr.yaml    | 2 +-
 .../130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml | 2 +-
 .../130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml  | 2 +-
 .../templates/06-postsync-configtool-oidc.yaml                  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../templates/05-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/00-presync-add-mvi-scc_Job.yaml                   | 2 +-
 .../templates/06-postsync-add-mvi-scc_Job.yaml                  | 2 +-
 .../templates/02-ibm-manage-update_Job.yaml                     | 2 +-
 .../templates/04-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/04-postsync-manage-sanity.yaml                    | 2 +-
 .../templates/04-postsync-manage-verify.yaml                    | 2 +-
 .../templates/04-postsync-maximoit-sanity.yaml                  | 2 +-
 .../templates/04-postsync-maximoit-verify.yaml                  | 2 +-
 .../templates/04-postsync-mvi-sanity.yaml                       | 2 +-
 .../templates/04-postsync-mvi-verify.yaml                       | 2 +-
 .../templates/700-702-postsync-db2-manage.yaml                  | 2 +-
 .../junitreporter/templates/00-presync-report-starter.yaml      | 2 +-
 .../junitreporter/templates/10-postsync-report-starter.yaml     | 2 +-
 51 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
index 94126b068..2024dc1fd 100644
--- a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
@@ -17,7 +17,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
index f187813d8..d25501948 100644
--- a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
+++ b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
index 366936803..127f95f6b 100644
--- a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
+++ b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 {{ $job_name := "postdelete-delete-marketplaceconfigs-job" }}
diff --git a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
index eb58c34f8..230d8b543 100644
--- a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
+++ b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $job_name := "postdelete-delete-profilebundles-job" }}
 
diff --git a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
index 59ef71ec5..702440ee3 100644
--- a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
+++ b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 ---
diff --git a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
index 73da8b7bf..13c0cf343 100644
--- a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
index ef5862f44..2e5bc6d34 100644
--- a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
index e1e6ddd17..455df9e89 100644
--- a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
index 571a2dd20..01d66c474 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
index c1782e956..3c04f4066 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
index 5914a161b..fa44650f2 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
index ff6ba648b..8a1664f93 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
index 98c4c0d0e..acd685e27 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 # Deletes user "masinst_${MAS_INSTANCE_ID}" from docdb an deletes the acc/cluster/instance/mongo#password secret from AWS SM
diff --git a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
index c421e933c..105f49f3c 100644
--- a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
+++ b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
index 78eee7332..def7eb883 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
index 332e3a9b9..031108e71 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
index 755960ffb..d2a0b6184 100644
--- a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
index b8b569ae9..d62e6e619 100644
--- a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
@@ -8,7 +8,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
index 3f9058b64..8f4f8a55b 100644
--- a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
index a60ad3869..42c7376ec 100644
--- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
index dab94b3ff..e8133747c 100644
--- a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
@@ -1,7 +1,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 ---
 # Service account that is authorized to read k8s secrets (needed by the job)
diff --git a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
index 7f0c2c989..383195e08 100644
--- a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 #apiVersion: batch/v1beta1
 kind: CronJob
diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index ec4e35b22..cc1ed9731 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
index 06915d480..5b2b196b8 100644
--- a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
+++ b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
index 66d4f8e62..9671ccc6a 100644
--- a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
+++ b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
index c66adf790..5f999baed 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $ns := printf "mas-%s-core" .Values.instance_id }}
 {{ $prefix := printf "pre-jdbc-usr-%s" .Values.mas_config_name }}
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 a8745d875..a52e9e736 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
index d0603f8f6..fc6bb882b 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $ns := printf "mas-%s-syncres" .Values.instance_id }}
 {{ $prefix := printf "post-jdbc-usr-%s" .Values.mas_config_name }}
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 63a56b2ef..254232198 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
@@ -18,7 +18,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 ---
 apiVersion: batch/v1
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 aaf3b5b1f..f875e5860 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 aaf3b5b1f..f875e5860 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 1049f6288..38e8dce7f 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 aaf3b5b1f..f875e5860 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 aaf3b5b1f..f875e5860 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
index 31e797f10..579f708f4 100644
--- a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 50e80ec08..425e26fe6 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
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 aaf3b5b1f..f875e5860 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
index f0147cdaa..ebd3df18c 100644
--- a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
@@ -8,7 +8,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 ---
 # Permit outbound communication by the Job pods
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
index b64f542d7..5589363f7 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
index 09ea0835b..660ba8898 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
index 0b394fbb2..cef294539 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $prefix := printf "%s-manage-update" .Values.mas_workspace_id}}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
index bed0c6cef..9453b5a13 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
@@ -6,7 +6,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $job_label :=  "mas-app-route-patch" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
index 3ceba31f7..dddd1918c 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
index 1546cce60..a23876fa5 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 # A verify test is one that is non disruptive i.e. it won't create new users, i won't call authenticated apis, and it won't creates resources 
 # in the application. This type of test is run on every environment and allows a layer of verification of the app
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
index 67db53c02..94fef2b11 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
index ba25b74e7..ca3d713ec 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
index 8d8ade0cc..bd8444dc4 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $ns               :=  .Values.mas_app_namespace }}
 {{ $np_name          :=  "postsync-sanity-mvi-np" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
index d8c2c7401..ca775795e 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 {{ $ns               :=  .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index 6a39fdd41..19f9097fb 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -86,7 +86,7 @@ will take care of differentiating the jobs.
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
index 981ab9311..175f585cd 100644
--- a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 
 {{ $prefix := printf "pre-jreporter-%s" .Values.reporter_name }}
diff --git a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
index 643ff0bc5..4103b2cfc 100644
--- a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{ $preprefix := printf "pre-jreporter-%s" .Values.reporter_name }}
 {{ $time_cm := printf "%s-synctime" $preprefix }}

From 06d13d0916a4862b60ddf917534635e439631569 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Wed, 12 Feb 2025 17:56:32 +0000
Subject: [PATCH 052/115] do helm hook jobs influence app health?

---
 .../130-ibm-mas-suite/templates/test-job-with-replace.yaml       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml b/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
index 29809dbe3..7ac9dfa66 100644
--- a/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
@@ -38,6 +38,7 @@ spec:
             - -c
             - |
               echo "done"
+              exit 1
               
       restartPolicy: Never
       serviceAccountName: "default"

From f9e0efa631bb6a5a35edee4b70002ce7112ef4b3 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 13 Feb 2025 11:14:25 +0000
Subject: [PATCH 053/115] experiment with ttlSecondsAfterFinished approach

---
 .../06-postsync-configtool-oidc.yaml          |  1 +
 .../templates/test-job-with-replace.yaml      | 46 -------------------
 2 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml

diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 50e80ec08..a5d99cb8a 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -131,6 +131,7 @@ metadata:
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
+  ttlSecondsAfterFinished: 60
   template:
     metadata:
       labels:
diff --git a/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml b/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
deleted file mode 100644
index 7ac9dfa66..000000000
--- a/instance-applications/130-ibm-mas-suite/templates/test-job-with-replace.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-
-{{ $ns :=                 printf "mas-%s-core" .Values.instance_id }}
-
-{{- /*
-Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
-*/}}
-{{- $_cli_image_tag := "13.4.1" }}
-
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: "test-job-with-replace"
-  namespace: {{ $ns }}
-  annotations:
-    helm.sh/hook: post-install,post-upgrade
-    helm.sh/hook-weight: "1" # Ensure this runs after actual resources are deployed
-spec:
-  template:
-    metadata:
-      labels:
-        app: "test-job-with-replace"
-    spec:
-      containers:
-        - name: run
-          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
-          imagePullPolicy: IfNotPresent
-          resources:
-            limits:
-              cpu: 200m
-              memory: 512Mi
-            requests:
-              cpu: 10m
-              memory: 64Mi
-
-          command:
-            - /bin/sh
-            - -c
-            - |
-              echo "done"
-              exit 1
-              
-      restartPolicy: Never
-      serviceAccountName: "default"
-  backoffLimit: 4
-

From 7c994532d036083ef90410be2be6bd013a509b77 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 13 Feb 2025 11:20:15 +0000
Subject: [PATCH 054/115] sync not creating job when updating with
 ttlSecondsAfterFinished, try incrementing version

---
 .../templates/06-postsync-configtool-oidc.yaml                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index a5d99cb8a..dc6b3d2df 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -24,7 +24,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 := "v2" }}
+{{- $_job_version := "v3" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag

From ede350fadb922f7d2390f5e502822302c6da6581 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 13 Feb 2025 13:57:00 +0000
Subject: [PATCH 055/115] remove ttlSecondsAfterFinished

---
 .../templates/06-postsync-configtool-oidc.yaml                 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index dc6b3d2df..50e80ec08 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -24,7 +24,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 := "v2" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -131,7 +131,6 @@ metadata:
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
-  ttlSecondsAfterFinished: 60
   template:
     metadata:
       labels:

From 26784d9524c6da01029f2fc2f34b45a462a3cfc5 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 13 Feb 2025 15:35:19 +0000
Subject: [PATCH 056/115] try configmap-based approach to tracking current job
 name

---
 .../06-postsync-configtool-oidc.yaml          | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 50e80ec08..5bbecb757 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -45,6 +45,7 @@ immutable field of any existing Job resource.
 {{ $job_label :=          "postsync-configtool-oidc-job" }}
 {{ $oauth_admin_secret := printf "%s-credentials-oauth-admin" .Values.instance_id }}
 
+
 ---
 # Permit outbound communication by the Job pods
 # (Needed to communicate with the K8S HTTP API and AWS SM)
@@ -126,8 +127,9 @@ metadata:
   namespace: {{ $ns }}
   annotations:
     argocd.argoproj.io/sync-wave: "145"
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-tracker-group: {{ $_job_name_prefix }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
@@ -135,7 +137,7 @@ spec:
     metadata:
       labels:
         app: {{ $job_label }}
-{{- if .Values.custom_labels }}
+{{- if .Values.custom_labels }} 
 {{ .Values.custom_labels | toYaml | indent 8 }}
 {{- end }}
     spec:
@@ -204,3 +206,19 @@ spec:
       serviceAccountName: "{{ $sa_name }}"
   backoffLimit: 4
 
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: {{ $_job_name_prefix }}-tracker
+  namespace: {{ $ns }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "146"
+  labels:
+    mas.ibm.com/job-tracker-group: {{ $_job_name_prefix }}
+{{- if .Values.custom_labels }}
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+immutable: false
+data:
+  current_job_name: {{ $_job_name }}
\ No newline at end of file

From d3a7933e3ebfe61a23b9ed20d31d2dce60b65f0d Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 13 Feb 2025 15:38:08 +0000
Subject: [PATCH 057/115] update cli image tag to test configmap approach

---
 .../templates/06-postsync-configtool-oidc.yaml                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 5bbecb757..05021abbf 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.2.0" }}
+{{- $_cli_image_tag := "13.4.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
@@ -24,7 +24,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 := "v2" }}
+{{- $_job_version := "v4" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag

From 2ce1f83b16b7fd5ff0b54fcaa8a60ca36ca87232 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 13 Feb 2025 16:09:40 +0000
Subject: [PATCH 058/115] change label

---
 .../templates/06-postsync-configtool-oidc.yaml            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 05021abbf..fd153cbab 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -24,7 +24,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 := "v4" }}
+{{- $_job_version := "v5" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -128,7 +128,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: "145"
   labels:
-    mas.ibm.com/job-tracker-group: {{ $_job_name_prefix }}
+    mas.ibm.com/job-cleanup-group: {{ $_job_name_prefix }}
 {{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
@@ -210,12 +210,12 @@ spec:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: {{ $_job_name_prefix }}-tracker
+  name: {{ $_job_name_prefix }}-cleanup
   namespace: {{ $ns }}
   annotations:
     argocd.argoproj.io/sync-wave: "146"
   labels:
-    mas.ibm.com/job-tracker-group: {{ $_job_name_prefix }}
+    mas.ibm.com/job-cleanup-group: {{ $_job_name_prefix }}
 {{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}

From c186798d6e92763376d918682b564028abd3ff1d Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 13 Feb 2025 16:26:06 +0000
Subject: [PATCH 059/115] make some orphaned jobs for testing

---
 .../templates/06-postsync-configtool-oidc.yaml                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index fd153cbab..854014bc4 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -24,7 +24,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 := "v5" }}
+{{- $_job_version := "v6" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag

From 3b4675846c74755a922a7d2d80255673b0ec51a1 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 13 Feb 2025 16:29:56 +0000
Subject: [PATCH 060/115] make some orphaned jobs for testing

---
 .../templates/06-postsync-configtool-oidc.yaml                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 854014bc4..e4a7c7fac 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -24,7 +24,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 := "v6" }}
+{{- $_job_version := "v7" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag

From f1dede63b1355ffcbf892ea380e6f4bbcd0ccc9c Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 13 Feb 2025 17:33:27 +0000
Subject: [PATCH 061/115] add independent $_job_cleanup_group constant

this is to support templates where >1 job is generated in a loop (e.g. custom_sa, manage postsync_db job), each generated job requires its own cleanup group. group names are sha1summed to ensure we do not exceed 63 char label limit when long discriminators are used.
---
 .../templates/06-postsync-configtool-oidc.yaml            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index e4a7c7fac..5aa7aaa98 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -35,7 +35,7 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
-
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
 
 {{ $ns :=                 printf "mas-%s-core" .Values.instance_id }}
 {{ $np_name :=            "postsync-configtool-oidc-np" }}
@@ -128,7 +128,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: "145"
   labels:
-    mas.ibm.com/job-cleanup-group: {{ $_job_name_prefix }}
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
 {{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
@@ -210,12 +210,12 @@ spec:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: {{ $_job_name_prefix }}-cleanup
+  name: {{ $_job_cleanup_group }}
   namespace: {{ $ns }}
   annotations:
     argocd.argoproj.io/sync-wave: "146"
   labels:
-    mas.ibm.com/job-cleanup-group: {{ $_job_name_prefix }}
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
 {{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}

From 38215e49a95a3a10b7b8d4b41d73062f5b2bfe72 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 13 Feb 2025 18:07:20 +0000
Subject: [PATCH 062/115] establish some more job-cleanup-groups for testing

---
 .../templates/04-postsync-update-sm_Job.yaml  | 49 +++++++++++++++++-
 .../templates/07-postsync-setup-db2_Job.yaml  | 50 ++++++++++++++++++-
 .../06-postsync-configtool-oidc.yaml          | 28 +++++++++++
 .../700-702-postsync-db2-manage.yaml          | 50 ++++++++++++++++++-
 4 files changed, 173 insertions(+), 4 deletions(-)

diff --git a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
index 73da8b7bf..14a95bdbc 100644
--- a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
@@ -37,7 +37,26 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource and associated ConfigMap.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. Any jobs in this group that do not have the same
+name as the current_job_name value in the ConfigMap will be deleted automatically.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
+NOTE: this is one of those cases; we need a separate cleanup group for each per-sa-key Job.
+
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
 
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix $key | sha1sum }}
 
 ---
 apiVersion: batch/v1
@@ -47,8 +66,9 @@ metadata:
   namespace: {{ $.Values.custom_sa_namespace }}
   annotations:
     argocd.argoproj.io/sync-wave: "064"
-{{- if $.Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if $.Values.custom_labels }}
 {{ $.Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
@@ -148,4 +168,31 @@ spec:
             defaultMode: 420
             optional: false
   backoffLimit: 4
+
+---
+
+{{- /*
+When the auto_delete flag is not set on the root application, this ConfigMap is used by a CronJob in the cluster 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+It must use  $_job_cleanup_group as its name. 
+It must be in the same namespace as the associated Job.
+It must be in a later syncwave than the associated Job.
+It must have a single data field current_job_name with $_job_name as its value
+*/}}
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: {{ $_job_cleanup_group }}
+  namespace: {{ $.Values.custom_sa_namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "065"
+  labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+immutable: false
+data:
+  current_job_name: {{ $_job_name }}
 {{- end }}
\ No newline at end of file
diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index ec4e35b22..7c4420f61 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -37,7 +37,25 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource and associated ConfigMap.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. Any jobs in this group that do not have the same
+name as the current_job_name value in the ConfigMap will be deleted automatically.
 
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
+
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
 
 ---
 kind: Secret
@@ -152,9 +170,10 @@ metadata:
   namespace: "{{ .Values.db2_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "129"
-{{- if .Values.custom_labels }}
   labels:
-{{ .Values.custom_labels | toYaml | indent 4 }}
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if $.Values.custom_labels }}
+{{ $.Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
   template:
@@ -779,4 +798,31 @@ spec:
             name: db2u-scripts-{{ .Values.db2_instance_name }}-configmap
 {{- end }}
   backoffLimit: 4
+
+---
+
+{{- /*
+When the auto_delete flag is not set on the root application, this ConfigMap is used by a CronJob in the cluster 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+It must use  $_job_cleanup_group as its name. 
+It must be in the same namespace as the associated Job.
+It must be in a later syncwave than the associated Job.
+It must have a single data field current_job_name with $_job_name as its value
+*/}}
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: {{ $_job_cleanup_group }}
+  namespace: "{{ .Values.db2_namespace }}"
+  annotations:
+    argocd.argoproj.io/sync-wave: "130"
+  labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+immutable: false
+data:
+  current_job_name: {{ $_job_name }}
 {{- end }}
\ No newline at end of file
diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 5aa7aaa98..a76f5efcb 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -35,6 +35,24 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource and associated ConfigMap.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. Any jobs in this group that do not have the same
+name as the current_job_name value in the ConfigMap will be deleted automatically.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
+
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
 {{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
 
 {{ $ns :=                 printf "mas-%s-core" .Values.instance_id }}
@@ -207,6 +225,16 @@ spec:
   backoffLimit: 4
 
 ---
+
+{{- /*
+When the auto_delete flag is not set on the root application, this ConfigMap is used by a CronJob in the cluster 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+It must use  $_job_cleanup_group as its name. 
+It must be in the same namespace as the associated Job.
+It must be in a later syncwave than the associated Job.
+It must have a single data field current_job_name with $_job_name as its value
+*/}}
 kind: ConfigMap
 apiVersion: v1
 metadata:
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index 6a39fdd41..f7cdbac2a 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -115,7 +115,26 @@ immutable field of any existing Job resource.
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash) }}
 
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource and associated ConfigMap.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. Any jobs in this group that do not have the same
+name as the current_job_name value in the ConfigMap will be deleted automatically.
 
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
+NOTE: this is one of those cases; we need a separate cleanup group for each per-db2 Job.
+
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix $db.db2_instance_name | sha1sum }}
 
 
 {{ $db2_namespace      := $db.db2_namespace }}
@@ -194,8 +213,10 @@ metadata:
   namespace: "{{ $manage_ns }}"
   annotations:
     argocd.argoproj.io/sync-wave: "702"
-{{- if $.Values.custom_labels }}
+
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if $.Values.custom_labels }}
 {{ $.Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
@@ -305,6 +326,33 @@ spec:
       volumes: []
   backoffLimit: 4
 
+---
+
+{{- /*
+When the auto_delete flag is not set on the root application, this ConfigMap is used by a CronJob in the cluster 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+It must use  $_job_cleanup_group as its name. 
+It must be in the same namespace as the associated Job.
+It must be in a later syncwave than the associated Job.
+It must have a single data field current_job_name with $_job_name as its value
+*/}}
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: {{ $_job_cleanup_group }}
+  namespace: {{ $manage_ns }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "703"
+  labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+immutable: false
+data:
+  current_job_name: {{ $_job_name }}
+
 {{- end }}
 {{- end }}
 {{- end }}
\ No newline at end of file

From adcd1e94a72ac35eaabb095477ba5a9414929c34 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 13 Feb 2025 18:15:47 +0000
Subject: [PATCH 063/115] fix manage post sync db2 job

---
 .../templates/700-702-postsync-db2-manage.yaml            | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index f7cdbac2a..ca8adbd01 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -206,14 +206,10 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  # Suffix the Job name with a hash of all chart values
-  # This is to ensure that ArgoCD will delete and recreate the job if anything changes in the application config
-  # The job is idempotent
   name: {{ $_job_name }}
   namespace: "{{ $manage_ns }}"
   annotations:
     argocd.argoproj.io/sync-wave: "702"
-
   labels:
     mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
 {{- if $.Values.custom_labels }}
@@ -346,8 +342,8 @@ metadata:
     argocd.argoproj.io/sync-wave: "703"
   labels:
     mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
-{{- if .Values.custom_labels }}
-{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- if $.Values.custom_labels }}
+{{ $.Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 immutable: false
 data:

From eb3b20f8b983c3731fe1dbc0c6685dcc71a7d8df Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 13 Feb 2025 18:19:58 +0000
Subject: [PATCH 064/115] make some orphaned jobs for testing

---
 .../templates/07-postsync-setup-db2_Job.yaml                    | 2 +-
 .../templates/700-702-postsync-db2-manage.yaml                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index 7c4420f61..a6cef63ed 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -26,7 +26,7 @@ Increment this value whenever you make a change to an immutable field of the Job
 E.g. passing in a new environment variable.
 Included in $_job_hash (see below).
 */}}
-{{- $_job_version := "v6" }}
+{{- $_job_version := "v7" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index ca8adbd01..e0ea5dcbc 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -103,7 +103,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 := "v2" }}
+{{- $_job_version := "v3" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag

From accd527a6680992846a3197dc037f7b896329706 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 13 Feb 2025 18:33:39 +0000
Subject: [PATCH 065/115] fix

---
 .../060-custom-sa/templates/04-postsync-update-sm_Job.yaml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
index 14a95bdbc..42467a949 100644
--- a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
@@ -189,8 +189,8 @@ metadata:
     argocd.argoproj.io/sync-wave: "065"
   labels:
     mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
-{{- if .Values.custom_labels }}
-{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- if $.Values.custom_labels }}
+{{ $.Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 immutable: false
 data:

From cee96d546c40b6b9ed34721716d51eaf9148fe0c Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 13 Feb 2025 22:01:04 +0000
Subject: [PATCH 066/115] fix image name

---
 .../templates/06-postsync-add-mvi-scc_Job.yaml                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
index 660ba8898..e9bf2db9f 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
@@ -105,7 +105,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli::{{ $_cli_image_tag }}
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From 335400181554abaa363d82c7c0c0eca458bf62f8 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 13 Feb 2025 22:02:21 +0000
Subject: [PATCH 067/115] fix image name

---
 .../templates/00-presync-add-mvi-scc_Job.yaml                 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
index 5589363f7..aee614d9e 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
@@ -105,9 +105,7 @@ spec:
     spec:
       containers:
         - name: run
-          # TODO: use a dedicated image with a smaller footprint for this sort of thing?
-          # Just using cli for now since it has all the deps we need to talk with AWS SM
-          image: quay.io/ibmmas/cli::{{ $_cli_image_tag }}
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From 31037bd89f86a471f87ab10c394e7e3ca0ffd5b9 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Fri, 14 Feb 2025 13:35:12 +0000
Subject: [PATCH 068/115] testing cli-image-tag update in fvtsaas

---
 .../templates/04-postsync-update-sm_Job.yaml                    | 2 +-
 .../020-ibm-dro/templates/08-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/postdelete-MarketplaceConfigs.yaml                | 2 +-
 .../templates/postdelete-ProfileBundles.yaml                    | 2 +-
 .../055-instana-agent-operator/templates/08-CronJob.yaml        | 2 +-
 .../060-custom-sa/templates/04-postsync-update-sm_Job.yaml      | 2 +-
 .../200-cluster-promotion/templates/02-cluster-verify_Job.yaml  | 2 +-
 .../templates/03-cluster-promoter_Job.yaml                      | 2 +-
 .../010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml  | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml        | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml   | 2 +-
 .../templates/PostDelete-aws-docdb-remove-user_Job.yaml         | 2 +-
 .../100-ibm-sls/templates/07-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/04-ibm-cp4d_prereqs_ops.yaml                      | 2 +-
 .../templates/04-ibm-cp4d_upg_cleanup.yaml                      | 2 +-
 .../110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml        | 2 +-
 .../110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml    | 2 +-
 .../110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml         | 2 +-
 .../110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml       | 2 +-
 .../templates/00-presync-await-crd_Job.yaml                     | 2 +-
 .../120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml    | 2 +-
 .../templates/07-postsync-setup-db2_Job.yaml                    | 2 +-
 .../120-ibm-spss/templates/02-ibm-spss-post-verify.yaml         | 2 +-
 .../120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml           | 2 +-
 .../templates/00-presync-create-db2-user_Job.yaml               | 2 +-
 .../130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml     | 2 +-
 .../templates/postdelete-delete-db2-user_Job.yaml               | 2 +-
 .../130-ibm-kafka-config/templates/postdelete-delete-cr.yaml    | 2 +-
 .../130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml | 2 +-
 .../130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml  | 2 +-
 .../templates/06-postsync-configtool-oidc.yaml                  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../templates/05-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/00-presync-add-mvi-scc_Job.yaml                   | 2 +-
 .../templates/06-postsync-add-mvi-scc_Job.yaml                  | 2 +-
 .../templates/02-ibm-manage-update_Job.yaml                     | 2 +-
 .../templates/04-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/04-postsync-manage-sanity.yaml                    | 2 +-
 .../templates/04-postsync-manage-verify.yaml                    | 2 +-
 .../templates/04-postsync-maximoit-sanity.yaml                  | 2 +-
 .../templates/04-postsync-maximoit-verify.yaml                  | 2 +-
 .../templates/04-postsync-mvi-sanity.yaml                       | 2 +-
 .../templates/04-postsync-mvi-verify.yaml                       | 2 +-
 .../templates/700-702-postsync-db2-manage.yaml                  | 2 +-
 .../junitreporter/templates/00-presync-report-starter.yaml      | 2 +-
 .../junitreporter/templates/10-postsync-report-starter.yaml     | 2 +-
 51 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
index 2024dc1fd..a571b66bf 100644
--- a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
@@ -17,7 +17,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
index d25501948..555d85df7 100644
--- a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
+++ b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
index 127f95f6b..1152d4b9c 100644
--- a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
+++ b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 
 {{ $job_name := "postdelete-delete-marketplaceconfigs-job" }}
diff --git a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
index 230d8b543..c91a937b6 100644
--- a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
+++ b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{ $job_name := "postdelete-delete-profilebundles-job" }}
 
diff --git a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
index 702440ee3..f966ab0db 100644
--- a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
+++ b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 
 ---
diff --git a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
index 13c0cf343..749240c74 100644
--- a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
index 2e5bc6d34..121ccf31f 100644
--- a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
index 455df9e89..e8ef9b3da 100644
--- a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
index 01d66c474..8812c2030 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
index 3c04f4066..7c923bee2 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
index fa44650f2..0f2eea080 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
index 8a1664f93..367d2e4d0 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
index acd685e27..dd10e3d6e 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 
 # Deletes user "masinst_${MAS_INSTANCE_ID}" from docdb an deletes the acc/cluster/instance/mongo#password secret from AWS SM
diff --git a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
index 105f49f3c..4f3c37ee2 100644
--- a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
+++ b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
index def7eb883..f38f41bb0 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
index 031108e71..fd9ed2b88 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
index d2a0b6184..6f7ac9495 100644
--- a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
index d62e6e619..5aa3f4f52 100644
--- a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
@@ -8,7 +8,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
index 8f4f8a55b..e79687a7c 100644
--- a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
index 42c7376ec..3bbacac71 100644
--- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
index e8133747c..6b39d7d2d 100644
--- a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
@@ -1,7 +1,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 ---
 # Service account that is authorized to read k8s secrets (needed by the job)
diff --git a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
index 383195e08..efec0b994 100644
--- a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 #apiVersion: batch/v1beta1
 kind: CronJob
diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index cc1ed9731..91adca38f 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
index 5b2b196b8..99e2bcbd5 100644
--- a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
+++ b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
index 9671ccc6a..29f371853 100644
--- a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
+++ b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
index 5f999baed..f6b5c25aa 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{ $ns := printf "mas-%s-core" .Values.instance_id }}
 {{ $prefix := printf "pre-jdbc-usr-%s" .Values.mas_config_name }}
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 a52e9e736..8d69c37a6 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
index fc6bb882b..51fd5fd1f 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{ $ns := printf "mas-%s-syncres" .Values.instance_id }}
 {{ $prefix := printf "post-jdbc-usr-%s" .Values.mas_config_name }}
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 254232198..8819d133b 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
@@ -18,7 +18,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 ---
 apiVersion: batch/v1
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 f875e5860..32d99d074 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 f875e5860..32d99d074 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 38e8dce7f..baff32613 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 f875e5860..32d99d074 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 f875e5860..32d99d074 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
index 579f708f4..f365aa70e 100644
--- a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 425e26fe6..0f6a7b0f4 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
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 f875e5860..32d99d074 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
index ebd3df18c..858583052 100644
--- a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
@@ -8,7 +8,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 ---
 # Permit outbound communication by the Job pods
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
index aee614d9e..44daadeb3 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
index e9bf2db9f..d9a900bb1 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
index cef294539..7582b9558 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $prefix := printf "%s-manage-update" .Values.mas_workspace_id}}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
index 9453b5a13..00dc35d3e 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
@@ -6,7 +6,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $job_label :=  "mas-app-route-patch" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
index dddd1918c..22c43d1ca 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
index a23876fa5..7a747d2e8 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 # A verify test is one that is non disruptive i.e. it won't create new users, i won't call authenticated apis, and it won't creates resources 
 # in the application. This type of test is run on every environment and allows a layer of verification of the app
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
index 94fef2b11..9c5f5e42e 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
index ca3d713ec..62be12e9a 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
index bd8444dc4..23ec6144b 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{ $ns               :=  .Values.mas_app_namespace }}
 {{ $np_name          :=  "postsync-sanity-mvi-np" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
index ca775795e..34013b76d 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 
 {{ $ns               :=  .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index 19f9097fb..346c0d5ef 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -86,7 +86,7 @@ will take care of differentiating the jobs.
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
index 175f585cd..8240e4db5 100644
--- a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 
 {{ $prefix := printf "pre-jreporter-%s" .Values.reporter_name }}
diff --git a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
index 4103b2cfc..222a28863 100644
--- a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.4.1" }}
+{{- $_cli_image_tag := "13.5.0" }}
 
 {{ $preprefix := printf "pre-jreporter-%s" .Values.reporter_name }}
 {{ $time_cm := printf "%s-synctime" $preprefix }}

From bb36df75111570a0d7718bd00920a3468638313a Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Mon, 17 Feb 2025 11:57:10 +0000
Subject: [PATCH 069/115] remove unnecessary configmap

---
 .../templates/04-postsync-update-sm_Job.yaml  | 35 ++---------------
 .../templates/07-postsync-setup-db2_Job.yaml  | 34 ++--------------
 .../06-postsync-configtool-oidc.yaml          | 33 ++--------------
 .../700-702-postsync-db2-manage.yaml          | 39 ++-----------------
 4 files changed, 14 insertions(+), 127 deletions(-)

diff --git a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
index 16684d9ae..a73da6069 100644
--- a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
@@ -37,15 +37,16 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+
 {{- /*
-Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource and associated ConfigMap.
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
 
 When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
 to identify old Job resources that should be pruned on behalf of ArgoCD.
 
 Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
-will be considered to belong to the same cleanup group. Any jobs in this group that do not have the same
-name as the current_job_name value in the ConfigMap will be deleted automatically.
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
 
 $_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
 where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
@@ -168,31 +169,3 @@ spec:
             defaultMode: 420
             optional: false
   backoffLimit: 4
-
----
-
-{{- /*
-When the auto_delete flag is not set on the root application, this ConfigMap is used by a CronJob in the cluster 
-to identify old Job resources that should be pruned on behalf of ArgoCD.
-
-It must use  $_job_cleanup_group as its name. 
-It must be in the same namespace as the associated Job.
-It must be in a later syncwave than the associated Job.
-It must have a single data field current_job_name with $_job_name as its value
-*/}}
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: {{ $_job_cleanup_group }}
-  namespace: {{ $.Values.custom_sa_namespace }}
-  annotations:
-    argocd.argoproj.io/sync-wave: "065"
-  labels:
-    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
-{{- if $.Values.custom_labels }}
-{{ $.Values.custom_labels | toYaml | indent 4 }}
-{{- end }}
-immutable: false
-data:
-  current_job_name: {{ $_job_name }}
-{{- end }}
\ No newline at end of file
diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index 9b4363943..3325470d0 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -38,14 +38,14 @@ immutable field of any existing Job resource.
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
 {{- /*
-Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource and associated ConfigMap.
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
 
 When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
 to identify old Job resources that should be pruned on behalf of ArgoCD.
 
 Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
-will be considered to belong to the same cleanup group. Any jobs in this group that do not have the same
-name as the current_job_name value in the ConfigMap will be deleted automatically.
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
 
 $_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
 where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
@@ -798,31 +798,3 @@ spec:
             name: db2u-scripts-{{ .Values.db2_instance_name }}-configmap
 {{- end }}
   backoffLimit: 4
-
----
-
-{{- /*
-When the auto_delete flag is not set on the root application, this ConfigMap is used by a CronJob in the cluster 
-to identify old Job resources that should be pruned on behalf of ArgoCD.
-
-It must use  $_job_cleanup_group as its name. 
-It must be in the same namespace as the associated Job.
-It must be in a later syncwave than the associated Job.
-It must have a single data field current_job_name with $_job_name as its value
-*/}}
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: {{ $_job_cleanup_group }}
-  namespace: "{{ .Values.db2_namespace }}"
-  annotations:
-    argocd.argoproj.io/sync-wave: "130"
-  labels:
-    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
-{{- if .Values.custom_labels }}
-{{ .Values.custom_labels | toYaml | indent 4 }}
-{{- end }}
-immutable: false
-data:
-  current_job_name: {{ $_job_name }}
-{{- end }}
\ No newline at end of file
diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index c67457fb9..3828736c3 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -36,14 +36,14 @@ immutable field of any existing Job resource.
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
 {{- /*
-Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource and associated ConfigMap.
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
 
 When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
 to identify old Job resources that should be pruned on behalf of ArgoCD.
 
 Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
-will be considered to belong to the same cleanup group. Any jobs in this group that do not have the same
-name as the current_job_name value in the ConfigMap will be deleted automatically.
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
 
 $_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
 where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
@@ -223,30 +223,3 @@ spec:
       restartPolicy: Never
       serviceAccountName: "{{ $sa_name }}"
   backoffLimit: 4
-
----
-
-{{- /*
-When the auto_delete flag is not set on the root application, this ConfigMap is used by a CronJob in the cluster 
-to identify old Job resources that should be pruned on behalf of ArgoCD.
-
-It must use  $_job_cleanup_group as its name. 
-It must be in the same namespace as the associated Job.
-It must be in a later syncwave than the associated Job.
-It must have a single data field current_job_name with $_job_name as its value
-*/}}
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: {{ $_job_cleanup_group }}
-  namespace: {{ $ns }}
-  annotations:
-    argocd.argoproj.io/sync-wave: "146"
-  labels:
-    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
-{{- if .Values.custom_labels }}
-{{ .Values.custom_labels | toYaml | indent 4 }}
-{{- end }}
-immutable: false
-data:
-  current_job_name: {{ $_job_name }}
\ No newline at end of file
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index d4bbdec8d..9eee29b93 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -114,22 +114,22 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash) }}
 
-
 {{- /*
-Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource and associated ConfigMap.
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
 
 When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
 to identify old Job resources that should be pruned on behalf of ArgoCD.
 
 Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
-will be considered to belong to the same cleanup group. Any jobs in this group that do not have the same
-name as the current_job_name value in the ConfigMap will be deleted automatically.
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
 
 $_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
 where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
 must be added to $_job_cleanup_group.
 NOTE: this is one of those cases; we need a separate cleanup group for each per-db2 Job.
 
+
 By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
 are required here.
 
@@ -321,34 +321,3 @@ spec:
       serviceAccountName: "{{ $sa_name }}"
       volumes: []
   backoffLimit: 4
-
----
-
-{{- /*
-When the auto_delete flag is not set on the root application, this ConfigMap is used by a CronJob in the cluster 
-to identify old Job resources that should be pruned on behalf of ArgoCD.
-
-It must use  $_job_cleanup_group as its name. 
-It must be in the same namespace as the associated Job.
-It must be in a later syncwave than the associated Job.
-It must have a single data field current_job_name with $_job_name as its value
-*/}}
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: {{ $_job_cleanup_group }}
-  namespace: {{ $manage_ns }}
-  annotations:
-    argocd.argoproj.io/sync-wave: "703"
-  labels:
-    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
-{{- if $.Values.custom_labels }}
-{{ $.Values.custom_labels | toYaml | indent 4 }}
-{{- end }}
-immutable: false
-data:
-  current_job_name: {{ $_job_name }}
-
-{{- end }}
-{{- end }}
-{{- end }}
\ No newline at end of file

From 58726f55d38bb7d60a61534771b34880a5d693b6 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 18 Feb 2025 10:31:49 +0000
Subject: [PATCH 070/115] improve job validation script

only 1 job per template file
$_job_cleanup_group constant is defined and set as mas.ibm.com/job-cleanup-group label on the Job
---
 build/bin/verify-job-definitions.sh | 56 ++++++++++++++++++++++++++---
 1 file changed, 51 insertions(+), 5 deletions(-)

diff --git a/build/bin/verify-job-definitions.sh b/build/bin/verify-job-definitions.sh
index 3dab8f691..d7ffa230d 100755
--- a/build/bin/verify-job-definitions.sh
+++ b/build/bin/verify-job-definitions.sh
@@ -18,8 +18,9 @@ Job name accordingly:
     - The \$_job_config_values constant is defined
     - The \$_job_version constant is defined
     - The \$_job_hash constant is defined and has the correct value
-    - The \$_job_name constant is defined and has the correct value
-    - The \$_job_name constant is used as the name of the Job
+    - The \$_job_name constant is defined, has the correct value and is used as the name of the Job
+    - The \$_job_cleanup_group is constant defined and assigned to the mas.ibm.com/job-cleanup-group Job label
+    - each template file contains only a single Job definition
 
 [PATH]... can be either:
     - A single directory: the script will check all files under this directory (recursive)
@@ -127,7 +128,7 @@ for file in ${files}; do
     done <<< "$(sed -En 's/.*quay\.io\/ibmmas\/cli:(.*)/\1/p' $file)"
 
 
-    # Experimental: attempt to dynamically detect if we can relax job naming restrictions for this file
+    # Attempt to dynamically detect if we can relax job naming restrictions for this file
     # The following awk commands exits 0 if and only if:
     #   - File does not contain a Job resource 
     #       Jobs are currently the only resource we use where immutability of the image field is a problem.
@@ -219,14 +220,29 @@ for file in ${files}; do
             problems=${problems}'    Missing {{- $_job_name := "..." }}\n'
         fi
 
-        # Check all jobs actually use $_job_name
+        # Check there is exactly one Job resource defined in the file
+        awkout=$(awk 'BEGIN { job_count=0; }
+            /^[[:space:]]*kind:[[:space:]]+Job/ { job_count++ }
+            END {
+                if(job_count != 1) {
+                    printf "Exactly 1 Job should be defined in each template file, but %s were found", job_count
+                    exit 1
+                }
+            }' $file \
+        )
+        rc=$?
+        if [[ $rc != 0 ]]; then
+            problems=${problems}'    '${awkout}'\n'
+        fi
+
+        # Check the job actually uses $_job_name
         awkout=$(awk 'BEGIN { job_count=0; valid_name_count=0; }
             /^[[:space:]]*kind:[[:space:]]+Job/ { inJob=1; job_count++ }
             /^---/ { inJob=0 }
             inJob && /name:[[:space:]]+\{\{[[:space:]]*\$_job_name[[:space:]]*\}\}/ { valid_name_count++ }
             END {
                 if(valid_name_count!=job_count) {
-                    print "At least one Job does not have name: {{ $_job_name }}"
+                    print "The Job does not have name: {{ $_job_name }}"
                     exit 1
                 }
             }' $file \
@@ -235,6 +251,36 @@ for file in ${files}; do
         if [[ $rc != 0 ]]; then
             problems=${problems}'    '${awkout}'\n'
         fi
+
+
+
+        # Check $_job_cleanup_group constant is defined
+        grep -Eq '^[[:space:]]*\{\{-?[[:space:]]+\$_job_cleanup_group[[:space:]]*:=[^}]+\}' $file
+        rc=$?
+        if [[ $rc != 0 ]]; then
+            problems=${problems}'    Missing {{- $_job_cleanup_group := ... }}\n'
+        fi
+
+        # Check mas.ibm.com/job-cleanup_group: $_job_cleanup_group label is applied to the Job
+        awkout=$(awk 'BEGIN { state=0; found=0 }
+            /^---/ { state=0 }
+            /^[[:space:]]*spec:/ { state=0 }
+            /^[[:space:]]*kind:[[:space:]]+Job/ { state=1; }
+            state==1 && /^[[:space:]]*metadata:/ { state=2; }
+            state==2 && /^[[:space:]]+labels:/ { state=3; }
+            state==3 && /^[[:space:]]+mas\.ibm\.com\/job-cleanup-group[[:space:]]*:[[:space:]]+\{\{[[:space:]]*\$_job_cleanup_group[[:space:]]*\}\}/ { found=1 }
+            END {
+                if(found!=1) {
+                    print "The Job does not have the mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }} label"
+                    exit 1
+                }
+            }' $file \
+        )
+        rc=$?
+        if [[ $rc != 0 ]]; then
+            problems=${problems}'    '${awkout}'\n'
+        fi
+
     fi
 
 

From 0eec38d655f8eda4916bf28a6b84210cc63d16f1 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 18 Feb 2025 10:47:01 +0000
Subject: [PATCH 071/115] Add cleanup-group label to all relevant jobs

---
 .../templates/04-postsync-update-sm_Job.yaml  | 26 +++++++++++++++++--
 .../templates/08-postsync-update-sm_Job.yaml  | 25 ++++++++++++++++--
 .../templates/02-cluster-verify_Job.yaml      | 24 +++++++++++++++--
 .../templates/03-cluster-promoter_Job.yaml    | 25 ++++++++++++++++--
 .../templates/00-aws-docdb-add-user_Job.yaml  | 25 ++++++++++++++++--
 .../templates/01-ibm-cp4d-presync.yaml        | 26 +++++++++++++++++--
 .../templates/01-ibm-mas_suite_certs_Job.yaml | 24 +++++++++++++++--
 .../templates/01-ibm-mas_suite_dns_Job.yaml   | 25 ++++++++++++++++--
 .../templates/07-postsync-update-sm_Job.yaml  | 25 ++++++++++++++++--
 .../templates/04-ibm-cp4d_prereqs_ops.yaml    | 24 +++++++++++++++--
 .../templates/04-ibm-cp4d_upg_cleanup.yaml    | 23 ++++++++++++++--
 .../templates/03-ibm-cp4d-mcs_patch_sa.yaml   | 23 ++++++++++++++--
 .../07-ibm-cp4d_patch_zenservice.yaml         | 25 ++++++++++++++++--
 .../templates/08-ibm-cp4d-post-verify.yaml    | 23 ++++++++++++++--
 .../templates/09-ibm-cp4d_services_base.yaml  | 23 ++++++++++++++--
 .../templates/02-ibm-spss-post-verify.yaml    | 23 ++++++++++++++--
 .../templates/02-ibm-wsl-post-verify.yaml     | 24 +++++++++++++++--
 .../templates/05-postsync-add-label_Job.yaml  | 23 ++++++++++++++--
 .../06-postsync-configtool-oidc.yaml          |  2 +-
 19 files changed, 401 insertions(+), 37 deletions(-)

diff --git a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
index a571b66bf..030596460 100644
--- a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
@@ -34,7 +34,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 := "v2" }}
+{{- $_job_version := "v3" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -45,6 +45,27 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
+
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
+
+
 {{ $ns := "cert-manager-operator"}}
 {{ $aws_secret := "aws"}}
 {{ $role_name  :=  "postsync-rhcm-update-sm-r" }}
@@ -142,8 +163,9 @@ metadata:
   namespace: {{ $ns }}
   annotations:
     argocd.argoproj.io/sync-wave: "015"
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
diff --git a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
index 555d85df7..02225f079 100644
--- a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
+++ b/cluster-applications/020-ibm-dro/templates/08-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 := "v2" }}
+{{- $_job_version := "v3" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -37,6 +37,26 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
+
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
+
 
 {{ $ns := .Values.dro_namespace}}
 {{ $aws_secret := "aws"}}
@@ -125,8 +145,9 @@ metadata:
   namespace: {{ $ns }}
   annotations:
     argocd.argoproj.io/sync-wave: "028"
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
diff --git a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
index 121ccf31f..7d468379a 100644
--- a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
@@ -24,7 +24,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 := "v2" }}
+{{- $_job_version := "v3" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -35,6 +35,25 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
+
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
 
 
 ---
@@ -78,8 +97,9 @@ metadata:
   namespace: mas-syncres
   annotations:
     argocd.argoproj.io/sync-wave: "202"
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
diff --git a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
index e8ef9b3da..4d46b222f 100644
--- a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
@@ -24,7 +24,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 := "v1" }}
+{{- $_job_version := "v2" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -35,6 +35,26 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
+
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
+
 
 ---
 apiVersion: batch/v1
@@ -44,8 +64,9 @@ metadata:
   namespace: mas-syncres
   annotations:
     argocd.argoproj.io/sync-wave: "205"
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
diff --git a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
index 8812c2030..64d5ea5a9 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_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 := "v2" }}
+{{- $_job_version := "v3" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -37,6 +37,26 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
+
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
+
 
 ---
 
@@ -53,8 +73,9 @@ metadata:
   namespace: mas-{{ .Values.instance_id }}-syncres
   annotations:
     argocd.argoproj.io/sync-wave: "00"
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
index 7c923bee2..0956ab6a6 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.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 := "v2" }}
+{{- $_job_version := "v3" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -38,6 +38,27 @@ immutable field of any existing Job resource.
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
+
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
+
+
 ---
 kind: ServiceAccount
 apiVersion: v1
@@ -107,8 +128,9 @@ metadata:
   namespace: mas-{{ .Values.instance_id }}-syncres
   annotations:
     argocd.argoproj.io/sync-wave: "003"
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
index 0f2eea080..ba535e337 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
@@ -27,7 +27,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 := "v1" }}
+{{- $_job_version := "v2" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -38,6 +38,25 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
+
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
 
 ---
 apiVersion: batch/v1
@@ -47,8 +66,9 @@ metadata:
   namespace: mas-{{ .Values.instance_id }}-syncres
   annotations:
     argocd.argoproj.io/sync-wave: "003"
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
index 367d2e4d0..282e6bbc6 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_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 := "v1" }}
+{{- $_job_version := "v2" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -37,6 +37,26 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
+
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
+
 
 ---
 apiVersion: batch/v1
@@ -46,8 +66,9 @@ metadata:
   namespace: mas-{{ .Values.instance_id }}-syncres
   annotations:
     argocd.argoproj.io/sync-wave: "003"
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
diff --git a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
index 4f3c37ee2..1ff811303 100644
--- a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
+++ b/instance-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 := "v2" }}
+{{- $_job_version := "v3" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -37,6 +37,26 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
+
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
+
 
 
 {{ $ns := printf "mas-%s-sls" .Values.instance_id}}
@@ -155,8 +175,9 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: "112"
     argocd.argoproj.io/sync-options: Prune=true
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
index f38f41bb0..99b584449 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
@@ -24,7 +24,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 := "v1" }}
+{{- $_job_version := "v2" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -35,6 +35,25 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
+
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
 
 
 ---
@@ -112,8 +131,9 @@ metadata:
   namespace: "{{ .Values.cpd_operators_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "088"
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
index fd9ed2b88..5ee99bf71 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
@@ -24,7 +24,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 := "v1" }}
+{{- $_job_version := "v2" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -35,7 +35,25 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
 
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
 
 ---
 # this job cleans up existing operators that might cause the cp4d upgrade to fail in the case of an upgrade.
@@ -51,8 +69,9 @@ metadata:
   namespace: "{{ .Values.cpd_operators_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "086"
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
diff --git a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
index 6f7ac9495..037984600 100644
--- a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
@@ -31,7 +31,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 := "v1" }}
+{{- $_job_version := "v2" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -42,7 +42,25 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
 
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
 
 ---
 apiVersion: batch/v1
@@ -52,8 +70,9 @@ metadata:
   namespace: "{{ .Values.cpd_operators_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "084"
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
diff --git a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
index 5aa3f4f52..41555cd1d 100644
--- a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
@@ -25,7 +25,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 := "v4" }}
+{{- $_job_version := "v5" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -37,6 +37,26 @@ immutable field of any existing Job resource.
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
+
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
+
 ---
 apiVersion: batch/v1
 kind: Job
@@ -45,8 +65,9 @@ metadata:
   namespace: "{{ .Values.cpd_operators_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "088"
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
diff --git a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
index e79687a7c..de13f4b9a 100644
--- a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
@@ -24,7 +24,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 := "v1" }}
+{{- $_job_version := "v2" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -35,7 +35,25 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
 
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
 
 ---
 apiVersion: batch/v1
@@ -45,8 +63,9 @@ metadata:
   namespace: "{{ .Values.cpd_operators_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "089"
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
index 3bbacac71..f10dcce93 100644
--- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
@@ -24,7 +24,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 := "v1" }}
+{{- $_job_version := "v2" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -35,7 +35,25 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
 
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
 
 
 ---
@@ -46,8 +64,9 @@ metadata:
   namespace: "{{ .Values.cpd_operators_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "089"
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
diff --git a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
index 99e2bcbd5..1b4aefbe7 100644
--- a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
+++ b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
@@ -24,7 +24,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 := "v1" }}
+{{- $_job_version := "v2" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -35,7 +35,25 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
 
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
 
 ---
 kind: ServiceAccount
@@ -134,8 +152,9 @@ metadata:
   namespace: "{{ .Values.cpd_operators_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "096"
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
diff --git a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
index 29f371853..ad363f14a 100644
--- a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
+++ b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
@@ -24,7 +24,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 := "v2" }}
+{{- $_job_version := "v3" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -36,6 +36,25 @@ immutable field of any existing Job resource.
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
+
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
 
 ---
 kind: ServiceAccount
@@ -117,8 +136,9 @@ metadata:
   namespace: "{{ .Values.cpd_operators_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "094"
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
diff --git a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
index f365aa70e..81b83b736 100644
--- a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
@@ -31,7 +31,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 := "v2" }}
+{{- $_job_version := "v3" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -42,7 +42,25 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
 
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
 
 {{ $job_label :=  "mas-route-patch" }}
 ---
@@ -140,8 +158,9 @@ metadata:
   namespace: mas-{{ .Values.instance_id }}-core
   annotations:
     argocd.argoproj.io/sync-wave: "142"
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 3828736c3..b85e672b7 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -24,7 +24,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 := "v7" }}
+{{- $_job_version := "v8" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag

From 71d8165adae2da0a5c45819ead28243c71e10b86 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 18 Feb 2025 14:25:21 +0000
Subject: [PATCH 072/115] fix

---
 .../templates/07-postsync-setup-db2_Job.yaml                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index 3325470d0..08bf75431 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -172,8 +172,8 @@ metadata:
     argocd.argoproj.io/sync-wave: "129"
   labels:
     mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
-{{- if $.Values.custom_labels }}
-{{ $.Values.custom_labels | toYaml | indent 4 }}
+{{- if .Values.custom_labels }}
+{{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:
   template:

From f1f884a29e6c0c19ac01cf00d329e91ddbf1f25a Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 18 Feb 2025 14:31:39 +0000
Subject: [PATCH 073/115] fix

---
 .../templates/07-postsync-setup-db2_Job.yaml                     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index 08bf75431..61304c481 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -798,3 +798,4 @@ spec:
             name: db2u-scripts-{{ .Values.db2_instance_name }}-configmap
 {{- end }}
   backoffLimit: 4
+{{- end }}

From d14eb0f87a6d7f0efb24b40800e75cee58034daf Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 18 Feb 2025 14:58:38 +0000
Subject: [PATCH 074/115] fix

---
 .../060-custom-sa/templates/04-postsync-update-sm_Job.yaml     | 1 +
 .../templates/700-702-postsync-db2-manage.yaml                 | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
index a73da6069..bd42c7a4e 100644
--- a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
@@ -169,3 +169,4 @@ spec:
             defaultMode: 420
             optional: false
   backoffLimit: 4
+{{- end }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index 9eee29b93..76bce283c 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -321,3 +321,6 @@ spec:
       serviceAccountName: "{{ $sa_name }}"
       volumes: []
   backoffLimit: 4
+{{- end }}
+{{- end }}
+{{- end }}

From d08e18981bb1b3af482022559f3ff81d7e314de4 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 18 Feb 2025 15:23:35 +0000
Subject: [PATCH 075/115] Add job-cleaner CronJob

---
 .../000-job-cleaner/Chart.yaml                |  11 ++
 .../000-job-cleaner/README.md                 |   2 +
 .../templates/04-jobcleaner_CronJob.yaml      | 108 ++++++++++++++++++
 .../000-job-cleaner/values.yaml               |   1 +
 .../templates/000-job-cleaner.yaml            |  66 +++++++++++
 5 files changed, 188 insertions(+)
 create mode 100644 cluster-applications/000-job-cleaner/Chart.yaml
 create mode 100644 cluster-applications/000-job-cleaner/README.md
 create mode 100644 cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
 create mode 100644 cluster-applications/000-job-cleaner/values.yaml
 create mode 100644 root-applications/ibm-mas-cluster-root/templates/000-job-cleaner.yaml

diff --git a/cluster-applications/000-job-cleaner/Chart.yaml b/cluster-applications/000-job-cleaner/Chart.yaml
new file mode 100644
index 000000000..b4ba0fa1a
--- /dev/null
+++ b/cluster-applications/000-job-cleaner/Chart.yaml
@@ -0,0 +1,11 @@
+apiVersion: v2
+name: job-cleaner
+description: A CronJob to delete old versions of Jobs created by ArgoCD
+type: application
+version: 1.0.0
+
+dependencies:
+- name: junitreporter
+  version: 1.0.0
+  repository: "file://../../sub-charts/junitreporter/"
+  condition: junitreporter.devops_mongo_uri != ""
\ No newline at end of file
diff --git a/cluster-applications/000-job-cleaner/README.md b/cluster-applications/000-job-cleaner/README.md
new file mode 100644
index 000000000..6fc09fd07
--- /dev/null
+++ b/cluster-applications/000-job-cleaner/README.md
@@ -0,0 +1,2 @@
+MAS SaaS Job Cleaner
+===============================================================================
diff --git a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
new file mode 100644
index 000000000..420752e10
--- /dev/null
+++ b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
@@ -0,0 +1,108 @@
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+*/}}
+{{- $_cli_image_tag := "13.6.0-pre.mascore5637-amd64" }}
+
+
+{{- $ns := "job-cleaner" }}
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: mas-saas-job-cleaner-role
+  annotations:
+    argocd.argoproj.io/sync-wave: "02"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+- apiGroups:
+    - batch
+  resources: 
+    - jobs
+  verbs: 
+    - list
+    - delete
+
+---
+# Service account that is authorized to read k8s secrets (needed by the job)
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: "mas-saas-job-cleaner-sa"
+  namespace: "{{ $ns }}"
+  annotations:
+    argocd.argoproj.io/sync-wave: "02"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+
+
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: mas-saas-job-cleaner-rolebinding
+  annotations:
+    argocd.argoproj.io/sync-wave: "03"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+subjects:
+  - kind: ServiceAccount
+    name: mas-saas-job-cleaner-sa"
+    namespace: {{ $ns }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: mas-saas-job-cleaner-role
+
+
+
+---
+kind: CronJob
+apiVersion: batch/v1
+metadata:
+  name: "mas-saas-job-cleaner-cron"
+  namespace: "{{ $ns }}"
+  annotations:
+    argocd.argoproj.io/sync-wave: "04"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+spec:
+  schedule: '* * * * *'
+  concurrencyPolicy: Forbid
+  jobTemplate:
+    spec:
+      template:
+        metadata:
+{{- if .Values.custom_labels }}
+          labels:
+{{ .Values.custom_labels | toYaml | indent 12 }}
+{{- end }}
+        spec:
+          containers:
+            - name: "mas-saas-job-cleaner"
+              image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
+              imagePullPolicy: IfNotPresent
+              command:
+                - /bin/sh
+                - -c
+                - |
+
+                  set -e
+
+                  mas-devops-saas-job-cleaner --label mas.ibm.com/job-cleanup-group --log-level INFO --dry-run || rc=$?
+                  if [[ "$rc" == "0" ]]; then
+                    echo "...... success"
+                    exit 0
+                  fi
+
+                  exit 1
+          restartPolicy: OnFailure
+          serviceAccountName: "mas-saas-job-cleaner-sa"
diff --git a/cluster-applications/000-job-cleaner/values.yaml b/cluster-applications/000-job-cleaner/values.yaml
new file mode 100644
index 000000000..ed97d539c
--- /dev/null
+++ b/cluster-applications/000-job-cleaner/values.yaml
@@ -0,0 +1 @@
+---
diff --git a/root-applications/ibm-mas-cluster-root/templates/000-job-cleaner.yaml b/root-applications/ibm-mas-cluster-root/templates/000-job-cleaner.yaml
new file mode 100644
index 000000000..14a74dc29
--- /dev/null
+++ b/root-applications/ibm-mas-cluster-root/templates/000-job-cleaner.yaml
@@ -0,0 +1,66 @@
+{{- if .Values.auto_delete }}
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: job-cleaner.{{ .Values.cluster.id }}
+  namespace: {{ .Values.argo.namespace }}
+  labels:
+    environment: '{{ .Values.account.id }}'
+    region: '{{ .Values.region.id }}'
+    cluster: '{{ .Values.cluster.id }}'
+  annotations:
+    argocd.argoproj.io/sync-wave: "000"
+    healthCheckTimeout: "1800"
+    {{- if and .Values.notifications .Values.notifications.slack_channel_id }}
+    notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }}
+    notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }}
+    {{- end }}
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  ignoreDifferences:
+  - group: '*'
+    kind: ServiceAccount
+    jsonPointers:
+    - /imagePullSecrets
+  project: "{{ .Values.argo.projects.apps }}"
+  destination:
+    server: {{ .Values.cluster.url }}
+    namespace: job-cleaner
+  source:
+    repoURL: "{{ .Values.source.repo_url }}"
+    path: cluster-applications/000-job-cleaner
+    targetRevision: "{{ .Values.source.revision }}"
+    plugin:
+      name: {{ .Values.avp.name }}
+      env:
+        - name: {{ .Values.avp.values_varname }}
+          value: |
+            junitreporter:
+              reporter_name: "job-cleaner"
+              cluster_id: "{{ .Values.cluster.id }}"
+              devops_mongo_uri: "{{ .Values.devops.mongo_uri }}"
+              devops_build_number: "{{ .Values.devops.build_number }}"
+              gitops_version: "{{ .Values.source.revision }}"
+            {{- if .Values.custom_labels }}
+            custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }}
+            {{- end }}
+        - name: ARGOCD_APP_NAME
+          value: jobcleanerapp
+        {{- if not (empty .Values.avp.secret) }}
+        - name: AVP_SECRET
+          value: {{ .Values.avp.secret }}
+        {{- end }}
+  syncPolicy:
+    automated:
+      {{- if .Values.auto_delete }}
+      prune: true
+      {{- end }}
+      selfHeal: true
+    retry:
+      limit: 20
+    syncOptions:
+      - CreateNamespace=true
+      - RespectIgnoreDifferences=true
+{{- end }}
\ No newline at end of file

From 4ba4d26b221068dc418f56aab2926f6ec1aa62d4 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 18 Feb 2025 17:04:32 +0000
Subject: [PATCH 076/115] fix

---
 .../ibm-mas-cluster-root/templates/000-job-cleaner.yaml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root-applications/ibm-mas-cluster-root/templates/000-job-cleaner.yaml b/root-applications/ibm-mas-cluster-root/templates/000-job-cleaner.yaml
index 14a74dc29..e6b041f88 100644
--- a/root-applications/ibm-mas-cluster-root/templates/000-job-cleaner.yaml
+++ b/root-applications/ibm-mas-cluster-root/templates/000-job-cleaner.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.auto_delete }}
+{{- if not .Values.auto_delete }}
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Application

From eef21c01f55e4aee8fade34d941e122609af491e Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 18 Feb 2025 17:10:16 +0000
Subject: [PATCH 077/115] fix

---
 .../templates/04-jobcleaner_CronJob.yaml          | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
index 420752e10..542a839ac 100644
--- a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
+++ b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
@@ -17,13 +17,14 @@ metadata:
   labels:
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
-- apiGroups:
-    - batch
-  resources: 
-    - jobs
-  verbs: 
-    - list
-    - delete
+rules:
+  - apiGroups:
+      - batch
+    resources: 
+      - jobs
+    verbs: 
+      - list
+      - delete
 
 ---
 # Service account that is authorized to read k8s secrets (needed by the job)

From 4d8acba73235c8c747845c71244586ce68753a72 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 18 Feb 2025 17:11:43 +0000
Subject: [PATCH 078/115] fix

---
 .../000-job-cleaner/templates/04-jobcleaner_CronJob.yaml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
index 542a839ac..64a3ffbc5 100644
--- a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
+++ b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
@@ -54,7 +54,7 @@ metadata:
 {{- end }}
 subjects:
   - kind: ServiceAccount
-    name: mas-saas-job-cleaner-sa"
+    name: mas-saas-job-cleaner-sa
     namespace: {{ $ns }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io

From 55d4b0da157d1243bde3e0f58ccd38aa2e81dba3 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 18 Feb 2025 17:16:11 +0000
Subject: [PATCH 079/115] fix

---
 .../templates/04-jobcleaner_CronJob.yaml               | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
index 64a3ffbc5..eba10e264 100644
--- a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
+++ b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
@@ -95,15 +95,7 @@ spec:
                 - /bin/sh
                 - -c
                 - |
-
                   set -e
-
-                  mas-devops-saas-job-cleaner --label mas.ibm.com/job-cleanup-group --log-level INFO --dry-run || rc=$?
-                  if [[ "$rc" == "0" ]]; then
-                    echo "...... success"
-                    exit 0
-                  fi
-
-                  exit 1
+                  mas-devops-saas-job-cleaner --label mas.ibm.com/job-cleanup-group --log-level INFO --dry-run
           restartPolicy: OnFailure
           serviceAccountName: "mas-saas-job-cleaner-sa"

From 71c1d382b0e2801ca29028a9e86857376ad8f2d7 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 18 Feb 2025 17:29:00 +0000
Subject: [PATCH 080/115] remove --dry-run

---
 .../000-job-cleaner/templates/04-jobcleaner_CronJob.yaml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
index eba10e264..8d6e733ff 100644
--- a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
+++ b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
@@ -96,6 +96,6 @@ spec:
                 - -c
                 - |
                   set -e
-                  mas-devops-saas-job-cleaner --label mas.ibm.com/job-cleanup-group --log-level INFO --dry-run
+                  mas-devops-saas-job-cleaner --label mas.ibm.com/job-cleanup-group --log-level INFO
           restartPolicy: OnFailure
           serviceAccountName: "mas-saas-job-cleaner-sa"

From 7310491b1d004d60f5512e19fa4e1c3c09e88956 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 18 Feb 2025 17:32:31 +0000
Subject: [PATCH 081/115] update cli image tag to test job-cleaner

---
 .../templates/04-postsync-update-sm_Job.yaml                    | 2 +-
 .../020-ibm-dro/templates/08-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/postdelete-MarketplaceConfigs.yaml                | 2 +-
 .../templates/postdelete-ProfileBundles.yaml                    | 2 +-
 .../055-instana-agent-operator/templates/08-CronJob.yaml        | 2 +-
 .../060-custom-sa/templates/04-postsync-update-sm_Job.yaml      | 2 +-
 .../200-cluster-promotion/templates/02-cluster-verify_Job.yaml  | 2 +-
 .../templates/03-cluster-promoter_Job.yaml                      | 2 +-
 .../010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml  | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml        | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml   | 2 +-
 .../templates/PostDelete-aws-docdb-remove-user_Job.yaml         | 2 +-
 .../100-ibm-sls/templates/07-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/04-ibm-cp4d_prereqs_ops.yaml                      | 2 +-
 .../templates/04-ibm-cp4d_upg_cleanup.yaml                      | 2 +-
 .../110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml        | 2 +-
 .../110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml    | 2 +-
 .../110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml         | 2 +-
 .../110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml       | 2 +-
 .../templates/00-presync-await-crd_Job.yaml                     | 2 +-
 .../120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml    | 2 +-
 .../templates/07-postsync-setup-db2_Job.yaml                    | 2 +-
 .../120-ibm-spss/templates/02-ibm-spss-post-verify.yaml         | 2 +-
 .../120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml           | 2 +-
 .../templates/00-presync-create-db2-user_Job.yaml               | 2 +-
 .../130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml     | 2 +-
 .../templates/postdelete-delete-db2-user_Job.yaml               | 2 +-
 .../130-ibm-kafka-config/templates/postdelete-delete-cr.yaml    | 2 +-
 .../130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml | 2 +-
 .../130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml  | 2 +-
 .../templates/06-postsync-configtool-oidc.yaml                  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../templates/05-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/00-presync-add-mvi-scc_Job.yaml                   | 2 +-
 .../templates/06-postsync-add-mvi-scc_Job.yaml                  | 2 +-
 .../templates/02-ibm-manage-update_Job.yaml                     | 2 +-
 .../templates/04-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/04-postsync-manage-sanity.yaml                    | 2 +-
 .../templates/04-postsync-manage-verify.yaml                    | 2 +-
 .../templates/04-postsync-maximoit-sanity.yaml                  | 2 +-
 .../templates/04-postsync-maximoit-verify.yaml                  | 2 +-
 .../templates/04-postsync-mvi-sanity.yaml                       | 2 +-
 .../templates/04-postsync-mvi-verify.yaml                       | 2 +-
 .../templates/700-702-postsync-db2-manage.yaml                  | 2 +-
 .../junitreporter/templates/00-presync-report-starter.yaml      | 2 +-
 .../junitreporter/templates/10-postsync-report-starter.yaml     | 2 +-
 51 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
index 030596460..e278e9ecc 100644
--- a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
@@ -17,7 +17,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
index 02225f079..092bfafcc 100644
--- a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
+++ b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
index 1152d4b9c..f2a608eed 100644
--- a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
+++ b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 
 {{ $job_name := "postdelete-delete-marketplaceconfigs-job" }}
diff --git a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
index c91a937b6..8d4235449 100644
--- a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
+++ b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{ $job_name := "postdelete-delete-profilebundles-job" }}
 
diff --git a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
index f966ab0db..d917dd140 100644
--- a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
+++ b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 
 ---
diff --git a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
index bd42c7a4e..e35493462 100644
--- a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
index 7d468379a..bd285dcc8 100644
--- a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
index 4d46b222f..14687a156 100644
--- a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
index 64d5ea5a9..6bfcf339d 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
index 0956ab6a6..b20f1c302 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
index ba535e337..5706b907e 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
index 282e6bbc6..b605e802c 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
index dd10e3d6e..8e5fb6c68 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 
 # Deletes user "masinst_${MAS_INSTANCE_ID}" from docdb an deletes the acc/cluster/instance/mongo#password secret from AWS SM
diff --git a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
index 1ff811303..08f9bd318 100644
--- a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
+++ b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
index 99b584449..ab3b6a161 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
index 5ee99bf71..37ed2f04b 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
index 037984600..3dcded7c5 100644
--- a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
index 41555cd1d..4ecd6d252 100644
--- a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
@@ -8,7 +8,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
index de13f4b9a..9c04d9148 100644
--- a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
index f10dcce93..998614da9 100644
--- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
index 6b39d7d2d..df6ee937b 100644
--- a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
@@ -1,7 +1,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 ---
 # Service account that is authorized to read k8s secrets (needed by the job)
diff --git a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
index efec0b994..0ab814760 100644
--- a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 #apiVersion: batch/v1beta1
 kind: CronJob
diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index 61304c481..f0bb26bad 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
index 1b4aefbe7..b68332e9d 100644
--- a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
+++ b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
index ad363f14a..19ff1b0a8 100644
--- a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
+++ b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
index f6b5c25aa..8e945ee89 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{ $ns := printf "mas-%s-core" .Values.instance_id }}
 {{ $prefix := printf "pre-jdbc-usr-%s" .Values.mas_config_name }}
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 8d69c37a6..dd95ada41 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
index 51fd5fd1f..8b6e4f0b3 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{ $ns := printf "mas-%s-syncres" .Values.instance_id }}
 {{ $prefix := printf "post-jdbc-usr-%s" .Values.mas_config_name }}
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 8819d133b..85519ab41 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
@@ -18,7 +18,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 ---
 apiVersion: batch/v1
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 32d99d074..2ca6b9753 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 32d99d074..2ca6b9753 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 baff32613..0e3d36aae 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 32d99d074..2ca6b9753 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 32d99d074..2ca6b9753 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
index 81b83b736..da52a09b4 100644
--- a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index b85e672b7..67f2969d3 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
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 32d99d074..2ca6b9753 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
index 858583052..83b35edf6 100644
--- a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
@@ -8,7 +8,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 ---
 # Permit outbound communication by the Job pods
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
index 44daadeb3..ae0296799 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
index d9a900bb1..c0f0d338a 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
index 7582b9558..2be8eb502 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $prefix := printf "%s-manage-update" .Values.mas_workspace_id}}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
index 00dc35d3e..456a8f59e 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
@@ -6,7 +6,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $job_label :=  "mas-app-route-patch" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
index 22c43d1ca..c59837297 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
index 7a747d2e8..0a8fc0629 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 # A verify test is one that is non disruptive i.e. it won't create new users, i won't call authenticated apis, and it won't creates resources 
 # in the application. This type of test is run on every environment and allows a layer of verification of the app
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
index 9c5f5e42e..6991b78d3 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
index 62be12e9a..c9f1c6229 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
index 23ec6144b..e10a013f4 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{ $ns               :=  .Values.mas_app_namespace }}
 {{ $np_name          :=  "postsync-sanity-mvi-np" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
index 34013b76d..ce3d55b9c 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 
 {{ $ns               :=  .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index 76bce283c..2b2646214 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -86,7 +86,7 @@ will take care of differentiating the jobs.
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
index 8240e4db5..88703dd33 100644
--- a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 
 {{ $prefix := printf "pre-jreporter-%s" .Values.reporter_name }}
diff --git a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
index 222a28863..85eb91399 100644
--- a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.6.0" }}
 
 {{ $preprefix := printf "pre-jreporter-%s" .Values.reporter_name }}
 {{ $time_cm := printf "%s-synctime" $preprefix }}

From 8a1685f93ad98abd0cd1518a45c121dfb9baa2a8 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 18 Feb 2025 18:07:46 +0000
Subject: [PATCH 082/115] ensure db2 postsync jobs land in different cleanup
 groups

---
 .../templates/07-postsync-setup-db2_Job.yaml                   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index f0bb26bad..9ea3e8ff1 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -50,12 +50,13 @@ Jobs will be automatically deleted.
 $_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
 where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
 must be added to $_job_cleanup_group.
+NOTE: this is one of those cases; we need a separate cleanup group for each DB2 database
 
 By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
 are required here.
 
 */}}
-{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
+{{- $_job_cleanup_group := cat $_job_name_prefix .Values.db2_instance_name | sha1sum }}
 
 ---
 kind: Secret

From 139e1474cfd52debae32a2a9e42f2873910989e6 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 18 Feb 2025 18:08:31 +0000
Subject: [PATCH 083/115] inc version to update label

---
 .../templates/07-postsync-setup-db2_Job.yaml                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index 9ea3e8ff1..db71b5855 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -26,7 +26,7 @@ Increment this value whenever you make a change to an immutable field of the Job
 E.g. passing in a new environment variable.
 Included in $_job_hash (see below).
 */}}
-{{- $_job_version := "v7" }}
+{{- $_job_version := "v8" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag

From 5e446ae2191ecf9bd9d10b0cd151d279e2aac01c Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Fri, 21 Feb 2025 13:14:29 +0000
Subject: [PATCH 084/115] temporarily suspend job cleaner CronJob so we can run
 it once after updating cli image tag

---
 .../000-job-cleaner/templates/04-jobcleaner_CronJob.yaml         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
index 8d6e733ff..9af16a36f 100644
--- a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
+++ b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
@@ -77,6 +77,7 @@ metadata:
 {{- end }}
 spec:
   schedule: '* * * * *'
+  suspend: true
   concurrencyPolicy: Forbid
   jobTemplate:
     spec:

From 3a19a898af867ead54edc0708348ab8281910fb1 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Fri, 21 Feb 2025 13:15:28 +0000
Subject: [PATCH 085/115] testing cli image tag update in fvtsaas

---
 .../templates/04-postsync-update-sm_Job.yaml                    | 2 +-
 .../020-ibm-dro/templates/08-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/postdelete-MarketplaceConfigs.yaml                | 2 +-
 .../templates/postdelete-ProfileBundles.yaml                    | 2 +-
 .../055-instana-agent-operator/templates/08-CronJob.yaml        | 2 +-
 .../060-custom-sa/templates/04-postsync-update-sm_Job.yaml      | 2 +-
 .../200-cluster-promotion/templates/02-cluster-verify_Job.yaml  | 2 +-
 .../templates/03-cluster-promoter_Job.yaml                      | 2 +-
 .../010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml  | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml        | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml   | 2 +-
 .../templates/PostDelete-aws-docdb-remove-user_Job.yaml         | 2 +-
 .../100-ibm-sls/templates/07-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/04-ibm-cp4d_prereqs_ops.yaml                      | 2 +-
 .../templates/04-ibm-cp4d_upg_cleanup.yaml                      | 2 +-
 .../110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml        | 2 +-
 .../110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml    | 2 +-
 .../110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml         | 2 +-
 .../110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml       | 2 +-
 .../templates/00-presync-await-crd_Job.yaml                     | 2 +-
 .../120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml    | 2 +-
 .../templates/07-postsync-setup-db2_Job.yaml                    | 2 +-
 .../120-ibm-spss/templates/02-ibm-spss-post-verify.yaml         | 2 +-
 .../120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml           | 2 +-
 .../templates/00-presync-create-db2-user_Job.yaml               | 2 +-
 .../130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml     | 2 +-
 .../templates/postdelete-delete-db2-user_Job.yaml               | 2 +-
 .../130-ibm-kafka-config/templates/postdelete-delete-cr.yaml    | 2 +-
 .../130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml | 2 +-
 .../130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml  | 2 +-
 .../templates/06-postsync-configtool-oidc.yaml                  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../templates/05-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/00-presync-add-mvi-scc_Job.yaml                   | 2 +-
 .../templates/06-postsync-add-mvi-scc_Job.yaml                  | 2 +-
 .../templates/02-ibm-manage-update_Job.yaml                     | 2 +-
 .../templates/04-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/04-postsync-manage-sanity.yaml                    | 2 +-
 .../templates/04-postsync-manage-verify.yaml                    | 2 +-
 .../templates/04-postsync-maximoit-sanity.yaml                  | 2 +-
 .../templates/04-postsync-maximoit-verify.yaml                  | 2 +-
 .../templates/04-postsync-mvi-sanity.yaml                       | 2 +-
 .../templates/04-postsync-mvi-verify.yaml                       | 2 +-
 .../templates/700-702-postsync-db2-manage.yaml                  | 2 +-
 .../junitreporter/templates/00-presync-report-starter.yaml      | 2 +-
 .../junitreporter/templates/10-postsync-report-starter.yaml     | 2 +-
 51 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
index e278e9ecc..74ce7f75c 100644
--- a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
@@ -17,7 +17,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
index 092bfafcc..dc3276056 100644
--- a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
+++ b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
index f2a608eed..aee684f3b 100644
--- a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
+++ b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 
 {{ $job_name := "postdelete-delete-marketplaceconfigs-job" }}
diff --git a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
index 8d4235449..6002f0569 100644
--- a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
+++ b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{ $job_name := "postdelete-delete-profilebundles-job" }}
 
diff --git a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
index d917dd140..22ed9c409 100644
--- a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
+++ b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 
 ---
diff --git a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
index e35493462..95517ae8e 100644
--- a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
index bd285dcc8..00a0594a5 100644
--- a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
index 14687a156..167f47621 100644
--- a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
index 6bfcf339d..d1ff10ad0 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
index b20f1c302..530a26a35 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-cp4d-presync.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
index 5706b907e..436425ec6 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
index b605e802c..36cc63cd3 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
index 8e5fb6c68..ab037d983 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 
 # Deletes user "masinst_${MAS_INSTANCE_ID}" from docdb an deletes the acc/cluster/instance/mongo#password secret from AWS SM
diff --git a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
index 08f9bd318..5d65644fa 100644
--- a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
+++ b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
index ab3b6a161..6caa4c109 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
index 37ed2f04b..1d1145c21 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
index 3dcded7c5..5310bcf5f 100644
--- a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
index 4ecd6d252..32d3d6f0d 100644
--- a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
@@ -8,7 +8,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
index 9c04d9148..11de6d640 100644
--- a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
index 998614da9..27c61c235 100644
--- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
index df6ee937b..6d4b823bb 100644
--- a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
@@ -1,7 +1,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 ---
 # Service account that is authorized to read k8s secrets (needed by the job)
diff --git a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
index 0ab814760..1382478c6 100644
--- a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 #apiVersion: batch/v1beta1
 kind: CronJob
diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index db71b5855..e831049e4 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
index b68332e9d..37f3af092 100644
--- a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
+++ b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
index 19ff1b0a8..1adea70a5 100644
--- a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
+++ b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
index 8e945ee89..475d6c0b7 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{ $ns := printf "mas-%s-core" .Values.instance_id }}
 {{ $prefix := printf "pre-jdbc-usr-%s" .Values.mas_config_name }}
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 dd95ada41..e7c2e7224 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
index 8b6e4f0b3..2991af438 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{ $ns := printf "mas-%s-syncres" .Values.instance_id }}
 {{ $prefix := printf "post-jdbc-usr-%s" .Values.mas_config_name }}
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 85519ab41..05ac50175 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
@@ -18,7 +18,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 ---
 apiVersion: batch/v1
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 2ca6b9753..15ad5bcfa 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 2ca6b9753..15ad5bcfa 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 0e3d36aae..6ecdc3652 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 2ca6b9753..15ad5bcfa 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 2ca6b9753..15ad5bcfa 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
index da52a09b4..fa623e6b9 100644
--- a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 67f2969d3..8ef9e2c56 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
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 2ca6b9753..15ad5bcfa 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
index 83b35edf6..80f811ff4 100644
--- a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
@@ -8,7 +8,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 ---
 # Permit outbound communication by the Job pods
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
index ae0296799..a60dffa84 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
index c0f0d338a..c13811bf3 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
index 2be8eb502..68351cfb8 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $prefix := printf "%s-manage-update" .Values.mas_workspace_id}}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
index 456a8f59e..1fe93dfdd 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
@@ -6,7 +6,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $job_label :=  "mas-app-route-patch" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
index c59837297..a099fb74b 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
index 0a8fc0629..c8171085d 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 # A verify test is one that is non disruptive i.e. it won't create new users, i won't call authenticated apis, and it won't creates resources 
 # in the application. This type of test is run on every environment and allows a layer of verification of the app
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
index 6991b78d3..920c83515 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
index c9f1c6229..475c2f78a 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
index e10a013f4..9fba2c242 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{ $ns               :=  .Values.mas_app_namespace }}
 {{ $np_name          :=  "postsync-sanity-mvi-np" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
index ce3d55b9c..10db0f276 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 
 {{ $ns               :=  .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index 2b2646214..4cef29d46 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -86,7 +86,7 @@ will take care of differentiating the jobs.
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
index 88703dd33..dc0c50fa2 100644
--- a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 
 {{ $prefix := printf "pre-jreporter-%s" .Values.reporter_name }}
diff --git a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
index 85eb91399..1b04ff25b 100644
--- a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{ $preprefix := printf "pre-jreporter-%s" .Values.reporter_name }}
 {{ $time_cm := printf "%s-synctime" $preprefix }}

From f187e24d0ad4d18931d54efac848c8dd8954d736 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Fri, 21 Feb 2025 13:41:28 +0000
Subject: [PATCH 086/115] re-enable job cleaner in fvtsaas

---
 .../000-job-cleaner/templates/04-jobcleaner_CronJob.yaml         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
index 9af16a36f..8d6e733ff 100644
--- a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
+++ b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
@@ -77,7 +77,6 @@ metadata:
 {{- end }}
 spec:
   schedule: '* * * * *'
-  suspend: true
   concurrencyPolicy: Forbid
   jobTemplate:
     spec:

From b97d8c7be984af5951758c13fc8dde6bbf3b5547 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Mon, 24 Feb 2025 10:18:31 +0000
Subject: [PATCH 087/115] suspend job-cleaner so we can choose when to run it
 when testing on SRE staging

---
 .../000-job-cleaner/templates/04-jobcleaner_CronJob.yaml         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
index 8d6e733ff..9af16a36f 100644
--- a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
+++ b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
@@ -77,6 +77,7 @@ metadata:
 {{- end }}
 spec:
   schedule: '* * * * *'
+  suspend: true
   concurrencyPolicy: Forbid
   jobTemplate:
     spec:

From 2bf687c767e84e93eac184e08c6bbd8ecdb6f5e4 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Mon, 24 Feb 2025 10:25:16 +0000
Subject: [PATCH 088/115] updating docs

---
 docs/drawio/appstructure.drawio | 910 ++++++++++++++++----------------
 1 file changed, 463 insertions(+), 447 deletions(-)

diff --git a/docs/drawio/appstructure.drawio b/docs/drawio/appstructure.drawio
index 4486eee81..309964f31 100644
--- a/docs/drawio/appstructure.drawio
+++ b/docs/drawio/appstructure.drawio
@@ -1,447 +1,463 @@
-<mxfile host="Electron" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/23.0.2 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" modified="2025-02-10T09:58:22.878Z" etag="0hUCb34M8W1DVcwyJRGu" version="23.0.2" type="device">
-  <diagram id="ml8bYYsEtUAZJTW_Lftc" name="Page-1">
-    <mxGraphModel dx="2882" dy="1953" grid="1" gridSize="10" guides="0" tooltips="1" connect="1" arrows="1" fold="1" page="0" pageScale="1" pageWidth="827" pageHeight="1169" background="#ffffff" math="0" shadow="0">
-      <root>
-        <mxCell id="0" />
-        <mxCell id="1" parent="0" />
-        <mxCell id="151" value="" style="rounded=0;whiteSpace=wrap;html=1;strokeColor=#000000;strokeWidth=1;fontSize=20;fillColor=#9C9C9C;fillStyle=cross-hatch;" parent="1" vertex="1">
-          <mxGeometry x="-370" y="750" width="2430" height="340" as="geometry" />
-        </mxCell>
-        <mxCell id="160" value="" style="rounded=0;whiteSpace=wrap;html=1;strokeColor=#000000;strokeWidth=1;fontSize=20;fillColor=#9C9C9C;fillStyle=cross-hatch;" parent="1" vertex="1">
-          <mxGeometry x="-10" y="140" width="1690" height="140" as="geometry" />
-        </mxCell>
-        <mxCell id="117" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="2" target="3" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="2" value="Account Root" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#0050ef;fontColor=#ffffff;strokeColor=#000000;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="631.6616821289062" y="50" width="190" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="116" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="3" target="107" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="3" value="Cluster Root Appset" style="shape=parallelogram;perimeter=parallelogramPerimeter;whiteSpace=wrap;html=1;fixedSize=1;fillColor=#008a00;fontColor=#ffffff;strokeColor=#000000;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="631.6616821289062" y="180" width="190" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="134" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="5" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="1740" y="610" />
-              <mxPoint x="779" y="610" />
-            </Array>
-            <mxPoint x="779.0666666666666" y="660" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="5" value="Instance Root Appset" style="shape=parallelogram;perimeter=parallelogramPerimeter;whiteSpace=wrap;html=1;fixedSize=1;fillColor=#008a00;fontColor=#ffffff;strokeColor=#000000;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="1650" y="500" width="190" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="11" value="Operator Catalog" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="-280" y="500" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="13" value="Cert Manager" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="-120" y="500" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="14" value="DRO" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="40" y="500" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="15" value="CIS Compliance" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="200" y="500" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="16" value="NFD" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="360" y="500" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="17" value="DB2U" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="1530" y="850" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="26" value="MAS Suite" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="510" y="850" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="34" value="SLS" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="170" y="850" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="50" value="CP4D" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry y="850" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="118" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="730" y="380" />
-              <mxPoint x="730" y="440" />
-              <mxPoint x="-50" y="440" />
-            </Array>
-            <mxPoint x="676.0000000000005" y="380" as="sourcePoint" />
-            <mxPoint x="-50" y="500" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="119" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="107" target="14" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="726" y="440" />
-              <mxPoint x="110" y="440" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="120" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="107" target="15" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="726" y="440" />
-              <mxPoint x="270" y="440" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="121" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="107" target="16" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="727" y="440" />
-              <mxPoint x="430" y="440" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="122" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="107" target="WCPXIc9LmJP7Mr7B8AD5-181" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="726" y="440" />
-              <mxPoint x="590" y="440" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="124" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" target="5" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="704" y="440" />
-              <mxPoint x="1740" y="440" />
-            </Array>
-            <mxPoint x="704" y="379" as="sourcePoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="107" value="&lt;span style=&quot;color: rgb(255, 255, 255); font-family: Helvetica; font-size: 20px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; letter-spacing: normal; orphans: 2; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline !important;&quot;&gt;Cluster Roots&lt;/span&gt;" style="verticalLabelPosition=middle;verticalAlign=middle;html=1;shape=mxgraph.basic.layered_rect;dx=15.94;outlineConnect=0;fillColor=#0050ef;fontColor=#ffffff;strokeColor=#000000;labelPosition=center;align=center;labelBackgroundColor=none;whiteSpace=wrap;horizontal=1;fontStyle=1;fontSize=20;strokeWidth=2;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="632" y="299" width="190" height="81" as="geometry" />
-        </mxCell>
-        <mxCell id="136" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="125" target="34" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="801" y="780" />
-              <mxPoint x="240" y="780" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="137" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="125" target="129" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="801" y="780" />
-              <mxPoint x="410" y="780" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="138" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="125" target="26" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="801" y="780" />
-              <mxPoint x="580" y="780" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="139" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="125" target="130" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="801" y="780" />
-              <mxPoint x="750" y="780" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="140" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="125" target="131" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="801" y="780" />
-              <mxPoint x="920" y="780" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="141" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="125" target="132" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="801" y="780" />
-              <mxPoint x="1090" y="780" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="142" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="125" target="133" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="801" y="780" />
-              <mxPoint x="1260" y="780" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="145" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeColor=#000000;strokeWidth=3;fontSize=20;orthogonal=1;" parent="1" source="125" target="143" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="801" y="780" />
-              <mxPoint x="1430" y="780" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="WCPXIc9LmJP7Mr7B8AD5-185" style="edgeStyle=orthogonalEdgeStyle;rounded=1;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0;exitDx=100;exitDy=80;exitPerimeter=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;strokeWidth=3;curved=0;" parent="1" source="125" target="WCPXIc9LmJP7Mr7B8AD5-183" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="806" y="780" />
-              <mxPoint x="160" y="780" />
-              <mxPoint x="160" y="960" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="WCPXIc9LmJP7Mr7B8AD5-186" style="edgeStyle=orthogonalEdgeStyle;rounded=1;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0;exitDx=100;exitDy=80;exitPerimeter=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;strokeWidth=3;curved=0;" parent="1" source="125" target="WCPXIc9LmJP7Mr7B8AD5-184" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="806" y="780" />
-              <mxPoint x="160" y="780" />
-              <mxPoint x="160" y="1040" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="125" value="Instance Roots" style="verticalLabelPosition=middle;verticalAlign=middle;html=1;shape=mxgraph.basic.layered_rect;dx=10;outlineConnect=0;fillColor=#0050ef;fontColor=#ffffff;strokeColor=#000000;labelPosition=center;align=center;labelBackgroundColor=none;whiteSpace=wrap;horizontal=1;fontStyle=1;fontSize=20;strokeWidth=2;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="706" y="660" width="190" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="129" value="DB2 Databases" style="verticalLabelPosition=middle;verticalAlign=middle;html=1;shape=mxgraph.basic.layered_rect;dx=10;outlineConnect=0;fillColor=#d80073;fontColor=#ffffff;strokeColor=#000000;labelPosition=center;align=center;labelBackgroundColor=none;whiteSpace=wrap;horizontal=1;strokeWidth=2;fontStyle=1;fontSize=20;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="340" y="840" width="140" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="130" value="MAS Suite Config" style="verticalLabelPosition=middle;verticalAlign=middle;html=1;shape=mxgraph.basic.layered_rect;dx=10;outlineConnect=0;fillColor=#d80073;fontColor=#ffffff;strokeColor=#000000;labelPosition=center;align=center;labelBackgroundColor=none;whiteSpace=wrap;horizontal=1;fontStyle=1;fontSize=20;strokeWidth=2;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="680" y="840" width="140" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="131" value="MAS Suite Workspaces" style="verticalLabelPosition=middle;verticalAlign=middle;html=1;shape=mxgraph.basic.layered_rect;dx=10;outlineConnect=0;fillColor=#d80073;fontColor=#ffffff;strokeColor=#000000;labelPosition=center;align=center;labelBackgroundColor=none;whiteSpace=wrap;horizontal=1;fontStyle=1;fontSize=20;strokeWidth=2;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="850" y="840" width="140" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="132" value="MAS App Installs" style="verticalLabelPosition=middle;verticalAlign=middle;html=1;shape=mxgraph.basic.layered_rect;dx=10;outlineConnect=0;fillColor=#d80073;fontColor=#ffffff;strokeColor=#000000;labelPosition=center;align=center;labelBackgroundColor=none;whiteSpace=wrap;horizontal=1;fontStyle=1;fontSize=20;strokeWidth=2;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="1020" y="840" width="140" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="133" value="MAS App Configs" style="verticalLabelPosition=middle;verticalAlign=middle;html=1;shape=mxgraph.basic.layered_rect;dx=10;outlineConnect=0;fillColor=#d80073;fontColor=#ffffff;strokeColor=#000000;labelPosition=center;align=center;labelBackgroundColor=none;whiteSpace=wrap;horizontal=1;fontStyle=1;fontSize=20;strokeWidth=2;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="1190" y="840" width="140" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="143" value="WSL" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="1360" y="850" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="152" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;endArrow=none;" parent="1" source="125" target="151" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="801" y="780" />
-            </Array>
-            <mxPoint x="801.0476190476188" y="740" as="sourcePoint" />
-            <mxPoint x="70" y="850" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="162" value="&lt;font style=&quot;font-size: 20px;&quot;&gt;ibm-mas-account-root&lt;/font&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#009999;strokeColor=#000000;fontSize=36;fontColor=#ffffff;strokeWidth=1;fontStyle=1;spacingLeft=42;align=left;spacing=0;verticalAlign=middle;spacingTop=-11;fillStyle=solid;" parent="1" vertex="1">
-          <mxGeometry x="-10" y="90" width="270" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="163" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://helm.sh/img/helm.svg;" parent="1" vertex="1">
-          <mxGeometry y="100" width="25.99" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="148" value="&lt;font style=&quot;font-size: 20px;&quot;&gt;ibm-mas-cluster-root&lt;/font&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#009999;strokeColor=#000000;fontSize=36;fontColor=#ffffff;strokeWidth=1;fontStyle=1;spacingLeft=42;align=left;spacing=0;verticalAlign=middle;spacingTop=-11;fillStyle=solid;" parent="1" vertex="1">
-          <mxGeometry x="-10" y="360" width="270" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="149" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://helm.sh/img/helm.svg;" parent="1" vertex="1">
-          <mxGeometry y="370" width="25.99" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="158" value="&lt;font style=&quot;font-size: 20px;&quot;&gt;ibm-mas-instance-root&lt;/font&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#009999;strokeColor=#000000;fontSize=36;fontColor=#ffffff;strokeWidth=1;fontStyle=1;spacingLeft=42;align=left;spacing=0;verticalAlign=middle;spacingTop=-11;fillStyle=solid;" parent="1" vertex="1">
-          <mxGeometry x="-10" y="700" width="270" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="159" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://helm.sh/img/helm.svg;" parent="1" vertex="1">
-          <mxGeometry y="710" width="25.99" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="165" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeColor=#000000;strokeWidth=3;fontSize=20;orthogonal=1;" parent="1" source="125" target="17" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="800" y="780" />
-              <mxPoint x="1610" y="780" />
-            </Array>
-            <mxPoint x="811" y="750" as="sourcePoint" />
-            <mxPoint x="1440" y="860" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="166" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="125" target="50" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="800" y="780" />
-              <mxPoint x="70" y="780" />
-            </Array>
-            <mxPoint x="811" y="750" as="sourcePoint" />
-            <mxPoint x="590" y="860" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="170" value="WML" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="1690" y="850" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="171" value="AI OpenScale" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="1850" y="850" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="174" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeColor=#000000;strokeWidth=3;fontSize=20;orthogonal=1;" parent="1" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="800" y="780" />
-              <mxPoint x="1610" y="780" />
-            </Array>
-            <mxPoint x="800" y="740" as="sourcePoint" />
-            <mxPoint x="1610" y="850" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="175" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeColor=#000000;strokeWidth=3;fontSize=20;orthogonal=1;" parent="1" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="800" y="740" />
-              <mxPoint x="800" y="780" />
-              <mxPoint x="1760" y="780" />
-            </Array>
-            <mxPoint x="800" y="760" as="sourcePoint" />
-            <mxPoint x="1760" y="850" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="176" style="edgeStyle=none;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=1;entryY=1;entryDx=0;entryDy=0;" parent="1" source="170" target="170" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="177" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeColor=#000000;strokeWidth=3;fontSize=20;orthogonal=1;" parent="1" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="800" y="780" />
-              <mxPoint x="1920" y="780" />
-            </Array>
-            <mxPoint x="800" y="740" as="sourcePoint" />
-            <mxPoint x="1920" y="850" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="178" value="Spark" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="-150" y="850" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="179" value="SPSS Modeler" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="-310" y="850" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="180" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="800" y="740" />
-              <mxPoint x="800" y="780" />
-              <mxPoint x="-240" y="780" />
-            </Array>
-            <mxPoint x="800" y="740" as="sourcePoint" />
-            <mxPoint x="-240" y="850" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="181" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="800" y="740" />
-              <mxPoint x="800" y="780" />
-              <mxPoint x="-80" y="780" />
-            </Array>
-            <mxPoint x="800" y="750" as="sourcePoint" />
-            <mxPoint x="-80" y="850" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="WCPXIc9LmJP7Mr7B8AD5-181" value="NVIDIA GPU" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="520" y="500" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="WCPXIc9LmJP7Mr7B8AD5-183" value="CP4D Operators" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry y="930" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="WCPXIc9LmJP7Mr7B8AD5-184" value="CP4D CS Control" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry y="1010" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="2ge-qGCwmwGJbEV4CsZ1-181" value="&lt;font style=&quot;font-size: 17px;&quot;&gt;Custom Service Accounts&lt;/font&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="840" y="500" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="Oq5OPkyUyvFc9IJOZWid-187" value="Group Sync" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="680" y="500" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="Oq5OPkyUyvFc9IJOZWid-188" value="IBM RBAC" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="1000" y="500" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="XvPbVhUA4EUWTuD7yNFU-181" value="CrowdStrike Falcon" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="1160" y="500" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="XvPbVhUA4EUWTuD7yNFU-182" value="Cluster Logging" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="1320" y="500" width="140" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="XvPbVhUA4EUWTuD7yNFU-185" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="730" y="380" />
-              <mxPoint x="730" y="440" />
-              <mxPoint x="750" y="440" />
-            </Array>
-            <mxPoint x="730" y="390" as="sourcePoint" />
-            <mxPoint x="750" y="500" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="XvPbVhUA4EUWTuD7yNFU-187" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="730" y="380" />
-              <mxPoint x="730" y="440" />
-              <mxPoint x="1230" y="440" />
-            </Array>
-            <mxPoint x="720" y="380" as="sourcePoint" />
-            <mxPoint x="1230" y="500" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="XvPbVhUA4EUWTuD7yNFU-189" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="730" y="380" />
-              <mxPoint x="730" y="440" />
-              <mxPoint x="910" y="440" />
-            </Array>
-            <mxPoint x="730" y="380" as="sourcePoint" />
-            <mxPoint x="910" y="500" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="XvPbVhUA4EUWTuD7yNFU-190" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="730" y="380" />
-              <mxPoint x="730" y="440" />
-              <mxPoint x="1390" y="440" />
-            </Array>
-            <mxPoint x="730" y="380" as="sourcePoint" />
-            <mxPoint x="1390" y="500" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="XvPbVhUA4EUWTuD7yNFU-191" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;exitX=0;exitY=0;exitDx=102.97;exitDy=81;exitPerimeter=0;" parent="1" source="107" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="730" y="380" />
-              <mxPoint x="730" y="440" />
-              <mxPoint x="1550" y="440" />
-            </Array>
-            <mxPoint x="890" y="380" as="sourcePoint" />
-            <mxPoint x="1550" y="500" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="146" value="" style="rounded=0;whiteSpace=wrap;html=1;strokeColor=#000000;strokeWidth=1;fontSize=20;fillColor=#9C9C9C;fillStyle=cross-hatch;" parent="1" vertex="1">
-          <mxGeometry x="-140" y="-220" width="2040" height="190" as="geometry" />
-        </mxCell>
-        <mxCell id="-wIrcGdv7ZLGd_BOV_Xi-182" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;exitX=0;exitY=0;exitDx=102.97;exitDy=81;exitPerimeter=0;" edge="1" parent="1" source="107">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="730" y="380" />
-              <mxPoint x="730" y="440" />
-              <mxPoint x="-200" y="440" />
-            </Array>
-            <mxPoint x="526.0000000000005" y="380" as="sourcePoint" />
-            <mxPoint x="-200" y="500" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="-wIrcGdv7ZLGd_BOV_Xi-183" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;exitX=0;exitY=0;exitDx=102.97;exitDy=81;exitPerimeter=0;" edge="1" parent="1" source="107">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="730" y="380" />
-              <mxPoint x="730" y="440" />
-              <mxPoint x="1070" y="440" />
-            </Array>
-            <mxPoint x="560" y="380" as="sourcePoint" />
-            <mxPoint x="1070" y="500" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="-wIrcGdv7ZLGd_BOV_Xi-184" value="Instana Agent" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" vertex="1" parent="1">
-          <mxGeometry x="1480" y="500" width="140" height="60" as="geometry" />
-        </mxCell>
-      </root>
-    </mxGraphModel>
-  </diagram>
-</mxfile>
+<mxfile host="65bd71144e">
+    <diagram id="ml8bYYsEtUAZJTW_Lftc" name="Page-1">
+        <mxGraphModel dx="2625" dy="1191" grid="1" gridSize="10" guides="0" tooltips="1" connect="1" arrows="1" fold="1" page="0" pageScale="1" pageWidth="827" pageHeight="1169" background="#ffffff" math="0" shadow="0">
+            <root>
+                <mxCell id="0"/>
+                <mxCell id="1" parent="0"/>
+                <mxCell id="151" value="" style="rounded=0;whiteSpace=wrap;html=1;strokeColor=#000000;strokeWidth=1;fontSize=20;fillColor=#9C9C9C;fillStyle=cross-hatch;" parent="1" vertex="1">
+                    <mxGeometry x="-450" y="750" width="2510" height="340" as="geometry"/>
+                </mxCell>
+                <mxCell id="160" value="" style="rounded=0;whiteSpace=wrap;html=1;strokeColor=#000000;strokeWidth=1;fontSize=20;fillColor=#9C9C9C;fillStyle=cross-hatch;" parent="1" vertex="1">
+                    <mxGeometry x="-450" y="140" width="2500" height="140" as="geometry"/>
+                </mxCell>
+                <mxCell id="117" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="2" target="3" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="2" value="Account Root" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#0050ef;fontColor=#ffffff;strokeColor=#000000;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="631.6616821289062" y="50" width="190" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="116" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="3" target="107" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="3" value="Cluster Root Appset" style="shape=parallelogram;perimeter=parallelogramPerimeter;whiteSpace=wrap;html=1;fixedSize=1;fillColor=#008a00;fontColor=#ffffff;strokeColor=#000000;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="631.6616821289062" y="180" width="190" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="134" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="5" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="1740" y="610"/>
+                            <mxPoint x="779" y="610"/>
+                        </Array>
+                        <mxPoint x="779.0666666666666" y="660" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="5" value="Instance Root Appset" style="shape=parallelogram;perimeter=parallelogramPerimeter;whiteSpace=wrap;html=1;fixedSize=1;fillColor=#008a00;fontColor=#ffffff;strokeColor=#000000;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="1650" y="500" width="190" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="11" value="Operator Catalog" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="-280" y="500" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="13" value="Cert Manager" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="-120" y="500" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="14" value="DRO" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="40" y="500" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="15" value="CIS Compliance" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="200" y="500" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="16" value="NFD" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="360" y="500" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="17" value="DB2U" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="1530" y="850" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="26" value="MAS Suite" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="510" y="850" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="34" value="SLS" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="170" y="850" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="50" value="CP4D" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry y="850" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="118" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="730" y="380"/>
+                            <mxPoint x="730" y="440"/>
+                            <mxPoint x="-50" y="440"/>
+                        </Array>
+                        <mxPoint x="676.0000000000005" y="380" as="sourcePoint"/>
+                        <mxPoint x="-50" y="500" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="119" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="107" target="14" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="726" y="440"/>
+                            <mxPoint x="110" y="440"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="120" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="107" target="15" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="726" y="440"/>
+                            <mxPoint x="270" y="440"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="121" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="107" target="16" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="727" y="440"/>
+                            <mxPoint x="430" y="440"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="122" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="107" target="WCPXIc9LmJP7Mr7B8AD5-181" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="726" y="440"/>
+                            <mxPoint x="590" y="440"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="124" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" target="5" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="730" y="379"/>
+                            <mxPoint x="730" y="440"/>
+                            <mxPoint x="1740" y="440"/>
+                        </Array>
+                        <mxPoint x="704" y="379" as="sourcePoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="107" value="&lt;span style=&quot;color: rgb(255, 255, 255); font-family: Helvetica; font-size: 20px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; letter-spacing: normal; orphans: 2; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline !important;&quot;&gt;Cluster Roots&lt;/span&gt;" style="verticalLabelPosition=middle;verticalAlign=middle;html=1;shape=mxgraph.basic.layered_rect;dx=15.94;outlineConnect=0;fillColor=#0050ef;fontColor=#ffffff;strokeColor=#000000;labelPosition=center;align=center;labelBackgroundColor=none;whiteSpace=wrap;horizontal=1;fontStyle=1;fontSize=20;strokeWidth=2;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="632" y="299" width="190" height="81" as="geometry"/>
+                </mxCell>
+                <mxCell id="136" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="125" target="34" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="801" y="780"/>
+                            <mxPoint x="240" y="780"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="137" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="125" target="129" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="801" y="780"/>
+                            <mxPoint x="410" y="780"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="138" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="125" target="26" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="801" y="780"/>
+                            <mxPoint x="580" y="780"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="139" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="125" target="130" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="801" y="780"/>
+                            <mxPoint x="750" y="780"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="140" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="125" target="131" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="801" y="780"/>
+                            <mxPoint x="920" y="780"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="141" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="125" target="132" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="801" y="780"/>
+                            <mxPoint x="1090" y="780"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="142" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="125" target="133" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="801" y="780"/>
+                            <mxPoint x="1260" y="780"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="145" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeColor=#000000;strokeWidth=3;fontSize=20;orthogonal=1;" parent="1" source="125" target="143" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="801" y="780"/>
+                            <mxPoint x="1430" y="780"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="WCPXIc9LmJP7Mr7B8AD5-185" style="edgeStyle=orthogonalEdgeStyle;rounded=1;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;strokeWidth=3;curved=0;" parent="1" target="WCPXIc9LmJP7Mr7B8AD5-183" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="800" y="740"/>
+                            <mxPoint x="800" y="780"/>
+                            <mxPoint x="160" y="780"/>
+                            <mxPoint x="160" y="960"/>
+                        </Array>
+                        <mxPoint x="800" y="740" as="sourcePoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="WCPXIc9LmJP7Mr7B8AD5-186" style="edgeStyle=orthogonalEdgeStyle;rounded=1;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;strokeWidth=3;curved=0;" parent="1" source="125" target="WCPXIc9LmJP7Mr7B8AD5-184" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="800" y="780"/>
+                            <mxPoint x="160" y="780"/>
+                            <mxPoint x="160" y="1040"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="125" value="Instance Roots" style="verticalLabelPosition=middle;verticalAlign=middle;html=1;shape=mxgraph.basic.layered_rect;dx=10;outlineConnect=0;fillColor=#0050ef;fontColor=#ffffff;strokeColor=#000000;labelPosition=center;align=center;labelBackgroundColor=none;whiteSpace=wrap;horizontal=1;fontStyle=1;fontSize=20;strokeWidth=2;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="706" y="660" width="190" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="129" value="DB2 Databases" style="verticalLabelPosition=middle;verticalAlign=middle;html=1;shape=mxgraph.basic.layered_rect;dx=10;outlineConnect=0;fillColor=#d80073;fontColor=#ffffff;strokeColor=#000000;labelPosition=center;align=center;labelBackgroundColor=none;whiteSpace=wrap;horizontal=1;strokeWidth=2;fontStyle=1;fontSize=20;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="340" y="840" width="140" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="130" value="MAS Suite Config" style="verticalLabelPosition=middle;verticalAlign=middle;html=1;shape=mxgraph.basic.layered_rect;dx=10;outlineConnect=0;fillColor=#d80073;fontColor=#ffffff;strokeColor=#000000;labelPosition=center;align=center;labelBackgroundColor=none;whiteSpace=wrap;horizontal=1;fontStyle=1;fontSize=20;strokeWidth=2;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="680" y="840" width="140" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="131" value="MAS Suite Workspaces" style="verticalLabelPosition=middle;verticalAlign=middle;html=1;shape=mxgraph.basic.layered_rect;dx=10;outlineConnect=0;fillColor=#d80073;fontColor=#ffffff;strokeColor=#000000;labelPosition=center;align=center;labelBackgroundColor=none;whiteSpace=wrap;horizontal=1;fontStyle=1;fontSize=20;strokeWidth=2;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="850" y="840" width="140" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="132" value="MAS App Installs" style="verticalLabelPosition=middle;verticalAlign=middle;html=1;shape=mxgraph.basic.layered_rect;dx=10;outlineConnect=0;fillColor=#d80073;fontColor=#ffffff;strokeColor=#000000;labelPosition=center;align=center;labelBackgroundColor=none;whiteSpace=wrap;horizontal=1;fontStyle=1;fontSize=20;strokeWidth=2;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="1020" y="840" width="140" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="133" value="MAS App Configs" style="verticalLabelPosition=middle;verticalAlign=middle;html=1;shape=mxgraph.basic.layered_rect;dx=10;outlineConnect=0;fillColor=#d80073;fontColor=#ffffff;strokeColor=#000000;labelPosition=center;align=center;labelBackgroundColor=none;whiteSpace=wrap;horizontal=1;fontStyle=1;fontSize=20;strokeWidth=2;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="1190" y="840" width="140" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="143" value="WSL" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="1360" y="850" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="152" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;endArrow=none;" parent="1" source="125" target="151" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="801" y="780"/>
+                        </Array>
+                        <mxPoint x="801.0476190476188" y="740" as="sourcePoint"/>
+                        <mxPoint x="70" y="850" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="162" value="&lt;font style=&quot;font-size: 20px;&quot;&gt;ibm-mas-account-root&lt;/font&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#009999;strokeColor=#000000;fontSize=36;fontColor=#ffffff;strokeWidth=1;fontStyle=1;spacingLeft=42;align=left;spacing=0;verticalAlign=middle;spacingTop=-11;fillStyle=solid;" parent="1" vertex="1">
+                    <mxGeometry x="-450" y="90" width="270" height="50" as="geometry"/>
+                </mxCell>
+                <mxCell id="163" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://helm.sh/img/helm.svg;" parent="1" vertex="1">
+                    <mxGeometry x="-440" y="100" width="25.99" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="148" value="&lt;font style=&quot;font-size: 20px;&quot;&gt;ibm-mas-cluster-root&lt;/font&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#009999;strokeColor=#000000;fontSize=36;fontColor=#ffffff;strokeWidth=1;fontStyle=1;spacingLeft=42;align=left;spacing=0;verticalAlign=middle;spacingTop=-11;fillStyle=solid;" parent="1" vertex="1">
+                    <mxGeometry x="-450" y="370" width="270" height="50" as="geometry"/>
+                </mxCell>
+                <mxCell id="149" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://helm.sh/img/helm.svg;" parent="1" vertex="1">
+                    <mxGeometry x="-440" y="380" width="25.99" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="158" value="&lt;font style=&quot;font-size: 20px;&quot;&gt;ibm-mas-instance-root&lt;/font&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#009999;strokeColor=#000000;fontSize=36;fontColor=#ffffff;strokeWidth=1;fontStyle=1;spacingLeft=42;align=left;spacing=0;verticalAlign=middle;spacingTop=-11;fillStyle=solid;" parent="1" vertex="1">
+                    <mxGeometry x="-450" y="700" width="270" height="50" as="geometry"/>
+                </mxCell>
+                <mxCell id="159" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://helm.sh/img/helm.svg;" parent="1" vertex="1">
+                    <mxGeometry x="-440" y="710" width="25.99" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="165" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeColor=#000000;strokeWidth=3;fontSize=20;orthogonal=1;" parent="1" source="125" target="17" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="800" y="780"/>
+                            <mxPoint x="1610" y="780"/>
+                        </Array>
+                        <mxPoint x="811" y="750" as="sourcePoint"/>
+                        <mxPoint x="1440" y="860" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="166" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="125" target="50" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="800" y="780"/>
+                            <mxPoint x="70" y="780"/>
+                        </Array>
+                        <mxPoint x="811" y="750" as="sourcePoint"/>
+                        <mxPoint x="590" y="860" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="170" value="WML" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="1690" y="850" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="171" value="AI OpenScale" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="1850" y="850" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="174" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeColor=#000000;strokeWidth=3;fontSize=20;orthogonal=1;" parent="1" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="800" y="780"/>
+                            <mxPoint x="1610" y="780"/>
+                        </Array>
+                        <mxPoint x="800" y="740" as="sourcePoint"/>
+                        <mxPoint x="1610" y="850" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="175" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeColor=#000000;strokeWidth=3;fontSize=20;orthogonal=1;" parent="1" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="800" y="740"/>
+                            <mxPoint x="800" y="780"/>
+                            <mxPoint x="1760" y="780"/>
+                        </Array>
+                        <mxPoint x="800" y="760" as="sourcePoint"/>
+                        <mxPoint x="1760" y="850" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="176" style="edgeStyle=none;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=1;entryY=1;entryDx=0;entryDy=0;" parent="1" source="170" target="170" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="177" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeColor=#000000;strokeWidth=3;fontSize=20;orthogonal=1;" parent="1" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="800" y="780"/>
+                            <mxPoint x="1920" y="780"/>
+                        </Array>
+                        <mxPoint x="800" y="740" as="sourcePoint"/>
+                        <mxPoint x="1920" y="850" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="178" value="Spark" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="-150" y="850" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="179" value="SPSS Modeler" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="-310" y="850" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="180" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="800" y="740"/>
+                            <mxPoint x="800" y="780"/>
+                            <mxPoint x="-240" y="780"/>
+                        </Array>
+                        <mxPoint x="800" y="740" as="sourcePoint"/>
+                        <mxPoint x="-240" y="850" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="181" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="800" y="740"/>
+                            <mxPoint x="800" y="780"/>
+                            <mxPoint x="-80" y="780"/>
+                        </Array>
+                        <mxPoint x="800" y="750" as="sourcePoint"/>
+                        <mxPoint x="-80" y="850" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="WCPXIc9LmJP7Mr7B8AD5-181" value="NVIDIA GPU" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="520" y="500" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="WCPXIc9LmJP7Mr7B8AD5-183" value="CP4D Operators" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry y="930" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="WCPXIc9LmJP7Mr7B8AD5-184" value="CP4D CS Control" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry y="1010" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="2ge-qGCwmwGJbEV4CsZ1-181" value="Custom Service Accounts" style="rounded=0;whiteSpace=wrap;fillColor=#d80073;strokeColor=#000000;fontColor=#FFFFFF;fontStyle=1;fontSize=18;strokeWidth=2;align=center;spacing=0;labelBorderColor=none;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="840" y="500" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="Oq5OPkyUyvFc9IJOZWid-187" value="Group Sync" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="680" y="500" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="Oq5OPkyUyvFc9IJOZWid-188" value="IBM RBAC" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="1000" y="500" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="XvPbVhUA4EUWTuD7yNFU-181" value="CrowdStrike Falcon" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="1160" y="500" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="XvPbVhUA4EUWTuD7yNFU-182" value="Cluster Logging" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="1320" y="500" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="XvPbVhUA4EUWTuD7yNFU-185" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="730" y="380"/>
+                            <mxPoint x="730" y="440"/>
+                            <mxPoint x="750" y="440"/>
+                        </Array>
+                        <mxPoint x="730" y="390" as="sourcePoint"/>
+                        <mxPoint x="750" y="500" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="XvPbVhUA4EUWTuD7yNFU-187" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="730" y="380"/>
+                            <mxPoint x="730" y="440"/>
+                            <mxPoint x="1230" y="440"/>
+                        </Array>
+                        <mxPoint x="720" y="380" as="sourcePoint"/>
+                        <mxPoint x="1230" y="500" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="XvPbVhUA4EUWTuD7yNFU-189" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="730" y="380"/>
+                            <mxPoint x="730" y="440"/>
+                            <mxPoint x="910" y="440"/>
+                        </Array>
+                        <mxPoint x="730" y="380" as="sourcePoint"/>
+                        <mxPoint x="910" y="500" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="XvPbVhUA4EUWTuD7yNFU-190" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="730" y="380"/>
+                            <mxPoint x="730" y="440"/>
+                            <mxPoint x="1390" y="440"/>
+                        </Array>
+                        <mxPoint x="730" y="380" as="sourcePoint"/>
+                        <mxPoint x="1390" y="500" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="XvPbVhUA4EUWTuD7yNFU-191" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;exitX=0;exitY=0;exitDx=102.97;exitDy=81;exitPerimeter=0;" parent="1" source="107" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="730" y="380"/>
+                            <mxPoint x="730" y="440"/>
+                            <mxPoint x="1550" y="440"/>
+                        </Array>
+                        <mxPoint x="890" y="380" as="sourcePoint"/>
+                        <mxPoint x="1550" y="500" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="146" value="" style="rounded=0;whiteSpace=wrap;html=1;strokeColor=#000000;strokeWidth=1;fontSize=20;fillColor=#9C9C9C;fillStyle=cross-hatch;" parent="1" vertex="1">
+                    <mxGeometry x="-450" y="420" width="2500" height="190" as="geometry"/>
+                </mxCell>
+                <mxCell id="-wIrcGdv7ZLGd_BOV_Xi-182" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;exitX=0;exitY=0;exitDx=102.97;exitDy=81;exitPerimeter=0;" parent="1" source="107" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="730" y="380"/>
+                            <mxPoint x="730" y="440"/>
+                            <mxPoint x="-200" y="440"/>
+                        </Array>
+                        <mxPoint x="526.0000000000005" y="380" as="sourcePoint"/>
+                        <mxPoint x="-200" y="500" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="-wIrcGdv7ZLGd_BOV_Xi-183" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;exitX=0;exitY=0;exitDx=102.97;exitDy=81;exitPerimeter=0;" parent="1" source="107" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="730" y="380"/>
+                            <mxPoint x="730" y="440"/>
+                            <mxPoint x="1070" y="440"/>
+                        </Array>
+                        <mxPoint x="560" y="380" as="sourcePoint"/>
+                        <mxPoint x="1070" y="500" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="-wIrcGdv7ZLGd_BOV_Xi-184" value="Instana Agent" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+                    <mxGeometry x="1480" y="500" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="182" value="Job Cleaner" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" vertex="1" parent="1">
+                    <mxGeometry x="-440" y="500" width="140" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="184" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" edge="1" parent="1" target="182">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="730" y="440"/>
+                            <mxPoint x="-370" y="440"/>
+                        </Array>
+                        <mxPoint x="730" y="380" as="sourcePoint"/>
+                        <mxPoint x="-190" y="510" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+            </root>
+        </mxGraphModel>
+    </diagram>
+</mxfile>
\ No newline at end of file

From b8fee5f953ae731bdf59c8a2582d7e6588343ac2 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Mon, 24 Feb 2025 13:34:29 +0000
Subject: [PATCH 089/115] doc updates

---
 .gitignore                                    |  1 +
 CONTRIBUTING.md                               | 21 ++++++++++++++++++
 .../000-job-cleaner/README.md                 |  9 ++++++++
 docs/accountrootmanifest.md                   |  3 +++
 docs/helmcharts.md                            |  5 +++--
 docs/orchestration.md                         | 22 +++++++------------
 6 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 77189f41c..ca2084e62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ site
 .venv
 .DS_Store
 build/bin/awktest.sh
+.venv
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5da5d84e5..761b65f29 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,27 @@
 Contributing to MAS Gitops
 ===============================================================================
 
+
+Documentation
+-------------------------------------------------------------------------------
+
+
+Versioned documentation is published automatically here: [https://ibm-mas.github.io/gitops/](https://ibm-mas.github.io/gitops/).
+Documentation source is located in the `docs` folder.
+
+To view your local documentation updates before pushing to git, run the following:
+
+```
+python3.9 -m venv .venv
+source .venv/bin/activate
+pip install --upgrade pip
+pip install mkdocs
+pip install mkdocs-redirects
+pip install mkdocs-macros-plugin
+pip install mkdocs-drawio-file
+mkdocs serve
+```
+
 Pre-Commit Hooks
 -------------------------------------------------------------------------------
 
diff --git a/cluster-applications/000-job-cleaner/README.md b/cluster-applications/000-job-cleaner/README.md
index 6fc09fd07..1ee944e64 100644
--- a/cluster-applications/000-job-cleaner/README.md
+++ b/cluster-applications/000-job-cleaner/README.md
@@ -1,2 +1,11 @@
 MAS SaaS Job Cleaner
 ===============================================================================
+
+Deploys the `mas-saas-job-cleaner-cron` CronJob, responsible for cleaning up orphaned Job resources in the cluster. It works by grouping Jobs in the cluster according to the `mas.ibm.com/job-cleanup-group` label, then deleting all Jobs from each group except for the one with the latest `creationTimestamp`.
+
+For safety, the CronJob is assigned a ServiceAccount that can only list and delete Job resources (so it can never delete any other type of resource). Furthermore, the logic ensures that only Job resources with the `mas.ibm.com/job-cleanup-group` label can be deleted.
+
+The `mas-devops-saas-job-cleaner` command executed by this CronJob is defined in [python-devops](https://github.com/ibm-mas/python-devops/blob/stable/bin/mas-devops-saas-job-cleaner).
+
+
+> In MaS SaaS, Job resources are routinely orphaned (i.e. marked for deletion by ArgoCD) since, when an update is required to an immutable Job field (e.g. its image tag), a new version of the Job resource must be created with a different name. When [auto_delete: false](https://ibm-mas.github.io/gitops/main/accountrootmanifest/#auto_delete) is set, ArgoCD will (by design) not perform this cleanup for us. Over time, Job resources will accumulate and put pressure on the K8S API server.
\ No newline at end of file
diff --git a/docs/accountrootmanifest.md b/docs/accountrootmanifest.md
index 595c4233b..51ded78ac 100644
--- a/docs/accountrootmanifest.md
+++ b/docs/accountrootmanifest.md
@@ -99,6 +99,9 @@ If `true`, ArgoCD will be permitted to automatically delete ArgoCD Applications
 
 If `false`, ArgoCD will never delete a resource automatically. Instead, when ArgoCD deems that a resource should be removed, it will simply flag it as "pending removal" (with a small yellow trashcan icon). In order for an ArgoCD Application or resource on the Target Cluster to actually be deleted, a manual sync with the `Prune` optional enabled must be issued for the ArgoCD Application that owns the resource.
 
+!!! note
+    **For gitops versions >= 3.11.0 only**, when `auto_delete: false` is set, the [job-cleaner](https://github.com/ibm-mas/gitops/tree/mascore5637/cluster-applications/000-job-cleaner) cluster Application is enabled. This deploys a CronJob that periodically removes specific Job resources according to their `mas.ibm.com/job-cleanup-group` label. This is to prevent the accumulation of old versions of Job resources without the need to manually run `Prune` sync operations. Note that any Job resources created in existing environments by prior versions of Gitops will lack the `mas.ibm.com/job-cleanup-group` label and so will still need to be cleaned up manually
+
 Since the **Cluster** and **Instance** root applications are generated by an Application Set, they behave slightly differently when `auto_delete` is `false`. They will be marked for removal if the `ibm-mas-cluster-base.yaml` or `ibm-mas-instance-base.yaml` files are removed from the {{ config_repo() }}. No indication will be given in the ArgoCD that this has occurred, but ArgoCD will stop synchronizing configuration changes to the Application. The user must manually issue a **delete** operation against the Application for it to be deleted.
 
 !!! warning
diff --git a/docs/helmcharts.md b/docs/helmcharts.md
index 30ecd6c4b..3feacdf3f 100644
--- a/docs/helmcharts.md
+++ b/docs/helmcharts.md
@@ -20,10 +20,11 @@ The following figure shows a tree of ArgoCD applications and Application Sets ge
 
 ## {{ cluster_root_chart() }} 
 
-**Cluster Root Applications** render the {{ cluster_root_chart() }}, which contains templates to generate ArgoCD Applications for configuring various dependencies shared by MAS instances on {{ target_clusters() }}.
+**Cluster Root Applications** render the {{ cluster_root_chart() }}, which contains templates to generate ArgoCD Applications for configuring various dependencies and supporting services shared by MAS instances on {{ target_clusters() }}.
 
 | Application | Template | Helm Chart |
 |-|-|-|
+|Job Cleaner | {{ gitops_repo_file_link("root-applications/ibm-mas-cluster-root/templates/000-job-cleaner.yaml", "000-job-cleaner.yaml") }} | {{ gitops_repo_dir_link("cluster-applications/000-job-cleaner", "000-job-cleaner") }} |
 |IBM Operator Catalog | {{ gitops_repo_file_link("root-applications/ibm-mas-cluster-root/templates/000-ibm-operator-catalog-app.yaml", "000-ibm-operator-catalog-app.yaml") }} | {{ gitops_repo_dir_link("cluster-applications/000-ibm-operator-catalog", "000-ibm-operator-catalog") }} |
 |Redhat Certificate Manager | {{ gitops_repo_file_link("root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml", "010-ibm-redhat-cert-manager-app.yaml") }} | {{ gitops_repo_dir_link("cluster-applications/010-redhat-cert-manager", "010-redhat-cert-manager") }} |
 |Data Reporter Operator (DRO) | {{ gitops_repo_file_link("root-applications/ibm-mas-cluster-root/templates/020-ibm-dro-app.yaml", "020-ibm-dro-app.yaml") }} | {{ gitops_repo_dir_link("cluster-applications/020-ibm-dro", "020-ibm-dro") }} |
@@ -31,6 +32,7 @@ The following figure shows a tree of ArgoCD applications and Application Sets ge
 |NFD Operator | {{ gitops_repo_file_link("root-applications/ibm-mas-cluster-root/templates/050-nfd-operator-app.yaml", "050-nfd-operator-app.yaml") }} | {{ gitops_repo_dir_link("cluster-applications/050-nfd-operator", "050-nfd-operator") }} |
 |Nvidia GPU Operator | {{ gitops_repo_file_link("root-applications/ibm-mas-cluster-root/templates/051-nvidia-gpu-operator-app.yaml", "051-nvidia-gpu-operator-app.yaml") }} | {{ gitops_repo_dir_link("cluster-applications/051-nvidia-gpu-operator", "051-nvidia-gpu-operator") }} |
 |Custom Cluster Service Accounts | {{ gitops_repo_file_link("root-applications/ibm-mas-cluster-root/templates/060-custom-sa.yaml", "060-custom-sa.yaml") }} | {{ gitops_repo_dir_link("cluster-applications/060-custom-sa", "060-custom-sa") }} |
+
 The {{ cluster_root_chart() }} also installs the {{ instance_root_app_set() }}. This generates a set of **Instance Root Applications** based on the configuration in the {{  config_repo() }}.  
 
 ## {{ instance_root_chart() }} 
@@ -53,7 +55,6 @@ The {{ cluster_root_chart() }} also installs the {{ instance_root_app_set() }}.
 |Analytics Engine powered by Apache Spark (Spark) | {{ gitops_repo_file_link("root-applications/ibm-mas-instance-root/templates/120-ibm-spark-app.yaml", "120-ibm-spark-app.yaml") }} | {{ gitops_repo_dir_link("instance-applications/120-ibm-spark", "120-ibm-spark") }} |
 |SPSS Modeler | {{ gitops_repo_file_link("root-applications/ibm-mas-instance-root/templates/120-ibm-spss-app.yaml", "120-ibm-spss-app.yaml") }} | {{ gitops_repo_dir_link("instance-applications/120-ibm-spss", "120-ibm-spss") }} |
 
-gitops/root-applications/ibm-mas-instance-root/templates/120-ibm-spss-app.yaml
 ##### MAS Core Platform
 
 This includes the suite, suite configurations and core workspaces
diff --git a/docs/orchestration.md b/docs/orchestration.md
index d5ef83ea4..60324bbf8 100644
--- a/docs/orchestration.md
+++ b/docs/orchestration.md
@@ -63,25 +63,19 @@ The set of Custom Resource Healthchecks required by MAS GitOps can be found in t
 Resource Hooks
 -------------------------------------------------------------------------------
 
-Configuration tasks have to be performed at various points during the MAS synchronization procedure. We achieve this via the use of ArgoCD [Resource Hooks](https://argo-cd.readthedocs.io/en/stable/user-guide/resource_hooks/).
+Configuration tasks have to be performed at various points during the MAS synchronization procedure. We achieve this via the use of Kubernetes Jobs (and supporting resources) annotated as ArgoCD [Resource Hooks](https://argo-cd.readthedocs.io/en/stable/user-guide/resource_hooks/).
 
 
-#### PreSync Hooks
-Tasks that must be performed **before** an Application begins syncing are defined as `PreSync` hooks. These are used, for example, to verify that cluster CRDs are present before proceeding with an installation (e.g. {{ gitops_repo_file_link("instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml", "00-presync-await-crd_Job") }}).
+### PreSync Hooks
+Jobs that must execute **before** an Application begins syncing are defined as `PreSync` hooks. These are used, for example, to verify that cluster CRDs are present before proceeding with an installation (e.g. {{ gitops_repo_file_link("instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml", "00-presync-await-crd_Job") }}).
 
 
-### "PostSync" Hooks
-Tasks that must be performed **after** an Application finishes syncing (before **before** it can report `Healthy`) are performed by Kubernetes Jobs in the final sync wave of the Application.
-
-Jobs of this kind typically perform some post-install configuration (e.g. {{ gitops_repo_file_link("instance-applications/120-ibm-db2u-database/templates/05-postsync-setup-db2_Job.yaml", "05-postsync-setup-db2_Job") }}) and/or register some runtime-generated information as a secret in the {{ secrets_vault() }} for use by downstream applications (e.g. {{ gitops_repo_file_link("cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml", "08-postsync-update-sm_Job") }}).
-
-
-!!! info
-
-    You may notice that we do not actually use the `PostSync` ArgoCD annotation on many of these Jobs. This is because the completion status of Jobs annotated as `PostSync` is not taken into account when computing the overall health status of an application. Since the tasks we perform are typically required steps that must be performed before downstream applications in later sync waves are allowed to sync, we instead use "ordinary" Kuberenetes Jobs. Since the health status of "ordinary" Kubernetes Jobs **is** taken into account, subsequent sync waves will not be allowed to start until the Job has completed successfully.
-
+### PostSync Hooks
+Jobs that must be execute **after** an Application finishes syncing are defined as `PostSync` hooks. We make use of `PostSync` hooks only in limited cases where the Job is not performing a critical task that another Application in a later syncwave depends upon. This is because ArgoCD deliberately excludes hooks resources -- including `PostSync` hook Jobs -- from the health evaluation of the Application that owns it, meaning that sibling Applications in later syncwaves will be permitted to begin syncing regardless of the `PostSync` hook's completion status.
 
+Where the task being performed *must* occur before Applications in later sync waves are permitted to begin syncing, we use "ordinary" Kubernetes Jobs (i.e. no `argocd.argoproj.io/hook` annotation) assigned to the final sync wave of the Application. When configured in this manner, the completion status of the Job *is* taken into account when evaluating the health of the Application it belongs to; and so will block synchronization of Applications in later sync waves until it completes successfully. Jobs of this kind typically perform post-install configuration (e.g. {{ gitops_repo_file_link("instance-applications/120-ibm-db2u-database/templates/05-postsync-setup-db2_Job.yaml", "05-postsync-setup-db2_Job") }}) and/or register some runtime-generated information as a secret in the {{ secrets_vault() }} for use by Applications in later sync waves (e.g. {{ gitops_repo_file_link("cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml", "08-postsync-update-sm_Job") }}).
 
 ### PostDelete Hooks
 
-Tasks that must be performed to ensure an orderly teardown of resources when configuration files are deleted from the {{ config_repo() }}.  For example, Suite Config CRs (e.g. `MongoCfg`) cannot be pruned by ArgoCD since they are assigned the `Suite` as an owner during reconciliation. To work around this, we use PostDelete hooks to issue `oc delete` commands (e.g. {{ gitops_repo_file_link("instance-applications/130-ibm-mas-mongo-config/templates/postdelete-delete-cr.yaml", "postdelete-delete-cr") }}). 
\ No newline at end of file
+Tasks that must be performed to ensure an orderly teardown of resources when configuration files are deleted from the {{ config_repo() }}.  For example, Suite Config CRs (e.g. `MongoCfg`) cannot be pruned by ArgoCD since they are assigned the `Suite` as an owner during reconciliation. To work around this, we use PostDelete hooks to issue `oc delete` commands (e.g. {{ gitops_repo_file_link("instance-applications/130-ibm-mas-mongo-config/templates/postdelete-delete-cr.yaml", "postdelete-delete-cr") }}). 
+

From 3a25e876232bb25ab3f24d9e77f0405ebbcc7692 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Mon, 3 Mar 2025 11:49:30 +0000
Subject: [PATCH 090/115] update job with new conventions

---
 .../templates/10-postsync-setup-hadr.yaml     | 45 +++++++++++++++++--
 1 file changed, 41 insertions(+), 4 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 c35884c1c..96142ac4b 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
@@ -1,4 +1,43 @@
 {{ if and (default .Values.replica_db false) (contains "sdb" .Values.db2_instance_name) }}
+
+
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "postsync-setup-hadr" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.5.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v2" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
 ---
 kind: ServiceAccount
 apiVersion: v1
@@ -80,9 +119,7 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  # Suffix the Job name with a hash of all chart values
-  # This is to ensure that ArgoCD will delete and recreate the job if (and only if) anything changes in the DB2 config
-  name: postsync-setup-hadr-{{ .Values.db2_instance_name }}-v1-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: "{{ .Values.db2_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "130"
@@ -102,7 +139,7 @@ spec:
       serviceAccountName: "postsync-hadr-sa-{{ .Values.db2_instance_name }}"
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From 30227a90652dbda31cde978f5427e997ec164add Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Mon, 3 Mar 2025 11:56:26 +0000
Subject: [PATCH 091/115] update new job to conform to new conventions

---
 .../templates/10-postsync-setup-hadr.yaml     | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 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 96142ac4b..e0064f21e 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
@@ -27,7 +27,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 := "v2" }}
+{{- $_job_version := "v3" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -38,6 +38,27 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
+NOTE: this is one of those cases; we need a separate cleanup group for each DB2 database
+
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix .Values.db2_instance_name | sha1sum }}
+
 ---
 kind: ServiceAccount
 apiVersion: v1
@@ -123,8 +144,9 @@ metadata:
   namespace: "{{ .Values.db2_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "130"
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:

From 230ab6f24ee7cb4cd570e67c00496a02fe04cec5 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Mon, 3 Mar 2025 12:01:57 +0000
Subject: [PATCH 092/115] bump job version

---
 .../templates/07-postsync-setup-db2_Job.yaml                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index f09361828..4a5ff89dd 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -26,7 +26,7 @@ Increment this value whenever you make a change to an immutable field of the Job
 E.g. passing in a new environment variable.
 Included in $_job_hash (see below).
 */}}
-{{- $_job_version := "v6" }}
+{{- $_job_version := "v7" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag

From 4a4c906b351e94c89d2a41efb5d711ae17901283 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 4 Mar 2025 09:16:23 +0000
Subject: [PATCH 093/115] update job to conform to new conventions

---
 .../templates/02-ibm-spark-control-plane.yaml | 42 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml b/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml
index 52ba5feb1..afcf11492 100644
--- a/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml
+++ b/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml
@@ -1,3 +1,41 @@
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "spark-control-plane-patch" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.5.0" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v2" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
 ---
 kind: ServiceAccount
 apiVersion: v1
@@ -55,7 +93,7 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: spark-control-plane-patch-job-v1-{{ omit .Values "junitreporter" | toYaml | adler32sum }}
+  name: {{ $_job_name }}
   namespace: "{{ .Values.cpd_operators_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "095"
@@ -73,7 +111,7 @@ spec:
     spec:
       containers:
         - name: run
-          image: quay.io/ibmmas/cli:latest
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:

From b0f4836bab13f4a97fa9f6999c304ea61e988b59 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 4 Mar 2025 09:22:01 +0000
Subject: [PATCH 094/115] add cleanup_group, update _cli_image_tag

---
 .../templates/02-ibm-spark-control-plane.yaml | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml b/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml
index afcf11492..cfab891c9 100644
--- a/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml
+++ b/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.7.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
@@ -35,6 +35,25 @@ immutable field of any existing Job resource.
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
+
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
 
 ---
 kind: ServiceAccount
@@ -97,8 +116,9 @@ metadata:
   namespace: "{{ .Values.cpd_operators_namespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "095"
-{{- if .Values.custom_labels }}
   labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
 {{ .Values.custom_labels | toYaml | indent 4 }}
 {{- end }}
 spec:

From eb146e1f347e60f0c91e241ef70c53c6b99e0621 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 6 Mar 2025 11:47:05 +0000
Subject: [PATCH 095/115] resume job-cleaner for SRE staging test

---
 .../000-job-cleaner/templates/04-jobcleaner_CronJob.yaml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
index 9af16a36f..fbbd00bbf 100644
--- a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
+++ b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
@@ -77,7 +77,7 @@ metadata:
 {{- end }}
 spec:
   schedule: '* * * * *'
-  suspend: true
+  suspend: false
   concurrencyPolicy: Forbid
   jobTemplate:
     spec:

From 3d01573ef8209ae4c45df2ef631f196f4d55eb48 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 6 Mar 2025 12:00:12 +0000
Subject: [PATCH 096/115] update cli image tag for test in SRE staging

---
 .../templates/04-postsync-update-sm_Job.yaml                    | 2 +-
 .../020-ibm-dro/templates/08-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/postdelete-MarketplaceConfigs.yaml                | 2 +-
 .../templates/postdelete-ProfileBundles.yaml                    | 2 +-
 .../055-instana-agent-operator/templates/08-CronJob.yaml        | 2 +-
 .../060-custom-sa/templates/04-postsync-update-sm_Job.yaml      | 2 +-
 .../200-cluster-promotion/templates/02-cluster-verify_Job.yaml  | 2 +-
 .../templates/03-cluster-promoter_Job.yaml                      | 2 +-
 .../010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml  | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml   | 2 +-
 .../templates/PostDelete-aws-docdb-remove-user_Job.yaml         | 2 +-
 .../100-ibm-sls/templates/07-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/04-ibm-cp4d_prereqs_ops.yaml                      | 2 +-
 .../templates/04-ibm-cp4d_upg_cleanup.yaml                      | 2 +-
 .../110-ibm-cp4d/templates/00-ibm-cp4d-presync.yaml             | 2 +-
 .../110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml        | 2 +-
 .../110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml    | 2 +-
 .../110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml         | 2 +-
 .../110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml       | 2 +-
 .../templates/00-presync-await-crd_Job.yaml                     | 2 +-
 .../120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml    | 2 +-
 .../templates/07-postsync-setup-db2_Job.yaml                    | 2 +-
 .../120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml | 2 +-
 .../120-ibm-spark/templates/02-ibm-spark-control-plane.yaml     | 2 +-
 .../120-ibm-spss/templates/02-ibm-spss-post-verify.yaml         | 2 +-
 .../120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml           | 2 +-
 .../templates/00-presync-create-db2-user_Job.yaml               | 2 +-
 .../130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml     | 2 +-
 .../templates/postdelete-delete-db2-user_Job.yaml               | 2 +-
 .../130-ibm-kafka-config/templates/postdelete-delete-cr.yaml    | 2 +-
 .../130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml | 2 +-
 .../130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml  | 2 +-
 .../templates/06-postsync-configtool-oidc.yaml                  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../templates/05-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/00-presync-add-mvi-scc_Job.yaml                   | 2 +-
 .../templates/06-postsync-add-mvi-scc_Job.yaml                  | 2 +-
 .../templates/02-ibm-manage-update_Job.yaml                     | 2 +-
 .../templates/04-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/04-postsync-manage-sanity.yaml                    | 2 +-
 .../templates/04-postsync-manage-verify.yaml                    | 2 +-
 .../templates/04-postsync-maximoit-sanity.yaml                  | 2 +-
 .../templates/04-postsync-maximoit-verify.yaml                  | 2 +-
 .../templates/04-postsync-mvi-sanity.yaml                       | 2 +-
 .../templates/04-postsync-mvi-verify.yaml                       | 2 +-
 .../templates/700-702-postsync-db2-manage.yaml                  | 2 +-
 .../junitreporter/templates/00-presync-report-starter.yaml      | 2 +-
 .../junitreporter/templates/10-postsync-report-starter.yaml     | 2 +-
 53 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
index 74ce7f75c..7a9d5d2a2 100644
--- a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
@@ -17,7 +17,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
index dc3276056..a08f7a0aa 100644
--- a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
+++ b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
index aee684f3b..692d3a57f 100644
--- a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
+++ b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 
 {{ $job_name := "postdelete-delete-marketplaceconfigs-job" }}
diff --git a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
index 6002f0569..b0ef45ca6 100644
--- a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
+++ b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{ $job_name := "postdelete-delete-profilebundles-job" }}
 
diff --git a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
index 22ed9c409..d903d69ef 100644
--- a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
+++ b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 
 ---
diff --git a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
index 95517ae8e..1e997551d 100644
--- a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
index 00a0594a5..8f75f9f23 100644
--- a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
index 167f47621..a371aa864 100644
--- a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
index d1ff10ad0..a5a75ad51 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
index 436425ec6..1f39a0b87 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
index 36cc63cd3..734f7769c 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
index ab037d983..47c357665 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 
 # Deletes user "masinst_${MAS_INSTANCE_ID}" from docdb an deletes the acc/cluster/instance/mongo#password secret from AWS SM
diff --git a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
index 5d65644fa..816212870 100644
--- a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
+++ b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
index 6caa4c109..1471d65bc 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
index c845cc3fd..d4f48e2a8 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/00-ibm-cp4d-presync.yaml b/instance-applications/110-ibm-cp4d/templates/00-ibm-cp4d-presync.yaml
index c665a76b2..ae902e0a0 100644
--- a/instance-applications/110-ibm-cp4d/templates/00-ibm-cp4d-presync.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/00-ibm-cp4d-presync.yaml
@@ -24,7 +24,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
index 5310bcf5f..1bbc29e07 100644
--- a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
index 32d3d6f0d..83a7576b5 100644
--- a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
@@ -8,7 +8,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
index 11de6d640..7788e5fa5 100644
--- a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
index 27c61c235..dc3fa5a08 100644
--- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
index 6d4b823bb..3673da267 100644
--- a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
@@ -1,7 +1,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 ---
 # Service account that is authorized to read k8s secrets (needed by the job)
diff --git a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
index 1382478c6..3261db283 100644
--- a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 #apiVersion: batch/v1beta1
 kind: CronJob
diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index 80a1e1a88..b73857480 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
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 e0064f21e..9962d4fd7 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
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.5.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml b/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml
index cfab891c9..ae0f80de8 100644
--- a/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml
+++ b/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
index 37f3af092..0b3acf21d 100644
--- a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
+++ b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
index 1adea70a5..f315b4f42 100644
--- a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
+++ b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
index 475d6c0b7..457b1de70 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{ $ns := printf "mas-%s-core" .Values.instance_id }}
 {{ $prefix := printf "pre-jdbc-usr-%s" .Values.mas_config_name }}
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 e7c2e7224..a6fdce536 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
index 2991af438..43678166f 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{ $ns := printf "mas-%s-syncres" .Values.instance_id }}
 {{ $prefix := printf "post-jdbc-usr-%s" .Values.mas_config_name }}
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 05ac50175..a4229eda7 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
@@ -18,7 +18,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 ---
 apiVersion: batch/v1
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 15ad5bcfa..fa5cc09da 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 15ad5bcfa..fa5cc09da 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 6ecdc3652..55afac07f 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 15ad5bcfa..fa5cc09da 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 15ad5bcfa..fa5cc09da 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
index fa623e6b9..a35e1bf8b 100644
--- a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 8c62558ff..5f24dfbd8 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
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 15ad5bcfa..fa5cc09da 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
index 80f811ff4..1b1e82a69 100644
--- a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
@@ -8,7 +8,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 ---
 # Permit outbound communication by the Job pods
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
index a60dffa84..531da3a88 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
index c13811bf3..15be15973 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
index 68351cfb8..b4fbd8141 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $prefix := printf "%s-manage-update" .Values.mas_workspace_id}}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
index 1fe93dfdd..2b746e3f8 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
@@ -6,7 +6,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $job_label :=  "mas-app-route-patch" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
index a099fb74b..49c6ab54c 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
index c8171085d..921db375f 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 # A verify test is one that is non disruptive i.e. it won't create new users, i won't call authenticated apis, and it won't creates resources 
 # in the application. This type of test is run on every environment and allows a layer of verification of the app
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
index 920c83515..26f33a424 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
index 475c2f78a..08bf7680d 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
index 9fba2c242..a1530335c 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{ $ns               :=  .Values.mas_app_namespace }}
 {{ $np_name          :=  "postsync-sanity-mvi-np" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
index 10db0f276..7a69b3ebf 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 
 {{ $ns               :=  .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index 4cef29d46..89301746b 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -86,7 +86,7 @@ will take care of differentiating the jobs.
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
index dc0c50fa2..b1032ea63 100644
--- a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 
 {{ $prefix := printf "pre-jreporter-%s" .Values.reporter_name }}
diff --git a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
index 1b04ff25b..cba15eea9 100644
--- a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.7.0" }}
+{{- $_cli_image_tag := "13.10.1" }}
 
 {{ $preprefix := printf "pre-jreporter-%s" .Values.reporter_name }}
 {{ $time_cm := printf "%s-synctime" $preprefix }}

From ee027f1d46c9d261bf60e794fb571bccc994ad14 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Fri, 28 Mar 2025 09:49:19 +0000
Subject: [PATCH 097/115] update CLI image tag

---
 .../templates/04-postsync-update-sm_Job.yaml                    | 2 +-
 .../020-ibm-dro/templates/08-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/postdelete-MarketplaceConfigs.yaml                | 2 +-
 .../templates/postdelete-ProfileBundles.yaml                    | 2 +-
 .../055-instana-agent-operator/templates/08-CronJob.yaml        | 2 +-
 .../060-custom-sa/templates/04-postsync-update-sm_Job.yaml      | 2 +-
 .../200-cluster-promotion/templates/02-cluster-verify_Job.yaml  | 2 +-
 .../templates/03-cluster-promoter_Job.yaml                      | 2 +-
 .../010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml  | 2 +-
 .../010-ibm-sync-jobs/templates/00-ibm-cp4d-presync.yaml        | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml   | 2 +-
 .../templates/PostDelete-aws-docdb-remove-user_Job.yaml         | 2 +-
 .../100-ibm-sls/templates/07-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/04-ibm-cp4d_prereqs_ops.yaml                      | 2 +-
 .../templates/04-ibm-cp4d_upg_cleanup.yaml                      | 2 +-
 .../110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml        | 2 +-
 .../110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml    | 2 +-
 .../110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml         | 2 +-
 .../110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml       | 2 +-
 .../templates/00-presync-await-crd_Job.yaml                     | 2 +-
 .../120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml    | 2 +-
 .../templates/07-postsync-setup-db2_Job.yaml                    | 2 +-
 .../120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml | 2 +-
 .../120-ibm-spark/templates/02-ibm-spark-control-plane.yaml     | 2 +-
 .../120-ibm-spss/templates/02-ibm-spss-post-verify.yaml         | 2 +-
 .../120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml           | 2 +-
 .../templates/00-presync-create-db2-user_Job.yaml               | 2 +-
 .../130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml     | 2 +-
 .../templates/postdelete-delete-db2-user_Job.yaml               | 2 +-
 .../130-ibm-kafka-config/templates/postdelete-delete-cr.yaml    | 2 +-
 .../130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml | 2 +-
 .../130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml  | 2 +-
 .../templates/06-postsync-configtool-oidc.yaml                  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../templates/05-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/00-presync-add-mvi-scc_Job.yaml                   | 2 +-
 .../templates/06-postsync-add-mvi-scc_Job.yaml                  | 2 +-
 .../templates/02-ibm-manage-update_Job.yaml                     | 2 +-
 .../templates/04-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/04-postsync-manage-sanity.yaml                    | 2 +-
 .../templates/04-postsync-manage-verify.yaml                    | 2 +-
 .../templates/04-postsync-maximoit-sanity.yaml                  | 2 +-
 .../templates/04-postsync-maximoit-verify.yaml                  | 2 +-
 .../templates/04-postsync-mvi-sanity.yaml                       | 2 +-
 .../templates/04-postsync-mvi-verify.yaml                       | 2 +-
 .../templates/700-702-postsync-db2-manage.yaml                  | 2 +-
 .../junitreporter/templates/00-presync-report-starter.yaml      | 2 +-
 .../junitreporter/templates/10-postsync-report-starter.yaml     | 2 +-
 53 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
index 7a9d5d2a2..13f535464 100644
--- a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
@@ -17,7 +17,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
index a08f7a0aa..f1545508f 100644
--- a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
+++ b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
index 692d3a57f..8f7a1e335 100644
--- a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
+++ b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 
 {{ $job_name := "postdelete-delete-marketplaceconfigs-job" }}
diff --git a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
index b0ef45ca6..ad4a1856e 100644
--- a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
+++ b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{ $job_name := "postdelete-delete-profilebundles-job" }}
 
diff --git a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
index d903d69ef..e9b1bbd5b 100644
--- a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
+++ b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 
 ---
diff --git a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
index 1e997551d..3aca947c1 100644
--- a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
index 8f75f9f23..01ed56407 100644
--- a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
index a371aa864..569984f24 100644
--- a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
index a5a75ad51..dea6fb750 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/00-ibm-cp4d-presync.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-ibm-cp4d-presync.yaml
index a10d9f2d1..0236c749a 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/00-ibm-cp4d-presync.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/00-ibm-cp4d-presync.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
index 1f39a0b87..dc31e74e3 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
index 734f7769c..212c8d5dc 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.2-pre.suitednstweak-amd64" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
index 47c357665..c1f2e6c5c 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 
 # Deletes user "masinst_${MAS_INSTANCE_ID}" from docdb an deletes the acc/cluster/instance/mongo#password secret from AWS SM
diff --git a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
index 816212870..043adfbd5 100644
--- a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
+++ b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
index 1471d65bc..1ad2a099a 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
index d4f48e2a8..1e4f5362a 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
index 1bbc29e07..479ad08ac 100644
--- a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
index 83a7576b5..569a264f1 100644
--- a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
@@ -8,7 +8,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
index 7788e5fa5..d04b746aa 100644
--- a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
index dc3fa5a08..9a26b3a13 100644
--- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
index 3673da267..a027f24ff 100644
--- a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
@@ -1,7 +1,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 ---
 # Service account that is authorized to read k8s secrets (needed by the job)
diff --git a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
index 3261db283..0ca6d68d7 100644
--- a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 #apiVersion: batch/v1beta1
 kind: CronJob
diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index 83535f569..b0a1dc24d 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
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 9962d4fd7..f3ce4099f 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
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml b/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml
index ae0f80de8..2e8234a65 100644
--- a/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml
+++ b/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
index 0b3acf21d..6d4f672bf 100644
--- a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
+++ b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
index f315b4f42..efa789270 100644
--- a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
+++ b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
index 457b1de70..a62d6b3d0 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{ $ns := printf "mas-%s-core" .Values.instance_id }}
 {{ $prefix := printf "pre-jdbc-usr-%s" .Values.mas_config_name }}
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 a6fdce536..d8c8975d8 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
index 43678166f..4d3be898b 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{ $ns := printf "mas-%s-syncres" .Values.instance_id }}
 {{ $prefix := printf "post-jdbc-usr-%s" .Values.mas_config_name }}
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 a4229eda7..bdb2f0858 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
@@ -18,7 +18,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 ---
 apiVersion: batch/v1
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 fa5cc09da..7d484db94 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 fa5cc09da..7d484db94 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 55afac07f..416c61ae2 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 fa5cc09da..7d484db94 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 fa5cc09da..7d484db94 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
index a35e1bf8b..70466ef4d 100644
--- a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 5f24dfbd8..2e776bbdb 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
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 fa5cc09da..7d484db94 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
index 1b1e82a69..370a8a47e 100644
--- a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
@@ -8,7 +8,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 ---
 # Permit outbound communication by the Job pods
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
index 531da3a88..ecad69dd0 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
index 15be15973..f7aadab2a 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
index b4fbd8141..f15ee5662 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $prefix := printf "%s-manage-update" .Values.mas_workspace_id}}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
index 2b746e3f8..b956c3bb8 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
@@ -6,7 +6,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $job_label :=  "mas-app-route-patch" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
index 49c6ab54c..15371939d 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
index 921db375f..6ba6c3551 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 # A verify test is one that is non disruptive i.e. it won't create new users, i won't call authenticated apis, and it won't creates resources 
 # in the application. This type of test is run on every environment and allows a layer of verification of the app
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
index 26f33a424..f8471a6c7 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
index e2bcf71ca..18fcf021d 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 # A verify test is one that is non disruptive i.e. it won't create new users, i won't call authenticated apis, and it won't creates resources 
 # in the application. This type of test is run on every environment and allows a layer of verification of the app
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
index a1530335c..a75be6456 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{ $ns               :=  .Values.mas_app_namespace }}
 {{ $np_name          :=  "postsync-sanity-mvi-np" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
index 7a69b3ebf..fb7b337b6 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 
 {{ $ns               :=  .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index 89301746b..5b22391b7 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -86,7 +86,7 @@ will take care of differentiating the jobs.
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
index b1032ea63..dbb4a4bee 100644
--- a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 
 {{ $prefix := printf "pre-jreporter-%s" .Values.reporter_name }}
diff --git a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
index cba15eea9..311554fa0 100644
--- a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.10.1" }}
+{{- $_cli_image_tag := "13.13.1" }}
 
 {{ $preprefix := printf "pre-jreporter-%s" .Values.reporter_name }}
 {{ $time_cm := printf "%s-synctime" $preprefix }}

From 433277301b1e66bbe477237791f47ebbc406cc2c Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Fri, 28 Mar 2025 13:25:13 +0000
Subject: [PATCH 098/115] [minor] first pass at initial user creation job

https://jsw.ibm.com/browse/MASCORE-6072
---
 .../600-ibm-post-sync-jobs/Chart.yaml         |  12 +
 .../600-ibm-post-sync-jobs/README.md          |   5 +
 .../001-ibm-create-initial-users.yaml         | 291 ++++++++++++++++++
 .../600-ibm-post-sync-jobs/values.yaml        |   1 +
 .../templates/600-ibm-post-sync-jobs.yaml     |  87 ++++++
 5 files changed, 396 insertions(+)
 create mode 100644 instance-applications/600-ibm-post-sync-jobs/Chart.yaml
 create mode 100644 instance-applications/600-ibm-post-sync-jobs/README.md
 create mode 100644 instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
 create mode 100644 instance-applications/600-ibm-post-sync-jobs/values.yaml
 create mode 100644 root-applications/ibm-mas-instance-root/templates/600-ibm-post-sync-jobs.yaml

diff --git a/instance-applications/600-ibm-post-sync-jobs/Chart.yaml b/instance-applications/600-ibm-post-sync-jobs/Chart.yaml
new file mode 100644
index 000000000..20d884e33
--- /dev/null
+++ b/instance-applications/600-ibm-post-sync-jobs/Chart.yaml
@@ -0,0 +1,12 @@
+apiVersion: v2
+name: ibm-post-sync-jobs
+description: |
+  Jobs that perform various tasks AFTER all MAS applications are synced and healthy
+type: application
+version: 1.0.0
+
+dependencies:
+- name: junitreporter
+  version: 1.0.0
+  repository: "file://../../sub-charts/junitreporter/"
+  condition: junitreporter.devops_mongo_uri != ""
\ No newline at end of file
diff --git a/instance-applications/600-ibm-post-sync-jobs/README.md b/instance-applications/600-ibm-post-sync-jobs/README.md
new file mode 100644
index 000000000..8c29ec9a8
--- /dev/null
+++ b/instance-applications/600-ibm-post-sync-jobs/README.md
@@ -0,0 +1,5 @@
+IBM MAS Post Sync Jobs
+===============================================================================
+Instantiated by the /gitops/root-applications/ibm-mas-instance-root/templates/600-ibm-post-sync-jobs.yaml root application.
+
+Defines Jobs to perform various tasks that need to happen after MAS applications are installed and ready.
\ No newline at end of file
diff --git a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
new file mode 100644
index 000000000..b4917627a
--- /dev/null
+++ b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
@@ -0,0 +1,291 @@
+{{- if not (empty .Values.mas_workspace_id) }}
+{{- if eq .Values.mas_is_active }}
+
+{{- /*
+Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.
+*/}}
+{{- $_job_name_prefix := "ibm-create-initial-users" }}
+
+{{- /*
+Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_tag := "13.14.0-pre.mascore6072" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v1" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
+
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
+
+
+
+{{ $ns :=               printf "mas-%s-postsyncjobs" .Values.instance_id }}
+{{ $ns_core :=          printf "mas-%s-core"  .Values.instance_id }}
+{{ $ns_manage :=        printf "mas-%s-manage"  .Values.instance_id }}
+{{ $aws_secret :=       "aws"}}
+{{ $np_name :=          printf "%s-np" $_job_name_prefix }}
+{{ $role_core_name :=   printf "%s-r-core"  $_job_name_prefix }}
+{{ $role_manage_name := printf "%s-r-manage"  $_job_name_prefix }}
+{{ $sa_name :=          printf "%s-sa" $_job_name_prefix }}
+{{ $rb_core_name :=     printf "%s-rb-core" $_job_name_prefix }}
+{{ $rb_manage_name :=   printf "%s-rb-manage" $_job_name_prefix }}
+{{ $job_label :=        printf "%s-l"  $_job_name_prefix }}
+
+
+
+
+---
+# Permit outbound communication by the Job pods
+# (Needed to communicate with the K8S HTTP API, AWS SM and internal services)
+kind: NetworkPolicy
+apiVersion: networking.k8s.io/v1
+metadata:
+  name: {{ $np_name }}
+  namespace: {{ $ns }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "000"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+spec:
+  podSelector:
+    matchLabels:
+      app: {{ $job_label }}
+  egress:
+    - {}
+  policyTypes:
+    - Egress
+
+
+---
+# needs to read the following secrets
+#   mas-{i}-core
+#     {i}-credentials-superuser in 
+#     {i}-admindashboard-cert-internal
+#     {i}-coreapi-cert-internal
+#   mas-{i}-manage
+#     {i}-internal-manage-tls
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: {{ $sa_name }}
+  namespace: {{ $ns }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "000"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+
+
+
+---
+
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ $role_core_name }}
+  namespace: {{ $ns_core }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "000"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+rules:
+  - verbs:
+      - get
+    apiGroups:
+      - ""
+    resources:
+      - secrets
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ rb_core_name }}
+  namespace: {{ $ns_core }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "001"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ $sa_name }}
+    namespace: {{ $ns }}
+roleRef:
+  kind: Role
+  name: {{ $role_core_name }}
+  apiGroup: rbac.authorization.k8s.io
+
+
+---
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ $role_manage_name }}
+  namespace: {{ $ns_manage }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "000"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+rules:
+  - verbs:
+      - get
+    apiGroups:
+      - ""
+    resources:
+      - secrets
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ rb_manage_name }}
+  namespace: {{ $ns_core }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "001"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ $sa_name }}
+    namespace: {{ $ns }}
+roleRef:
+  kind: Role
+  name: {{ $role_manage_name }}
+  apiGroup: rbac.authorization.k8s.io
+
+
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ $_job_name }}
+  namespace: {{ $ns }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "002"
+  labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+spec:
+  template:
+    metadata:
+      labels:
+        app: {{ $job_label }}
+{{- if .Values.custom_labels }}
+{{ .Values.custom_labels | toYaml | indent 8 }}
+{{- end }}
+    spec:
+      containers:
+        - name: {{ $_job_name_prefix }}
+          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
+          imagePullPolicy: IfNotPresent
+
+          env:
+            - name: ACCOUNT_ID
+              value: "{{ .Values.account_id }}"
+            - name: CLUSTER_ID
+              value: "{{ .Values.cluster_id }}"
+            - name: MAS_INSTANCE_ID
+              value: "{{ .Values.instance_id }}"
+            - name: MAS_WORKSPACE_ID
+              value: "{{ .Values.mas_workspace_id }}"
+
+            - name: SECRETS_KEY_SEPERATOR
+              value: "/"
+
+            - name: SM_AWS_REGION
+              value: "{{ .Values.sm_aws_region }}"
+
+            # Hard-coded for now:
+            - name: AVP_TYPE
+              value: "aws"
+
+          volumeMounts:
+            - name: "aws"
+              mountPath: /etc/mas/creds/aws
+          command:
+            - /bin/sh
+            - -c
+            - |
+
+              set -e
+
+              export SM_AWS_ACCESS_KEY_ID=$(cat /etc/mas/creds/aws/sm_aws_access_key_id)
+              export SM_AWS_SECRET_ACCESS_KEY=$(cat /etc/mas/creds/aws/sm_aws_secret_access_key)
+              source /mascli/functions/gitops_utils
+              sm_login
+
+              mas-devops-create-initial-users-for-saas \
+                  --mas-instance-id "${MAS_INSTANCE_ID}" \
+                  --mas-workspace-id "${MAS_WORKSPACE_ID}" \
+                  --initial-users-secret-name "${ACCOUNT_ID}/${CLUSTER_ID}/${MAS_INSTANCE_ID}/initial_users"
+              rc=$?
+              exit $rc
+
+      restartPolicy: Never
+
+      serviceAccountName: "{{ $sa_name }}"
+      volumes:
+        - name: "aws"
+          secret:
+            secretName: "{{ $aws_secret }}"
+            defaultMode: 420
+            optional: false
+
+  backoffLimit: 4
+
+{{- end }}
+{{- end }}
diff --git a/instance-applications/600-ibm-post-sync-jobs/values.yaml b/instance-applications/600-ibm-post-sync-jobs/values.yaml
new file mode 100644
index 000000000..ed97d539c
--- /dev/null
+++ b/instance-applications/600-ibm-post-sync-jobs/values.yaml
@@ -0,0 +1 @@
+---
diff --git a/root-applications/ibm-mas-instance-root/templates/600-ibm-post-sync-jobs.yaml b/root-applications/ibm-mas-instance-root/templates/600-ibm-post-sync-jobs.yaml
new file mode 100644
index 000000000..d3b514aae
--- /dev/null
+++ b/root-applications/ibm-mas-instance-root/templates/600-ibm-post-sync-jobs.yaml
@@ -0,0 +1,87 @@
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: postsyncjobs.{{ .Values.cluster.id }}.{{ .Values.instance.id }}
+  namespace: {{ .Values.argo.namespace }}
+  labels:
+    environment: '{{ .Values.account.id }}'
+    region: '{{ .Values.region.id }}'
+    cluster: '{{ .Values.cluster.id }}'
+    instance: '{{ .Values.instance.id }}'
+  annotations:
+    argocd.argoproj.io/sync-wave: "600"
+    {{- if and .Values.notifications .Values.notifications.slack_channel_id }}
+    notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }}
+    notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }}
+    {{- end }}
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+    - post-delete-finalizer.argocd.argoproj.io	
+    - post-delete-finalizer.argocd.argoproj.io/cleanup
+spec:
+  ignoreDifferences:
+  - group: '*'
+    kind: ServiceAccount
+    jsonPointers:
+    - /imagePullSecrets
+  project: "{{ .Values.argo.projects.apps }}"
+  destination:
+    server: {{ .Values.cluster.url }}
+    namespace: "mas-{{.Values.instance.id}}-postsyncjobs"
+  source:
+    repoURL: "{{ .Values.source.repo_url }}"
+    path: instance-applications/600-ibm-post-sync-jobs
+    targetRevision: "{{ .Values.source.revision }}"
+    plugin:
+      name: {{ .Values.avp.name }} 
+      env:
+        - name: {{ .Values.avp.values_varname }}
+          value: |
+            account_id: "{{ .Values.account.id }}"
+            region_id: "{{ .Values.region.id }}"
+            cluster_id: "{{ .Values.cluster.id }}"
+            instance_id: "{{ .Values.instance.id }}"
+
+            sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}"
+            sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}"
+            sm_aws_region: "{{ .Values.region.id }}"
+
+            {{- /* Just selects the first (and only) workspace. This will need more work in future if/when we add support for >1 workspace */ }}
+            {{- if not (empty .Values.ibm_mas_workspaces) }}
+            mas_workspace_id: "{{ (.Values.ibm_mas_workspaces | first).mas_workspace_id }}"
+            {{- end }}
+
+            {{- if not (empty .Values.ibm_mas_suite) }}
+            mas_is_active: {{ eq (index .Values.mas_annotations "mas.ibm.com/hyperscalerLifecycle") "active" }}
+            {{- end }}
+
+            {{- if .Values.custom_labels }}
+            custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }}
+            {{- end }}
+
+            junitreporter:
+              reporter_name: "ibm-postsync-jobs-{{ .Values.instance.id }}"
+              cluster_id: "{{ .Values.cluster.id }}"
+              devops_mongo_uri: "{{ .Values.devops.mongo_uri }}"
+              devops_build_number: "{{ .Values.devops.build_number }}"
+              gitops_version: "{{ .Values.source.revision }}"
+
+
+        - name: ARGOCD_APP_NAME
+          value: postsyncres
+        {{- if not (empty .Values.avp.secret) }}
+        - name: AVP_SECRET
+          value: {{ .Values.avp.secret }}
+        {{- end }}
+  syncPolicy:
+    automated:
+      {{- if .Values.auto_delete }}
+      prune: true
+      {{- end }}
+      selfHeal: true
+    retry:
+      limit: 20
+    syncOptions:
+      - CreateNamespace=true
+      - RespectIgnoreDifferences=true

From 0e7d69bc4da9d250b742d723d23502e26cb33e4f Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Fri, 28 Mar 2025 13:39:58 +0000
Subject: [PATCH 099/115] fix

---
 .../ibm-mas-instance-root/templates/600-ibm-post-sync-jobs.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root-applications/ibm-mas-instance-root/templates/600-ibm-post-sync-jobs.yaml b/root-applications/ibm-mas-instance-root/templates/600-ibm-post-sync-jobs.yaml
index d3b514aae..134c99cb1 100644
--- a/root-applications/ibm-mas-instance-root/templates/600-ibm-post-sync-jobs.yaml
+++ b/root-applications/ibm-mas-instance-root/templates/600-ibm-post-sync-jobs.yaml
@@ -47,7 +47,7 @@ spec:
             sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}"
             sm_aws_region: "{{ .Values.region.id }}"
 
-            {{- /* Just selects the first (and only) workspace. This will need more work in future if/when we add support for >1 workspace */ }}
+            {{- /* Just selects the first (and only) workspace. This will need more work in future if/when we add support for >1 workspace */}}
             {{- if not (empty .Values.ibm_mas_workspaces) }}
             mas_workspace_id: "{{ (.Values.ibm_mas_workspaces | first).mas_workspace_id }}"
             {{- end }}

From 2adddb4e428fbf1240332b9a5e2e1db549eaa320 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Fri, 28 Mar 2025 14:00:58 +0000
Subject: [PATCH 100/115] fix

---
 .../templates/600-ibm-post-sync-jobs.yaml              | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/root-applications/ibm-mas-instance-root/templates/600-ibm-post-sync-jobs.yaml b/root-applications/ibm-mas-instance-root/templates/600-ibm-post-sync-jobs.yaml
index 134c99cb1..9a95214b7 100644
--- a/root-applications/ibm-mas-instance-root/templates/600-ibm-post-sync-jobs.yaml
+++ b/root-applications/ibm-mas-instance-root/templates/600-ibm-post-sync-jobs.yaml
@@ -1,4 +1,10 @@
 ---
+
+{{- $ibm_mas_suite := default (dict) .Values.ibm_mas_suite -}}
+{{- $mas_annotations := default (dict) $ibm_mas_suite.mas_annotations -}}
+{{- $hyperscalerLifecycle := default "" (index $mas_annotations "mas.ibm.com/hyperscalerLifecycle") -}}
+{{- $mas_is_active := eq $hyperscalerLifecycle "active" }}
+
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
@@ -52,9 +58,7 @@ spec:
             mas_workspace_id: "{{ (.Values.ibm_mas_workspaces | first).mas_workspace_id }}"
             {{- end }}
 
-            {{- if not (empty .Values.ibm_mas_suite) }}
-            mas_is_active: {{ eq (index .Values.mas_annotations "mas.ibm.com/hyperscalerLifecycle") "active" }}
-            {{- end }}
+            mas_is_active: {{ $mas_is_active }}
 
             {{- if .Values.custom_labels }}
             custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }}

From 0e311deb1ceb2d83494a75b6d4e1f3cdaae91980 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Fri, 28 Mar 2025 14:41:50 +0000
Subject: [PATCH 101/115] fix

---
 .../templates/001-ibm-create-initial-users.yaml               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
index b4917627a..f095ac73e 100644
--- a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
+++ b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
@@ -146,7 +146,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ rb_core_name }}
+  name: {{ $rb_core_name }}
   namespace: {{ $ns_core }}
   annotations:
     argocd.argoproj.io/sync-wave: "001"
@@ -188,7 +188,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ rb_manage_name }}
+  name: {{ $rb_manage_name }}
   namespace: {{ $ns_core }}
   annotations:
     argocd.argoproj.io/sync-wave: "001"

From 4c3eda7a8bdeff51ab9acd3e2d3544d3e8199765 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Fri, 28 Mar 2025 14:45:47 +0000
Subject: [PATCH 102/115] fix

---
 .../templates/001-ibm-create-initial-users.yaml                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
index f095ac73e..a682ce95b 100644
--- a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
+++ b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
@@ -1,5 +1,5 @@
 {{- if not (empty .Values.mas_workspace_id) }}
-{{- if eq .Values.mas_is_active }}
+{{- if .Values.mas_is_active }}
 
 {{- /*
 Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash.

From ed6a0fc080ddd9c1c7fbdb2e2f2c892244792447 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Fri, 28 Mar 2025 14:49:18 +0000
Subject: [PATCH 103/115] fix (add aws secret)

---
 .../001-ibm-create-initial-users.yaml         | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
index a682ce95b..19a3fb737 100644
--- a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
+++ b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
@@ -75,6 +75,25 @@ are required here.
 
 
 
+---
+kind: Secret
+apiVersion: v1
+metadata:
+  name: {{ $aws_secret }}
+  namespace: {{ $ns }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "000"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+stringData:
+  aws_access_key_id: {{ .Values.sm_aws_access_key_id }}
+  aws_secret_access_key: {{ .Values.sm_aws_secret_access_key }}
+  aws_default_region: {{ .Values.sm_aws_region }}
+type: Opaque
+
+
 ---
 # Permit outbound communication by the Job pods
 # (Needed to communicate with the K8S HTTP API, AWS SM and internal services)

From 9771e8d4dd71d36980dd7a9f419d14e21e88ded5 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Fri, 28 Mar 2025 14:52:29 +0000
Subject: [PATCH 104/115] fix (aws creds path)

---
 .../templates/001-ibm-create-initial-users.yaml             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
index 19a3fb737..416a57d3e 100644
--- a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
+++ b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
@@ -27,7 +27,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 := "v1" }}
+{{- $_job_version := "v2" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -282,8 +282,8 @@ spec:
 
               set -e
 
-              export SM_AWS_ACCESS_KEY_ID=$(cat /etc/mas/creds/aws/sm_aws_access_key_id)
-              export SM_AWS_SECRET_ACCESS_KEY=$(cat /etc/mas/creds/aws/sm_aws_secret_access_key)
+              export SM_AWS_ACCESS_KEY_ID=$(cat /etc/mas/creds/aws/aws_access_key_id)
+              export SM_AWS_SECRET_ACCESS_KEY=$(cat /etc/mas/creds/aws/aws_secret_access_key)
               source /mascli/functions/gitops_utils
               sm_login
 

From 09f71470bf6c53f7f7625a76fc43db1e63b9ea56 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Fri, 28 Mar 2025 16:15:37 +0000
Subject: [PATCH 105/115] temporary change imagePullPolicy to Always

---
 .../templates/001-ibm-create-initial-users.yaml               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
index 416a57d3e..62b5b665b 100644
--- a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
+++ b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
@@ -27,7 +27,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 := "v2" }}
+{{- $_job_version := "v3" }}
 
 {{- /*
 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag
@@ -250,7 +250,7 @@ spec:
       containers:
         - name: {{ $_job_name_prefix }}
           image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
-          imagePullPolicy: IfNotPresent
+          imagePullPolicy: Always
 
           env:
             - name: ACCOUNT_ID

From bf41372974d351aa374f92cf0a9506c18bba3aca Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Fri, 28 Mar 2025 16:39:27 +0000
Subject: [PATCH 106/115] fix rb ns

---
 .../templates/001-ibm-create-initial-users.yaml                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
index 62b5b665b..611da50c9 100644
--- a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
+++ b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
@@ -208,7 +208,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ $rb_manage_name }}
-  namespace: {{ $ns_core }}
+  namespace: {{ $ns_manage }}
   annotations:
     argocd.argoproj.io/sync-wave: "001"
 {{- if .Values.custom_labels }}

From 56ff646f977e50cd722fbf7b4db734413e0d6d72 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 17 Apr 2025 16:29:45 +0100
Subject: [PATCH 107/115] update image tag ahead of merge

---
 .../000-job-cleaner/templates/04-jobcleaner_CronJob.yaml        | 2 +-
 .../templates/04-postsync-update-sm_Job.yaml                    | 2 +-
 .../020-ibm-dro/templates/08-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/postdelete-MarketplaceConfigs.yaml                | 2 +-
 .../templates/postdelete-ProfileBundles.yaml                    | 2 +-
 .../055-instana-agent-operator/templates/08-CronJob.yaml        | 2 +-
 .../060-custom-sa/templates/04-postsync-update-sm_Job.yaml      | 2 +-
 .../200-cluster-promotion/templates/02-cluster-verify_Job.yaml  | 2 +-
 .../templates/03-cluster-promoter_Job.yaml                      | 2 +-
 .../010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml  | 2 +-
 .../010-ibm-sync-jobs/templates/00-ibm-cp4d-presync.yaml        | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml | 2 +-
 .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml   | 2 +-
 .../templates/PostDelete-aws-docdb-remove-user_Job.yaml         | 2 +-
 .../100-ibm-sls/templates/07-postsync-update-sm_Job.yaml        | 2 +-
 .../templates/04-ibm-cp4d_prereqs_ops.yaml                      | 2 +-
 .../templates/04-ibm-cp4d_upg_cleanup.yaml                      | 2 +-
 .../110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml        | 2 +-
 .../110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml    | 2 +-
 .../110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml         | 2 +-
 .../110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml       | 2 +-
 .../templates/00-presync-await-crd_Job.yaml                     | 2 +-
 .../120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml    | 2 +-
 .../templates/07-postsync-setup-db2_Job.yaml                    | 2 +-
 .../120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml | 2 +-
 .../120-ibm-spark/templates/02-ibm-spark-control-plane.yaml     | 2 +-
 .../120-ibm-spss/templates/02-ibm-spss-post-verify.yaml         | 2 +-
 .../120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml           | 2 +-
 .../templates/00-presync-create-db2-user_Job.yaml               | 2 +-
 .../130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml     | 2 +-
 .../templates/postdelete-delete-db2-user_Job.yaml               | 2 +-
 .../130-ibm-kafka-config/templates/postdelete-delete-cr.yaml    | 2 +-
 .../130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml  | 2 +-
 .../130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml | 2 +-
 .../130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml  | 2 +-
 .../templates/06-postsync-configtool-oidc.yaml                  | 2 +-
 .../templates/postdelete-delete-cr.yaml                         | 2 +-
 .../templates/05-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/00-presync-add-mvi-scc_Job.yaml                   | 2 +-
 .../templates/06-postsync-add-mvi-scc_Job.yaml                  | 2 +-
 .../templates/02-ibm-manage-update_Job.yaml                     | 2 +-
 .../templates/04-postsync-add-label_Job.yaml                    | 2 +-
 .../templates/04-postsync-manage-sanity.yaml                    | 2 +-
 .../templates/04-postsync-manage-verify.yaml                    | 2 +-
 .../templates/04-postsync-maximoit-sanity.yaml                  | 2 +-
 .../templates/04-postsync-maximoit-verify.yaml                  | 2 +-
 .../templates/04-postsync-mvi-sanity.yaml                       | 2 +-
 .../templates/04-postsync-mvi-verify.yaml                       | 2 +-
 .../templates/700-702-postsync-db2-manage.yaml                  | 2 +-
 .../templates/001-ibm-create-initial-users.yaml                 | 2 +-
 .../junitreporter/templates/00-presync-report-starter.yaml      | 2 +-
 .../junitreporter/templates/10-postsync-report-starter.yaml     | 2 +-
 55 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
index fbbd00bbf..f82fe48c8 100644
--- a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
+++ b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml
@@ -1,7 +1,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.6.0-pre.mascore5637-amd64" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 
 {{- $ns := "job-cleaner" }}
diff --git a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
index 13f535464..4f5617c40 100644
--- a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
@@ -17,7 +17,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
index f1545508f..deea66c78 100644
--- a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
+++ b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
index 8f7a1e335..6baa705fd 100644
--- a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
+++ b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 
 {{ $job_name := "postdelete-delete-marketplaceconfigs-job" }}
diff --git a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
index ad4a1856e..db9828c97 100644
--- a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
+++ b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{ $job_name := "postdelete-delete-profilebundles-job" }}
 
diff --git a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
index e9b1bbd5b..cb3b81290 100644
--- a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
+++ b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml
@@ -2,7 +2,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 
 ---
diff --git a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
index 3aca947c1..8b4dd2985 100644
--- a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
index 01ed56407..b18b430ec 100644
--- a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
index 569984f24..2d9b4e91b 100644
--- a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
+++ b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
index dea6fb750..c9f6319c4 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/00-ibm-cp4d-presync.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-ibm-cp4d-presync.yaml
index 0236c749a..9cef29442 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/00-ibm-cp4d-presync.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/00-ibm-cp4d-presync.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
index dc31e74e3..acf480945 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
index 212c8d5dc..a375ca448 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.2-pre.suitednstweak-amd64" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
index c1f2e6c5c..cb3f95330 100644
--- a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
+++ b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 
 # Deletes user "masinst_${MAS_INSTANCE_ID}" from docdb an deletes the acc/cluster/instance/mongo#password secret from AWS SM
diff --git a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
index 043adfbd5..9ac081968 100644
--- a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
+++ b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
index 1ad2a099a..f89be5fb7 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
index 1e4f5362a..dfe046571 100644
--- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
+++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
index 479ad08ac..3c44c96a2 100644
--- a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
index 569a264f1..a414db137 100644
--- a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml
@@ -8,7 +8,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
index d04b746aa..b87049f86 100644
--- a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
index 9a26b3a13..9e9f61a73 100644
--- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
+++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
index a027f24ff..3e3a5c83a 100644
--- a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml
@@ -1,7 +1,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 ---
 # Service account that is authorized to read k8s secrets (needed by the job)
diff --git a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
index 0ca6d68d7..be0f0b96e 100644
--- a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 #apiVersion: batch/v1beta1
 kind: CronJob
diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
index b0a1dc24d..08781c13f 100644
--- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
+++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml
@@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
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 f3ce4099f..785f0eb02 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
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml b/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml
index 2e8234a65..d696ab390 100644
--- a/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml
+++ b/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
index 6d4f672bf..854f50591 100644
--- a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
+++ b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
index efa789270..a047e02e7 100644
--- a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
+++ b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
index a62d6b3d0..4e65c15f2 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{ $ns := printf "mas-%s-core" .Values.instance_id }}
 {{ $prefix := printf "pre-jdbc-usr-%s" .Values.mas_config_name }}
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 d8c8975d8..22ce22d50 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
index 4d3be898b..5b3d62063 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{ $ns := printf "mas-%s-syncres" .Values.instance_id }}
 {{ $prefix := printf "post-jdbc-usr-%s" .Values.mas_config_name }}
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 bdb2f0858..9c2e58932 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
@@ -18,7 +18,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 ---
 apiVersion: batch/v1
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 7d484db94..f580ddc86 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 7d484db94..f580ddc86 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 416c61ae2..98299a825 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 7d484db94..f580ddc86 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
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 7d484db94..f580ddc86 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
index 70466ef4d..21993b028 100644
--- a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml
@@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
index 2e776bbdb..65711166e 100644
--- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
+++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml
@@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
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 7d484db94..f580ddc86 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
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{ $cr_name := .Values.mas_config_name }}
 {{ $cr_kind := .Values.mas_config_kind }}
diff --git a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
index 370a8a47e..94e47562c 100644
--- a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
+++ b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml
@@ -8,7 +8,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 ---
 # Permit outbound communication by the Job pods
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
index ecad69dd0..05b2b948f 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
index f7aadab2a..e89204148 100644
--- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
+++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 
 {{ $ns := .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
index f15ee5662..0c8b06be4 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $prefix := printf "%s-manage-update" .Values.mas_workspace_id}}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
index b956c3bb8..a541748fb 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml
@@ -6,7 +6,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{ $ns        :=  .Values.mas_app_namespace }}
 {{ $job_label :=  "mas-app-route-patch" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
index 15371939d..8340def2d 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
index 6ba6c3551..b565d86dd 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 # A verify test is one that is non disruptive i.e. it won't create new users, i won't call authenticated apis, and it won't creates resources 
 # in the application. This type of test is run on every environment and allows a layer of verification of the app
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
index f8471a6c7..b80c92aa0 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
@@ -5,7 +5,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
index 18fcf021d..2feaab9d5 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 # A verify test is one that is non disruptive i.e. it won't create new users, i won't call authenticated apis, and it won't creates resources 
 # in the application. This type of test is run on every environment and allows a layer of verification of the app
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
index a75be6456..209bc72b1 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{ $ns               :=  .Values.mas_app_namespace }}
 {{ $np_name          :=  "postsync-sanity-mvi-np" }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
index fb7b337b6..8072f4121 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml
@@ -4,7 +4,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 
 {{ $ns               :=  .Values.mas_app_namespace }}
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
index 5b22391b7..132813b1c 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml
@@ -86,7 +86,7 @@ will take care of differentiating the jobs.
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
index 611da50c9..60154eaa4 100644
--- a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
+++ b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.14.0-pre.mascore6072" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
diff --git a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
index dbb4a4bee..4979ab990 100644
--- a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 
 {{ $prefix := printf "pre-jreporter-%s" .Values.reporter_name }}
diff --git a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
index 311554fa0..8877e62bb 100644
--- a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
@@ -3,7 +3,7 @@
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 */}}
-{{- $_cli_image_tag := "13.13.1" }}
+{{- $_cli_image_tag := "13.17.0" }}
 
 {{ $preprefix := printf "pre-jreporter-%s" .Values.reporter_name }}
 {{ $time_cm := printf "%s-synctime" $preprefix }}

From 0ec8a6ad2ab5d9962b466a7cc72d2d78947385e2 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 17 Apr 2025 16:31:39 +0100
Subject: [PATCH 108/115] use cli pre-release for users job

---
 .../templates/001-ibm-create-initial-users.yaml                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
index 60154eaa4..7e6a2e969 100644
--- a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
+++ b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.17.0" }}
+{{- $_cli_image_tag := "13.18.0-pre.mascore6072-amd64" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.

From 386f47cd2b1b75a7ccc80cc260afd7789a28a378 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 1 May 2025 16:17:31 +0100
Subject: [PATCH 109/115] use CLI image that has user creation script

---
 .../templates/001-ibm-create-initial-users.yaml      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
index 7e6a2e969..757707fa7 100644
--- a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
+++ b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_tag := "13.18.0-pre.mascore6072-amd64" }}
+{{- $_cli_image_digest := "sha256:cf4421c2569dc31bc1d29c6f66ad7e8df95b6a7d3ff2f858b77bb6077e4b28e9" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
@@ -27,14 +27,14 @@ 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_tag
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_digest
 This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
 immutable field of any existing Job resource.
 */}}
-{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_tag $_job_version | adler32sum }}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }}
 
 {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
 
@@ -249,8 +249,8 @@ spec:
     spec:
       containers:
         - name: {{ $_job_name_prefix }}
-          image: quay.io/ibmmas/cli:{{ $_cli_image_tag }}
-          imagePullPolicy: Always
+          image: quay.io/ibmmas/cli@{{ $_cli_image_digest }}
+          imagePullPolicy: IfNotPresent
 
           env:
             - name: ACCOUNT_ID

From 2a81df4a8957d6788afc7cd3d9bceac8e0572af0 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 1 May 2025 16:18:38 +0100
Subject: [PATCH 110/115] imagePullPolicy: IfNotPresent

---
 .../templates/04-postsync-update-sm_Job.yaml                    | 2 +-
 .../junitreporter/templates/00-presync-report-starter.yaml      | 2 +-
 .../junitreporter/templates/10-postsync-report-starter.yaml     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
index 8086d693a..6c1060cdb 100644
--- a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
+++ b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml
@@ -179,7 +179,7 @@ spec:
       containers:
         - name: run
           image: quay.io/ibmmas/cli@{{ $_cli_image_digest }}
-          imagePullPolicy: Always
+          imagePullPolicy: IfNotPresent
           resources:
             limits:
               cpu: 200m
diff --git a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
index 9f69ff7d1..2365f966e 100644
--- a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml
@@ -128,7 +128,7 @@ spec:
       containers:
         - name: run
           image: quay.io/ibmmas/cli@{{ $_cli_image_digest }}
-          imagePullPolicy: Always
+          imagePullPolicy: IfNotPresent
           resources:
             limits:
               cpu: 200m
diff --git a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
index 22a718f6b..22effdd9e 100644
--- a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
+++ b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml
@@ -128,7 +128,7 @@ spec:
       containers:
         - name: run
           image: quay.io/ibmmas/cli@{{ $_cli_image_digest }}
-          imagePullPolicy: Always
+          imagePullPolicy: IfNotPresent
           resources:
             limits:
               cpu: 200m

From 9e7fe96f5c8ebe4b2671fc7c1178564340280935 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Tue, 6 May 2025 14:49:01 +0100
Subject: [PATCH 111/115] use CLI image with latest merge of python-devops
 (13.21.0-pre.mascore6072-amd64)

---
 .../templates/001-ibm-create-initial-users.yaml               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
index 757707fa7..a091dd67d 100644
--- a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
+++ b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_digest := "sha256:cf4421c2569dc31bc1d29c6f66ad7e8df95b6a7d3ff2f858b77bb6077e4b28e9" }}
+{{- $_cli_image_digest := "sha256:196a773addb935b4b100ffadd33d6b597edd286db1f840f22e8c1a32eb09fbd6" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.
@@ -52,7 +52,7 @@ $_job_cleanup_group can usually just be based on $_job_name_prefix. There are so
 where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
 must be added to $_job_cleanup_group.
 
-By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminatorstest python-devops bui
 are required here.
 
 */}}

From 70787873426bae4e70addd4eb84bda033ecfaee9 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Thu, 8 May 2025 14:07:14 +0100
Subject: [PATCH 112/115] 13.22.0-pre.mascore6072-amd64

---
 .../templates/001-ibm-create-initial-users.yaml                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
index a091dd67d..e15d1daa3 100644
--- a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
+++ b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_digest := "sha256:196a773addb935b4b100ffadd33d6b597edd286db1f840f22e8c1a32eb09fbd6" }}
+{{- $_cli_image_digest := "sha256:2ff3757c5da78c575addc973dee85588e1d73b7f4eaf7e5c5ef5f8c75c0ed08a" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.

From acb778a91c5e6d1b80a94a0681f466370960641f Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Fri, 9 May 2025 15:07:22 +0100
Subject: [PATCH 113/115] cli 13.22.0-pre.mascore6072-amd64

---
 .../templates/001-ibm-create-initial-users.yaml                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
index e15d1daa3..a393f6446 100644
--- a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
+++ b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
@@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
 */}}
-{{- $_cli_image_digest := "sha256:2ff3757c5da78c575addc973dee85588e1d73b7f4eaf7e5c5ef5f8c75c0ed08a" }}
+{{- $_cli_image_digest := "sha256:649c4373288558260c89b1befb95507ed3f79e6eaf029538b0d6f825f602daec" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.

From f20ad17674542bd10451fdfc0303d0893c635789 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Wed, 14 May 2025 14:41:45 +0100
Subject: [PATCH 114/115] CLI 13.22.0-amd64 where needed

---
 .../templates/001-ibm-create-initial-users.yaml                | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
index a393f6446..a10425b1b 100644
--- a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
+++ b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
@@ -9,8 +9,9 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
+13.22.0-amd64 - includes mas-devops-create-initial-users script from https://github.com/ibm-mas/python-devops/pull/66
 */}}
-{{- $_cli_image_digest := "sha256:649c4373288558260c89b1befb95507ed3f79e6eaf029538b0d6f825f602daec" }}
+{{- $_cli_image_digest := "sha256:c017c7a31683a68d6311aec9ecbaf12bc498d6034d0b470c5dd863433bd150d5" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.

From 38fc689f22644576b51bbfcc5d6cc554ba209639 Mon Sep 17 00:00:00 2001
From: tomklapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Wed, 14 May 2025 15:10:49 +0100
Subject: [PATCH 115/115] cli 13.22.1 (actually incudes new script)

---
 .../templates/001-ibm-create-initial-users.yaml               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
index a10425b1b..aed8f8e4b 100644
--- a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
+++ b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml
@@ -9,9 +9,9 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to
 {{- /*
 Use the build/bin/set-cli-image-tag.sh script to update this value across all charts.
 Included in $_job_hash (see below).
-13.22.0-amd64 - includes mas-devops-create-initial-users script from https://github.com/ibm-mas/python-devops/pull/66
+13.22.1-amd64 - includes mas-devops-create-initial-users script from https://github.com/ibm-mas/python-devops/pull/66
 */}}
-{{- $_cli_image_digest := "sha256:c017c7a31683a68d6311aec9ecbaf12bc498d6034d0b470c5dd863433bd150d5" }}
+{{- $_cli_image_digest := "sha256:3735885b3b9d46fcf6408c008768cc04faf2e28c1fa5f6da7c5f969931e2d3cd" }}
 
 {{- /*
 A dict of values that influence the behaviour of the job in some way.