From c5fc015ea9ad89775ce5653b4cc68f38e1cd5c20 Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Mon, 31 Aug 2026 13:17:59 +0530 Subject: [PATCH 01/27] feat: add cpd-public-route job to expose CP4D on public URL without VPN --- .../templates/09-ibm-cpd-public-route.yaml | 291 ++++++++++++++++++ .../110-ibm-cp4d/values.yaml | 7 + .../templates/110-ibm-cp4d-app.yaml | 6 + 3 files changed, 304 insertions(+) create mode 100644 instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml new file mode 100644 index 000000000..fb3f189f4 --- /dev/null +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml @@ -0,0 +1,291 @@ + +{{- /* + Only render when cpd_public_route_enabled is true. + Creates a public-facing CPD route at: + https://cpd-public.. + (e.g. https://cpd-public.inst1002.saasmax.ibmmasivt.com) + + Prerequisites handled upstream (by suite_dns ansible role via gitops_suite_dns): + - CIS DNS CNAME: cpd-public. → cluster public NLB + - CIS edge certificate (Let's Encrypt) for the hostname + + This job: + 1. Creates the cpd-public OCP Route (passthrough TLS, type=external label) + 2. Patches ZenService zenCustomRoute so nginx accepts requests for the hostname + 3. Restores the internal cpd route host (ZenService overwrites it as a side effect) + 4. Restarts nginx pods to pick up the updated server_name whitelist +*/}} +{{- if .Values.cpd_public_route_enabled }} + +{{- /* +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-public-route" }} + +{{- /* +Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. +Included in $_job_hash (see below). +*/}} +{{- $_cli_image_digest := "sha256:887cc3059a04601241687711df0c03d662931e6719121eec0eb0490001b2c8b9" }} + +{{- /* +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. +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_digest. +This ensures ArgoCD creates a new job resource instead of attempting (and failing) to update an +immutable field of any existing Job resource. +*/}} +{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_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. +By convention, we sha1sum this value to guarantee we never exceed the 63 char limit. +*/}} +{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }} + +--- +# Extra RBAC — cpd-sa needs to manage routes and patch ZenService across namespaces +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: cpd-public-route-role-{{ .Values.instance_id }} + annotations: + argocd.argoproj.io/sync-wave: "089" +{{- if .Values.custom_labels }} + labels: +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} +rules: + - verbs: [get, list, create, update, patch, delete] + apiGroups: [route.openshift.io] + resources: [routes, routes/custom-host] + - verbs: [get, list, patch] + apiGroups: [zen.cpd.ibm.com] + resources: [zenservices] + - verbs: [get, list, delete] + apiGroups: [""] + resources: [pods] + +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: cpd-public-route-rb-{{ .Values.instance_id }} + annotations: + argocd.argoproj.io/sync-wave: "089" +{{- if .Values.custom_labels }} + labels: +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} +subjects: + - kind: ServiceAccount + name: cpd-sa + namespace: "{{ .Values.cpd_operators_namespace }}" +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: cpd-public-route-role-{{ .Values.instance_id }} + +--- +apiVersion: batch/v1 +kind: Job +metadata: + name: {{ $_job_name }} + namespace: "{{ .Values.cpd_operators_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "090" + labels: + mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }} +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} +spec: + template: +{{- if .Values.custom_labels }} + metadata: + labels: +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} + spec: + containers: + - name: run + image: {{ .Values.cli_image_repo | default "quay.io/ibmmas/cli" }}@{{ $_cli_image_digest }} + imagePullPolicy: IfNotPresent + resources: + limits: + cpu: 200m + memory: 512Mi + requests: + cpu: 10m + memory: 64Mi + env: + - name: INSTANCE_ID + value: "{{ .Values.instance_id }}" + - name: CPD_INSTANCE_NAMESPACE + value: "{{ .Values.cpd_instance_namespace }}" + - name: CPD_OPERATORS_NAMESPACE + value: "{{ .Values.cpd_operators_namespace }}" + - name: CIS_SUBDOMAIN + value: "{{ .Values.cis_subdomain }}" + - name: CIS_DOMAIN + value: "{{ .Values.cis_domain }}" + command: + - /bin/bash + - -c + - | + + set -e + + CPD_PUBLIC_HOST="cpd-public.${CIS_SUBDOMAIN}.${CIS_DOMAIN}" + ROUTE_NAME="cpd-public" + + echo + echo "================================================================================" + echo "CPD Public Route Setup" + echo "================================================================================" + echo "- CPD Instance Namespace ............ ${CPD_INSTANCE_NAMESPACE}" + echo "- Public Hostname ................... ${CPD_PUBLIC_HOST}" + echo "- Route Name ........................ ${ROUTE_NAME}" + echo + + # ----------------------------------------------------------------------- + # Step 1: Note the default cpd route host so we can restore it after + # ZenService patches it as a side effect of zenCustomRoute + # ----------------------------------------------------------------------- + echo "Step 1: Reading internal cpd route host..." + INTERNAL_CPD_HOST=$(oc get route cpd -n "${CPD_INSTANCE_NAMESPACE}" \ + --ignore-not-found -o jsonpath='{.spec.host}') + if [[ -z "${INTERNAL_CPD_HOST}" ]]; then + echo "ERROR: Could not find internal cpd route in ${CPD_INSTANCE_NAMESPACE}" + exit 1 + fi + echo " Internal cpd route host: ${INTERNAL_CPD_HOST}" + + # ----------------------------------------------------------------------- + # Step 2: Create cpd-public OCP Route (idempotent) + # - passthrough TLS so nginx handles end-to-end TLS + # - labels type: external + route-type: external so the public ingress + # controller (routeSelector: matchLabels: type: external) picks it up + # ----------------------------------------------------------------------- + echo + echo "Step 2: Ensuring cpd-public Route exists..." + EXISTING_ROUTE=$(oc get route "${ROUTE_NAME}" -n "${CPD_INSTANCE_NAMESPACE}" \ + --ignore-not-found -o jsonpath='{.metadata.name}') + if [[ -n "${EXISTING_ROUTE}" ]]; then + echo " Route '${ROUTE_NAME}' already exists, skipping creation." + else + echo " Creating passthrough Route '${ROUTE_NAME}' for ${CPD_PUBLIC_HOST}..." + cat < Date: Mon, 31 Aug 2026 23:20:03 +0530 Subject: [PATCH 02/27] Update README.md --- instance-applications/110-ibm-cp4d/README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/instance-applications/110-ibm-cp4d/README.md b/instance-applications/110-ibm-cp4d/README.md index d5ff5b70e..f3779504a 100644 --- a/instance-applications/110-ibm-cp4d/README.md +++ b/instance-applications/110-ibm-cp4d/README.md @@ -16,6 +16,8 @@ Deploys and configures CP4D needed for `MAS Assist` and `MAS Predict`. Deploys t | `ClusterRole` | CP4D cluster roles | N/A (cluster-scoped) | Always | `cluster_admin_role` | | `ClusterRoleBinding` | CP4D cluster role bindings | N/A (cluster-scoped) | Always | `cluster_admin_role` | | `Job` | CP4D install and verification jobs | CP4D operators namespace | Version-dependent and always for verification hooks as applicable | `cluster_admin_role` | +| `Route` | `cpd-public` public route (passthrough TLS, type=external) | CP4D instance namespace | When `cpd_public_route_enabled` is true | `cluster_admin_role` | +| `Service` | Route backend service reference (ibm-nginx-svc) | CP4D instance namespace | When `cpd_public_route_enabled` is true | `cluster_admin_role` | | `Ibmcpd` | CP4D platform custom resource | CP4D instance namespace | Always | `cluster_admin_role` | | `ConfigMap` | CP4D service dependency config maps | CP4D operators namespace | When optional services are enabled | `cluster_admin_role` | | `Subscription` | CP4D service subscriptions | CP4D operators namespace | When optional services are enabled | `cluster_admin_role` | @@ -49,6 +51,11 @@ ibm_cp4d: cpd_iam_integration: string cpd_primary_storage_class: string cpd_metadata_storage_class: string + # Optional — public CPD route + cpd_public_route_enabled: bool # default: false + cis_subdomain: string # e.g. inst1002.saasmax (populated from dns.cis.subdomain) + cis_domain: string # e.g. ibmmasivt.com (populated from dns.cis.mas_domain) + cis_crn: string # CIS instance CRN ``` **Note**: Values marked with "(secret reference)" should use the format `` to reference secrets stored in the Secrets Vault. From 5e0469463cadaba7dcb71357a4fececabc399250 Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Mon, 31 Aug 2026 23:24:10 +0530 Subject: [PATCH 03/27] Update 09-ibm-cpd-public-route.yaml --- .../110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml index fb3f189f4..45afd8336 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml @@ -26,7 +26,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:887cc3059a04601241687711df0c03d662931e6719121eec0eb0490001b2c8b9" }} +{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} {{- /* A dict of values that influence the behaviour of the job in some way. From 851547112570ff3617797a072290e016b6880619 Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Thu, 3 Sep 2026 00:00:42 +0530 Subject: [PATCH 04/27] fix: review comments done --- instance-applications/110-ibm-cp4d/README.md | 2 - .../templates/09-ibm-cpd-public-route.yaml | 144 +++++++++--------- .../110-ibm-cp4d/values.yaml | 1 - .../templates/110-ibm-cp4d-app.yaml | 1 - 4 files changed, 73 insertions(+), 75 deletions(-) diff --git a/instance-applications/110-ibm-cp4d/README.md b/instance-applications/110-ibm-cp4d/README.md index f3779504a..1ec1bfcce 100644 --- a/instance-applications/110-ibm-cp4d/README.md +++ b/instance-applications/110-ibm-cp4d/README.md @@ -17,7 +17,6 @@ Deploys and configures CP4D needed for `MAS Assist` and `MAS Predict`. Deploys t | `ClusterRoleBinding` | CP4D cluster role bindings | N/A (cluster-scoped) | Always | `cluster_admin_role` | | `Job` | CP4D install and verification jobs | CP4D operators namespace | Version-dependent and always for verification hooks as applicable | `cluster_admin_role` | | `Route` | `cpd-public` public route (passthrough TLS, type=external) | CP4D instance namespace | When `cpd_public_route_enabled` is true | `cluster_admin_role` | -| `Service` | Route backend service reference (ibm-nginx-svc) | CP4D instance namespace | When `cpd_public_route_enabled` is true | `cluster_admin_role` | | `Ibmcpd` | CP4D platform custom resource | CP4D instance namespace | Always | `cluster_admin_role` | | `ConfigMap` | CP4D service dependency config maps | CP4D operators namespace | When optional services are enabled | `cluster_admin_role` | | `Subscription` | CP4D service subscriptions | CP4D operators namespace | When optional services are enabled | `cluster_admin_role` | @@ -55,7 +54,6 @@ ibm_cp4d: cpd_public_route_enabled: bool # default: false cis_subdomain: string # e.g. inst1002.saasmax (populated from dns.cis.subdomain) cis_domain: string # e.g. ibmmasivt.com (populated from dns.cis.mas_domain) - cis_crn: string # CIS instance CRN ``` **Note**: Values marked with "(secret reference)" should use the format `` to reference secrets stored in the Secrets Vault. diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml index 45afd8336..a6de25bf0 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml @@ -9,11 +9,11 @@ - CIS DNS CNAME: cpd-public. → cluster public NLB - CIS edge certificate (Let's Encrypt) for the hostname - This job: - 1. Creates the cpd-public OCP Route (passthrough TLS, type=external label) - 2. Patches ZenService zenCustomRoute so nginx accepts requests for the hostname - 3. Restores the internal cpd route host (ZenService overwrites it as a side effect) - 4. Restarts nginx pods to pick up the updated server_name whitelist + The Route itself is managed declaratively by ArgoCD (below). + The Job only handles what ArgoCD cannot do declaratively: + 1. Patches ZenService zenCustomRoute so nginx accepts the new hostname + 2. Restores the internal cpd route host (ZenService overwrites it as a side effect) + 3. Restarts nginx pods to pick up the updated server_name whitelist */}} {{- if .Values.cpd_public_route_enabled }} @@ -58,7 +58,39 @@ By convention, we sha1sum this value to guarantee we never exceed the 63 char li {{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }} --- -# Extra RBAC — cpd-sa needs to manage routes and patch ZenService across namespaces +# Route managed by ArgoCD — passthrough TLS, picked up by the public ingress controller +# via the type: external label (routeSelector: matchLabels: type: external) +apiVersion: route.openshift.io/v1 +kind: Route +metadata: + name: cpd-public + namespace: "{{ .Values.cpd_instance_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "089" +{{- if .Values.custom_labels }} + labels: + type: external + route-type: external +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- else }} + labels: + type: external + route-type: external +{{- end }} +spec: + host: "cpd-public.{{ .Values.cis_subdomain }}.{{ .Values.cis_domain }}" + to: + kind: Service + name: ibm-nginx-svc + weight: 100 + port: + targetPort: ibm-nginx-https-port + tls: + termination: passthrough + insecureEdgeTerminationPolicy: None + +--- +# Extra RBAC — cpd-sa needs to patch ZenService and restart nginx pods kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -70,12 +102,12 @@ metadata: {{ .Values.custom_labels | toYaml | indent 4 }} {{- end }} rules: - - verbs: [get, list, create, update, patch, delete] - apiGroups: [route.openshift.io] - resources: [routes, routes/custom-host] - verbs: [get, list, patch] apiGroups: [zen.cpd.ibm.com] resources: [zenservices] + - verbs: [get, list, patch] + apiGroups: [route.openshift.io] + resources: [routes] - verbs: [get, list, delete] apiGroups: [""] resources: [pods] @@ -151,15 +183,13 @@ spec: set -e CPD_PUBLIC_HOST="cpd-public.${CIS_SUBDOMAIN}.${CIS_DOMAIN}" - ROUTE_NAME="cpd-public" echo echo "================================================================================" - echo "CPD Public Route Setup" + echo "CPD Public Route — ZenService patch + nginx restart" echo "================================================================================" echo "- CPD Instance Namespace ............ ${CPD_INSTANCE_NAMESPACE}" echo "- Public Hostname ................... ${CPD_PUBLIC_HOST}" - echo "- Route Name ........................ ${ROUTE_NAME}" echo # ----------------------------------------------------------------------- @@ -176,56 +206,18 @@ spec: echo " Internal cpd route host: ${INTERNAL_CPD_HOST}" # ----------------------------------------------------------------------- - # Step 2: Create cpd-public OCP Route (idempotent) - # - passthrough TLS so nginx handles end-to-end TLS - # - labels type: external + route-type: external so the public ingress - # controller (routeSelector: matchLabels: type: external) picks it up - # ----------------------------------------------------------------------- - echo - echo "Step 2: Ensuring cpd-public Route exists..." - EXISTING_ROUTE=$(oc get route "${ROUTE_NAME}" -n "${CPD_INSTANCE_NAMESPACE}" \ - --ignore-not-found -o jsonpath='{.metadata.name}') - if [[ -n "${EXISTING_ROUTE}" ]]; then - echo " Route '${ROUTE_NAME}' already exists, skipping creation." - else - echo " Creating passthrough Route '${ROUTE_NAME}' for ${CPD_PUBLIC_HOST}..." - cat < Date: Thu, 3 Sep 2026 00:11:26 +0530 Subject: [PATCH 05/27] fix: updating readme --- instance-applications/110-ibm-cp4d/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/instance-applications/110-ibm-cp4d/README.md b/instance-applications/110-ibm-cp4d/README.md index 1ec1bfcce..875969c28 100644 --- a/instance-applications/110-ibm-cp4d/README.md +++ b/instance-applications/110-ibm-cp4d/README.md @@ -17,6 +17,7 @@ Deploys and configures CP4D needed for `MAS Assist` and `MAS Predict`. Deploys t | `ClusterRoleBinding` | CP4D cluster role bindings | N/A (cluster-scoped) | Always | `cluster_admin_role` | | `Job` | CP4D install and verification jobs | CP4D operators namespace | Version-dependent and always for verification hooks as applicable | `cluster_admin_role` | | `Route` | `cpd-public` public route (passthrough TLS, type=external) | CP4D instance namespace | When `cpd_public_route_enabled` is true | `cluster_admin_role` | +| `Service` | `ibm-nginx-svc` backend reference (pre-existing CP4D service, referenced by the Route) | CP4D instance namespace | When `cpd_public_route_enabled` is true | `cluster_admin_role` | | `Ibmcpd` | CP4D platform custom resource | CP4D instance namespace | Always | `cluster_admin_role` | | `ConfigMap` | CP4D service dependency config maps | CP4D operators namespace | When optional services are enabled | `cluster_admin_role` | | `Subscription` | CP4D service subscriptions | CP4D operators namespace | When optional services are enabled | `cluster_admin_role` | From 78d1d65fac96af240a00c8271b4ac9c4a27e1e7a Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Thu, 3 Sep 2026 12:39:51 +0530 Subject: [PATCH 06/27] fix: service remove --- instance-applications/110-ibm-cp4d/README.md | 1 - .../110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/instance-applications/110-ibm-cp4d/README.md b/instance-applications/110-ibm-cp4d/README.md index 875969c28..1ec1bfcce 100644 --- a/instance-applications/110-ibm-cp4d/README.md +++ b/instance-applications/110-ibm-cp4d/README.md @@ -17,7 +17,6 @@ Deploys and configures CP4D needed for `MAS Assist` and `MAS Predict`. Deploys t | `ClusterRoleBinding` | CP4D cluster role bindings | N/A (cluster-scoped) | Always | `cluster_admin_role` | | `Job` | CP4D install and verification jobs | CP4D operators namespace | Version-dependent and always for verification hooks as applicable | `cluster_admin_role` | | `Route` | `cpd-public` public route (passthrough TLS, type=external) | CP4D instance namespace | When `cpd_public_route_enabled` is true | `cluster_admin_role` | -| `Service` | `ibm-nginx-svc` backend reference (pre-existing CP4D service, referenced by the Route) | CP4D instance namespace | When `cpd_public_route_enabled` is true | `cluster_admin_role` | | `Ibmcpd` | CP4D platform custom resource | CP4D instance namespace | Always | `cluster_admin_role` | | `ConfigMap` | CP4D service dependency config maps | CP4D operators namespace | When optional services are enabled | `cluster_admin_role` | | `Subscription` | CP4D service subscriptions | CP4D operators namespace | When optional services are enabled | `cluster_admin_role` | diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml index a6de25bf0..46b65da71 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml @@ -79,10 +79,7 @@ metadata: {{- end }} spec: host: "cpd-public.{{ .Values.cis_subdomain }}.{{ .Values.cis_domain }}" - to: - kind: Service - name: ibm-nginx-svc - weight: 100 + to: {kind: Service, name: ibm-nginx-svc, weight: 100} port: targetPort: ibm-nginx-https-port tls: From 6aac9a544a7ded23028c6f36378ffee78fc4e15b Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Thu, 3 Sep 2026 22:35:15 +0530 Subject: [PATCH 07/27] test: update suite_dns job to use mascore-15972 CLI image with cpd-public support --- .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9b0eaa29a..165fa3991 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 @@ -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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. From 2579f1d3a38f524140bf60c7aafee9f737fe31e5 Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Thu, 3 Sep 2026 22:47:26 +0530 Subject: [PATCH 08/27] test: update all CLI image digests to mascore-15972 build (cpd-public support) --- .../templates/_ecr-token-updater-helpers.tpl | 2 +- .../000-job-cleaner/templates/04-jobcleaner_CronJob.yaml | 2 +- .../templates/04-postsync-update-sm_Job.yaml | 2 +- .../030-ibm-dro/templates/12-2-dro-dns_job.yaml | 2 +- .../030-ibm-dro/templates/14-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-preinstall-mas-rbac_Job.yaml | 2 +- .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml | 2 +- .../templates/PostDelete-aws-docdb-remove-user_Job.yaml | 2 +- .../100-ibm-sls/templates/07-postsync-update-sm_Job.yaml | 2 +- .../101-ibm-sync-jobs-cp4d/templates/02-ibm-cp4d-presync.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 +- .../110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml | 2 +- .../113-ibm-aiservice/templates/07-postsync-migration-job.yaml | 2 +- .../templates/00-presync-migration-job.yaml | 2 +- .../templates/03-tenant-migration-job.yaml | 2 +- .../templates/06-aiservice-km-s3-secret.yaml | 2 +- .../templates/08-aiservice-postsyncjob.yaml | 2 +- .../templates/08-postsync-migration-job.yaml | 2 +- .../115-ibm-aiservice-tenant/templates/98-presync-copy-sls.yaml | 2 +- .../templates/00-presync-await-crd_Job.yaml | 2 +- .../120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml | 2 +- .../templates/04-db2u-Volatile-Runstats_Cron.yaml | 2 +- .../templates/07-postsync-setup-db2_Job.yaml | 2 +- .../templates/08-postsync-db2-audit-policy_Job.yaml | 2 +- .../120-ibm-db2u-database/templates/09-db2u-Audit_Cron.yaml | 2 +- .../120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml | 2 +- .../templates/00-presync-create-database.yaml | 2 +- .../templates/01-dbs-rds-postsync-setup.yaml | 2 +- .../120-ibm-dbs-rds-database/templates/03-backup-cronjobs.yaml | 2 +- .../120-ibm-spark/templates/02-ibm-spark-control-plane.yaml | 2 +- .../120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml | 2 +- .../templates/01-cpd-service-post-ops.yaml | 2 +- .../templates/00-presync-create-db2-rds-user-Job.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 +- .../templates/postdelete-delete-cr.yaml | 2 +- .../130-ibm-mas-app-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/07-postsync-set_welcome_messsage_Job.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/703-postsync-rds-app-roles.yaml | 2 +- .../templates/postdelete-delete-cr.yaml | 2 +- .../templates/001-ibm-create-initial-users.yaml | 2 +- sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 2 +- .../100-ibm-sls/templates/08-postsync-update-sm_Job.yaml | 2 +- .../junitreporter/templates/00-presync-report-starter.yaml | 2 +- .../junitreporter/templates/10-postsync-report-starter.yaml | 2 +- 79 files changed, 79 insertions(+), 79 deletions(-) diff --git a/cluster-applications/000-image-mirroring/templates/_ecr-token-updater-helpers.tpl b/cluster-applications/000-image-mirroring/templates/_ecr-token-updater-helpers.tpl index 1fafd6de7..7b8672f16 100644 --- a/cluster-applications/000-image-mirroring/templates/_ecr-token-updater-helpers.tpl +++ b/cluster-applications/000-image-mirroring/templates/_ecr-token-updater-helpers.tpl @@ -3,7 +3,7 @@ ECR Token Updater Pod Template This template defines the pod specification used by both the CronJob and the initial Job */}} {{- define "ecr-token-updater.podTemplate" -}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} metadata: {{- if .Values.custom_labels }} labels: 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 07f0cf801..0a059d6eb 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- $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 60c927276..4ad9df872 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/cluster-applications/030-ibm-dro/templates/12-2-dro-dns_job.yaml b/cluster-applications/030-ibm-dro/templates/12-2-dro-dns_job.yaml index a1cd2708d..ee0f0e608 100644 --- a/cluster-applications/030-ibm-dro/templates/12-2-dro-dns_job.yaml +++ b/cluster-applications/030-ibm-dro/templates/12-2-dro-dns_job.yaml @@ -18,7 +18,7 @@ data: type: Opaque --- {{- if and (eq .Values.dns_provider "cis") (not (empty .Values.cis_crn)) (not (empty .Values.dro_public_domain)) }} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- $_job_name_prefix := "ibm-dro-dns" }} {{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }} {{- $_job_config_values := omit .Values "junitreporter" }} diff --git a/cluster-applications/030-ibm-dro/templates/14-postsync-update-sm_Job.yaml b/cluster-applications/030-ibm-dro/templates/14-postsync-update-sm_Job.yaml index 3640c43b8..e70b6c99b 100644 --- a/cluster-applications/030-ibm-dro/templates/14-postsync-update-sm_Job.yaml +++ b/cluster-applications/030-ibm-dro/templates/14-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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/cluster-applications/032-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml b/cluster-applications/032-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml index 2bffabf59..b38525f21 100644 --- a/cluster-applications/032-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml +++ b/cluster-applications/032-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml @@ -2,7 +2,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 de74121d3..ae08d53eb 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 3cfb94e15..efa4dbf09 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} --- 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 29433ea39..66a45ec3b 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 d8a90ae86..b4d8c4cfa 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 7b9f04868..c718ea711 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 fe9d3d0c0..263f211a3 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 @@ -12,7 +12,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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-preinstall-mas-rbac_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-preinstall-mas-rbac_Job.yaml index fb7b395a4..d5a73978b 100644 --- a/instance-applications/010-ibm-sync-jobs/templates/00-preinstall-mas-rbac_Job.yaml +++ b/instance-applications/010-ibm-sync-jobs/templates/00-preinstall-mas-rbac_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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 c8f7156d9..350a43838 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 @@ -11,7 +11,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 01b4b5e5b..5e617fb9f 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 @@ -8,7 +8,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} # 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 8900aa8be..95a5762fb 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/101-ibm-sync-jobs-cp4d/templates/02-ibm-cp4d-presync.yaml b/instance-applications/101-ibm-sync-jobs-cp4d/templates/02-ibm-cp4d-presync.yaml index 8693bc4f2..04d2a6ef9 100644 --- a/instance-applications/101-ibm-sync-jobs-cp4d/templates/02-ibm-cp4d-presync.yaml +++ b/instance-applications/101-ibm-sync-jobs-cp4d/templates/02-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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 46b6c6937..c3b04facb 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 92ea81180..8ec54de0b 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 647b67b0d..5cbd451c0 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 00451f713..9e303724d 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 d765470c9..c58a5fdd3 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 08b622bc0..68f475f7d 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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-cpd-public-route.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml index 46b65da71..b52dcce95 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml @@ -26,7 +26,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/113-ibm-aiservice/templates/07-postsync-migration-job.yaml b/instance-applications/113-ibm-aiservice/templates/07-postsync-migration-job.yaml index 929d449bd..de992e391 100644 --- a/instance-applications/113-ibm-aiservice/templates/07-postsync-migration-job.yaml +++ b/instance-applications/113-ibm-aiservice/templates/07-postsync-migration-job.yaml @@ -1,7 +1,7 @@ {{- if hasPrefix "9.2." (toString .Values.aiservice_channel) }} {{- $_job_name_prefix := "postsync-aiservice-migration" }} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- $_job_config_values := omit .Values "junitreporter" }} {{- $_job_version := "v1" }} {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/00-presync-migration-job.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/00-presync-migration-job.yaml index 035157428..cc432c878 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/00-presync-migration-job.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/00-presync-migration-job.yaml @@ -6,7 +6,7 @@ ################################################################################################### {{- $_job_name_prefix := "presync-tenant-migration" }} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- $_job_config_values := omit .Values "junitreporter" }} {{- $_job_version := "v2" }} {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/03-tenant-migration-job.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/03-tenant-migration-job.yaml index 782867aac..d81385816 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/03-tenant-migration-job.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/03-tenant-migration-job.yaml @@ -1,5 +1,5 @@ {{- $_job_name_prefix := "tenant-migration" }} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- $_job_config_values := omit .Values "junitreporter" }} {{- $_job_version := "v2" }} # We use the timestamp to ensure a unique job name on each run but preserve the existing name generation diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-km-s3-secret.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-km-s3-secret.yaml index 8c14935ab..6cec3a796 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-km-s3-secret.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-km-s3-secret.yaml @@ -1,6 +1,6 @@ {{- if .Values.application_admin_role }} {{- $_job_name_prefix := "presync-copy-ai-secrets" }} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- $_job_config_values := omit .Values "junitreporter" }} {{- $_job_version := "v5" }} {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/08-aiservice-postsyncjob.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/08-aiservice-postsyncjob.yaml index 4974fb679..615d25be7 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/08-aiservice-postsyncjob.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/08-aiservice-postsyncjob.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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }}{{- /* +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }}{{- /* 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 diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/08-postsync-migration-job.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/08-postsync-migration-job.yaml index f2bb6a56e..bd13a0185 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/08-postsync-migration-job.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/08-postsync-migration-job.yaml @@ -1,5 +1,5 @@ {{- $_job_name_prefix := "postsync-tenant-migration" }} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- $_job_config_values := omit .Values "junitreporter" }} {{- $_job_version := "v3" }} {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/98-presync-copy-sls.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/98-presync-copy-sls.yaml index c2d5842ba..3b6f8c8be 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/98-presync-copy-sls.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/98-presync-copy-sls.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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 194fd1b43..ee93512f8 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 @@ -2,7 +2,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} --- # 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 5d62f4dfe..88cc3c497 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 @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} #apiVersion: batch/v1beta1 kind: CronJob diff --git a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Volatile-Runstats_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Volatile-Runstats_Cron.yaml index 720a1e28c..6228133db 100644 --- a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Volatile-Runstats_Cron.yaml +++ b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Volatile-Runstats_Cron.yaml @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} # # CronJob for Volatile Tables RUNSTATS 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 d08c340dc..445535936 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 @@ -18,7 +18,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/120-ibm-db2u-database/templates/08-postsync-db2-audit-policy_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/08-postsync-db2-audit-policy_Job.yaml index 5d35cb1b2..ad7b91b59 100644 --- a/instance-applications/120-ibm-db2u-database/templates/08-postsync-db2-audit-policy_Job.yaml +++ b/instance-applications/120-ibm-db2u-database/templates/08-postsync-db2-audit-policy_Job.yaml @@ -29,7 +29,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/120-ibm-db2u-database/templates/09-db2u-Audit_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/09-db2u-Audit_Cron.yaml index 7fd415565..1dfd89270 100644 --- a/instance-applications/120-ibm-db2u-database/templates/09-db2u-Audit_Cron.yaml +++ b/instance-applications/120-ibm-db2u-database/templates/09-db2u-Audit_Cron.yaml @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} # # CronJob for DB2 Audit Log Extraction 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 c03b16fa3..f35a48026 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 @@ -11,7 +11,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/120-ibm-dbs-rds-database/templates/00-presync-create-database.yaml b/instance-applications/120-ibm-dbs-rds-database/templates/00-presync-create-database.yaml index e64d0cc4a..54ccb003e 100644 --- a/instance-applications/120-ibm-dbs-rds-database/templates/00-presync-create-database.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/templates/00-presync-create-database.yaml @@ -1,6 +1,6 @@ {{- if .Values.application_admin_role }} {{- $_job_name_prefix := "dbs-rds-presync-create-db" }} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- $_job_config_values := omit .Values "junitreporter" }} {{- $_job_version := "v1" }} {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} diff --git a/instance-applications/120-ibm-dbs-rds-database/templates/01-dbs-rds-postsync-setup.yaml b/instance-applications/120-ibm-dbs-rds-database/templates/01-dbs-rds-postsync-setup.yaml index 4db779867..d26839c61 100644 --- a/instance-applications/120-ibm-dbs-rds-database/templates/01-dbs-rds-postsync-setup.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/templates/01-dbs-rds-postsync-setup.yaml @@ -8,7 +8,7 @@ Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/120-ibm-dbs-rds-database/templates/03-backup-cronjobs.yaml b/instance-applications/120-ibm-dbs-rds-database/templates/03-backup-cronjobs.yaml index a44b14c58..674c38c8d 100644 --- a/instance-applications/120-ibm-dbs-rds-database/templates/03-backup-cronjobs.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/templates/03-backup-cronjobs.yaml @@ -2,7 +2,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} --- # Full Backup CronJob (Sundays at 2 AM) 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 a8a624c5c..385156286 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 87dfaf77a..f7d34f7f8 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml b/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml index 5013805ab..fc60408bd 100644 --- a/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml +++ b/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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-rds-user-Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-rds-user-Job.yaml index 174408206..de9543c58 100644 --- a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-rds-user-Job.yaml +++ b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-rds-user-Job.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} - {{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} + {{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $ns := printf "mas-%s-core" .Values.instance_id }} {{ $prefix := printf "pre-jdbc-create-user-%s" .Values.mas_config_name }} 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 716f833ac..da7f72fbc 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 518a525d4..4421b0d32 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 442126650..9bb368428 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 @@ -5,7 +5,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $ns := printf "mas-%s-core" .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 353daf19d..e7a1fe332 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 @@ -22,7 +22,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} --- apiVersion: batch/v1 diff --git a/instance-applications/130-ibm-mas-aicfg-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-aicfg-config/templates/postdelete-delete-cr.yaml index 95f98011d..46a315902 100644 --- a/instance-applications/130-ibm-mas-aicfg-config/templates/postdelete-delete-cr.yaml +++ b/instance-applications/130-ibm-mas-aicfg-config/templates/postdelete-delete-cr.yaml @@ -1,7 +1,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} --- apiVersion: batch/v1 diff --git a/instance-applications/130-ibm-mas-app-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-app-config/templates/postdelete-delete-cr.yaml index 84ffe26af..14dcc81f5 100644 --- a/instance-applications/130-ibm-mas-app-config/templates/postdelete-delete-cr.yaml +++ b/instance-applications/130-ibm-mas-app-config/templates/postdelete-delete-cr.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $cr_name := .Values.mas_config_name }} {{ $cr_kind := .Values.mas_config_kind }} 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 074755b64..2b17c724e 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 074755b64..2b17c724e 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 1fe2f51d2..acf1e07c7 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 074755b64..2b17c724e 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 074755b64..2b17c724e 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 03dd0ad5c..881e18aeb 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 @@ -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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 289dd85fa..e575a0ce3 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 @@ -11,7 +11,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/130-ibm-mas-suite/templates/07-postsync-set_welcome_messsage_Job.yaml b/instance-applications/130-ibm-mas-suite/templates/07-postsync-set_welcome_messsage_Job.yaml index a3117be24..d862337e9 100644 --- a/instance-applications/130-ibm-mas-suite/templates/07-postsync-set_welcome_messsage_Job.yaml +++ b/instance-applications/130-ibm-mas-suite/templates/07-postsync-set_welcome_messsage_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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 074755b64..2b17c724e 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 c8f36c6c5..2aced2823 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,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} --- # 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 4a57f8b13..0b1aad636 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 @@ -7,7 +7,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 bc0b004bc..93b9aa870 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 @@ -7,7 +7,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 cc02a841f..d913db0a6 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 @@ -6,7 +6,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 076f0b277..a8693e487 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 @@ -1,7 +1,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 ca1529d45..60ac49425 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 @@ -5,7 +5,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} # 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 52377ff1a..97d665a75 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 @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} # 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 5af4a828a..c0781a1b5 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 @@ -6,7 +6,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} # 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 0b4e415f2..d2304dd76 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 @@ -5,7 +5,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} # 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 d6c8a4b77..efdfb9d7a 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 @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 ebc9c3d23..440f7fc7f 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 8ea855fac..df0bafad1 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 @@ -87,7 +87,7 @@ will take care of differentiating the jobs. Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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/703-postsync-rds-app-roles.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/703-postsync-rds-app-roles.yaml index b9ea2525c..9e941d942 100644 --- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/703-postsync-rds-app-roles.yaml +++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/703-postsync-rds-app-roles.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $app_ns := .Values.mas_app_namespace }} {{ $np_name := "postsync-app-rds-roles-np" }} diff --git a/instance-applications/550-ibm-mas-addons-config/templates/postdelete-delete-cr.yaml b/instance-applications/550-ibm-mas-addons-config/templates/postdelete-delete-cr.yaml index 07de5689e..328ac9aa2 100644 --- a/instance-applications/550-ibm-mas-addons-config/templates/postdelete-delete-cr.yaml +++ b/instance-applications/550-ibm-mas-addons-config/templates/postdelete-delete-cr.yaml @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- $_addon_type := "additional-resources" }} {{- $_addon_cr_name := printf "%s-addons-%s" .Values.instance_id $_addon_type }} 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 9754f5024..9924947fd 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 @@ -12,7 +12,7 @@ Use the build/bin/set-cli-image-tag.sh script to update this value across all ch Included in $_job_hash (see below). 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:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml index c4b61c2c2..3f40ed6c3 100644 --- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml +++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml @@ -1,5 +1,5 @@ -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $aws_secret := "aws"}} {{- $_job_name_prefix := "ibm-sls-dns" }} {{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }} diff --git a/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml b/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml index f4ad9c748..314d269b0 100644 --- a/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml +++ b/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml @@ -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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 88b77e7db..8855ebe3c 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 109e3584d..048aff93b 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:1c5701a24c9796e02b33036f56babbe74032831e1db733ce9228a46dce4a870b" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $preprefix := printf "pre-jreporter-%s" .Values.reporter_name }} {{ $time_cm := printf "%s-synctime" $preprefix }} From c7ce80cf42f6e105e2ec0fbec64f534902162818 Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Fri, 4 Sep 2026 13:24:55 +0530 Subject: [PATCH 09/27] fix: dummy commit --- .../110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml index b52dcce95..744634e52 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml @@ -9,7 +9,7 @@ - CIS DNS CNAME: cpd-public. → cluster public NLB - CIS edge certificate (Let's Encrypt) for the hostname - The Route itself is managed declaratively by ArgoCD (below). + The Route itself is managed declaratively by ArgoCD (below) The Job only handles what ArgoCD cannot do declaratively: 1. Patches ZenService zenCustomRoute so nginx accepts the new hostname 2. Restores the internal cpd route host (ZenService overwrites it as a side effect) From 28ee51a5f44e3918381accae53031b6a30b9e677 Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Fri, 4 Sep 2026 15:39:00 +0530 Subject: [PATCH 10/27] feat: add cpd-public to suite-dns CIS_ENTRIES_TO_ADD when cpd_public_route_enabled --- .../ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml b/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml index 26b8d330d..d450655b0 100644 --- a/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml +++ b/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml @@ -104,8 +104,9 @@ spec: {{- $visualinspection_str := ternary "" "visualinspection" (empty $visualinspection) -}} {{- $optimizer_str := ternary "" "optimizer" (empty $optimizer) -}} {{- $facilities_str := ternary "" "facilities" (empty $facilities) -}} + {{- $cpd_public_str := ternary (printf "cpd-public.%s" $core.cis_subdomain) "" (and (not (empty $core)) (.Values.ibm_cp4d.cpd_public_route_enabled | default false)) -}} - {{- $list := list $health_str $iot_str $core_str $manage_str $reportdb_str $monitor_str $predict_str $visualinspection_str $optimizer_str $facilities_str | compact }} + {{- $list := list $health_str $iot_str $core_str $manage_str $reportdb_str $monitor_str $predict_str $visualinspection_str $optimizer_str $facilities_str $cpd_public_str | compact }} cis_entries_to_add: {{ printf "%s" (join "," $list) }} {{- if .Values.override_dns_cis_flags_to_false }} From a5013566cec8ff26a0b27ba21785bb4109059246 Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Fri, 4 Sep 2026 16:25:19 +0530 Subject: [PATCH 11/27] fix: guard against nil ibm_cp4d in cis_entries_to_add template --- .../ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml b/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml index d450655b0..8c3932b2e 100644 --- a/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml +++ b/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml @@ -104,7 +104,7 @@ spec: {{- $visualinspection_str := ternary "" "visualinspection" (empty $visualinspection) -}} {{- $optimizer_str := ternary "" "optimizer" (empty $optimizer) -}} {{- $facilities_str := ternary "" "facilities" (empty $facilities) -}} - {{- $cpd_public_str := ternary (printf "cpd-public.%s" $core.cis_subdomain) "" (and (not (empty $core)) (.Values.ibm_cp4d.cpd_public_route_enabled | default false)) -}} + {{- $cpd_public_str := ternary (printf "cpd-public.%s" $core.cis_subdomain) "" (and (not (empty $core)) (not (empty .Values.ibm_cp4d)) (.Values.ibm_cp4d.cpd_public_route_enabled | default false)) -}} {{- $list := list $health_str $iot_str $core_str $manage_str $reportdb_str $monitor_str $predict_str $visualinspection_str $optimizer_str $facilities_str $cpd_public_str | compact }} cis_entries_to_add: {{ printf "%s" (join "," $list) }} From d42baf54ed561e9d72de8ac3b43d79ddabee94b3 Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Fri, 4 Sep 2026 20:06:49 +0530 Subject: [PATCH 12/27] fix: replace ClusterRole with namespace-scoped Role (ArgoCD lacks ClusterRole create permission) --- .../templates/09-ibm-cpd-public-route.yaml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml index 744634e52..f19d92a25 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml @@ -87,11 +87,12 @@ spec: insecureEdgeTerminationPolicy: None --- -# Extra RBAC — cpd-sa needs to patch ZenService and restart nginx pods -kind: ClusterRole +# Role in cpd_instance_namespace — patch ZenService, routes, restart nginx pods +kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: cpd-public-route-role-{{ .Values.instance_id }} + name: cpd-public-route-role + namespace: "{{ .Values.cpd_instance_namespace }}" annotations: argocd.argoproj.io/sync-wave: "089" {{- if .Values.custom_labels }} @@ -110,10 +111,11 @@ rules: resources: [pods] --- -kind: ClusterRoleBinding +kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: cpd-public-route-rb-{{ .Values.instance_id }} + name: cpd-public-route-rb + namespace: "{{ .Values.cpd_instance_namespace }}" annotations: argocd.argoproj.io/sync-wave: "089" {{- if .Values.custom_labels }} @@ -126,8 +128,8 @@ subjects: namespace: "{{ .Values.cpd_operators_namespace }}" roleRef: apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: cpd-public-route-role-{{ .Values.instance_id }} + kind: Role + name: cpd-public-route-role --- apiVersion: batch/v1 From f2eca8314b2057b566a31a44206e7533c3f75014 Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Mon, 7 Sep 2026 20:44:49 +0530 Subject: [PATCH 13/27] fix: use cis_mas_domain directly for cpd-public route host (drop cis_subdomain prefix) --- instance-applications/110-ibm-cp4d/README.md | 3 +-- .../templates/09-ibm-cpd-public-route.yaml | 10 ++++------ instance-applications/110-ibm-cp4d/values.yaml | 1 - .../templates/110-ibm-cp4d-app.yaml | 1 - 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/instance-applications/110-ibm-cp4d/README.md b/instance-applications/110-ibm-cp4d/README.md index 1ec1bfcce..919af665d 100644 --- a/instance-applications/110-ibm-cp4d/README.md +++ b/instance-applications/110-ibm-cp4d/README.md @@ -52,8 +52,7 @@ ibm_cp4d: cpd_metadata_storage_class: string # Optional — public CPD route cpd_public_route_enabled: bool # default: false - cis_subdomain: string # e.g. inst1002.saasmax (populated from dns.cis.subdomain) - cis_domain: string # e.g. ibmmasivt.com (populated from dns.cis.mas_domain) + cis_domain: string # e.g. inst1002.saasmax.ibmmasivt.com (ibm_mas_suite.cis_mas_domain) ``` **Note**: Values marked with "(secret reference)" should use the format `` to reference secrets stored in the Secrets Vault. diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml index f19d92a25..dacaa33cd 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml @@ -2,11 +2,11 @@ {{- /* Only render when cpd_public_route_enabled is true. Creates a public-facing CPD route at: - https://cpd-public.. + https://cpd-public. (e.g. https://cpd-public.inst1002.saasmax.ibmmasivt.com) Prerequisites handled upstream (by suite_dns ansible role via gitops_suite_dns): - - CIS DNS CNAME: cpd-public. → cluster public NLB + - CIS DNS CNAME: cpd-public. → cluster public NLB - CIS edge certificate (Let's Encrypt) for the hostname The Route itself is managed declaratively by ArgoCD (below) @@ -78,7 +78,7 @@ metadata: route-type: external {{- end }} spec: - host: "cpd-public.{{ .Values.cis_subdomain }}.{{ .Values.cis_domain }}" + host: "cpd-public.{{ .Values.cis_domain }}" to: {kind: Service, name: ibm-nginx-svc, weight: 100} port: targetPort: ibm-nginx-https-port @@ -170,8 +170,6 @@ spec: value: "{{ .Values.cpd_instance_namespace }}" - name: CPD_OPERATORS_NAMESPACE value: "{{ .Values.cpd_operators_namespace }}" - - name: CIS_SUBDOMAIN - value: "{{ .Values.cis_subdomain }}" - name: CIS_DOMAIN value: "{{ .Values.cis_domain }}" command: @@ -181,7 +179,7 @@ spec: set -e - CPD_PUBLIC_HOST="cpd-public.${CIS_SUBDOMAIN}.${CIS_DOMAIN}" + CPD_PUBLIC_HOST="cpd-public.${CIS_DOMAIN}" echo echo "================================================================================" diff --git a/instance-applications/110-ibm-cp4d/values.yaml b/instance-applications/110-ibm-cp4d/values.yaml index 2c0f01688..60a16d9bf 100644 --- a/instance-applications/110-ibm-cp4d/values.yaml +++ b/instance-applications/110-ibm-cp4d/values.yaml @@ -14,5 +14,4 @@ cpd_metadata_storage_class: "" # without VPN via a separate cpd-public route (type=external, passthrough TLS). # CIS DNS CNAME and edge cert are handled by the suite_dns ansible role upstream. cpd_public_route_enabled: false -cis_subdomain: "" cis_domain: "" diff --git a/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-app.yaml b/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-app.yaml index 3b2ba96df..8cfb89f57 100644 --- a/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-app.yaml @@ -71,7 +71,6 @@ spec: cpd_metadata_storage_class: "{{ .Values.ibm_cp4d.cpd_metadata_storage_class }}" {{- if .Values.ibm_cp4d.cpd_public_route_enabled }} cpd_public_route_enabled: true - cis_subdomain: "{{ .Values.ibm_mas_suite.cis_subdomain }}" cis_domain: "{{ .Values.ibm_mas_suite.cis_mas_domain }}" {{- end }} {{- if not (empty .Values.ibm_wsl) }} From 71a27887e59f620d9222c7babf5f616ef677d581 Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Mon, 7 Sep 2026 21:52:00 +0530 Subject: [PATCH 14/27] fix: updated version --- .../110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml index dacaa33cd..2f5eba662 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml @@ -40,7 +40,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_digest. From 5d356bff7d4d43412f2c04f53cddfa0f4fe37403 Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Mon, 7 Sep 2026 22:59:37 +0530 Subject: [PATCH 15/27] fix: update cpd-public-route job to mascore-15972 CLI image digest (30d03b2) From 19269e6399a43af71614830ee2e0d3bb61ba0526 Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Tue, 8 Sep 2026 00:45:28 +0530 Subject: [PATCH 16/27] fix: script modified for private route --- .../templates/09-ibm-cpd-public-route.yaml | 80 ++++++++++--------- 1 file changed, 43 insertions(+), 37 deletions(-) diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml index 2f5eba662..fbd3b44c6 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml @@ -11,9 +11,15 @@ The Route itself is managed declaratively by ArgoCD (below) The Job only handles what ArgoCD cannot do declaratively: - 1. Patches ZenService zenCustomRoute so nginx accepts the new hostname - 2. Restores the internal cpd route host (ZenService overwrites it as a side effect) - 3. Restarts nginx pods to pick up the updated server_name whitelist + 1. Reads the internal cpd route host + 2. Immediately restores the internal cpd route host (before ZenService can overwrite it) + 3. Patches ZenService zenCustomRoute so nginx accepts the new hostname + 4. Waits for ZenService to reconcile + 5. Restarts nginx pods to pick up the updated server_name whitelist + + Step ordering is critical: the internal cpd route is restored BEFORE ZenService is patched + so ArgoCD never observes the cpd-public route in a HostAlreadyClaimed / Degraded state, + which would block the wave-090 job from running entirely. */}} {{- if .Values.cpd_public_route_enabled }} @@ -40,7 +46,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_digest. @@ -190,8 +196,8 @@ spec: echo # ----------------------------------------------------------------------- - # Step 1: Note the default cpd route host so we can restore it after - # ZenService patches it as a side effect of zenCustomRoute + # Step 1: Read the internal cpd route host. + # We must capture this before ZenService has any chance to overwrite it. # ----------------------------------------------------------------------- echo "Step 1: Reading internal cpd route host..." INTERNAL_CPD_HOST=$(oc get route cpd -n "${CPD_INSTANCE_NAMESPACE}" \ @@ -203,13 +209,34 @@ spec: echo " Internal cpd route host: ${INTERNAL_CPD_HOST}" # ----------------------------------------------------------------------- - # Step 2: Patch ZenService zenCustomRoute (idempotent) - # This adds the hostname to nginx's server_name whitelist. - # NOTE: ZenService replaces the cpd route host as a side effect — - # the internal route is always restored unconditionally in Step 5 below. + # Step 2: Immediately restore the internal cpd route host. + # This MUST happen before patching ZenService. ZenService overwrites the + # cpd route spec.host as a side effect of zenCustomRoute reconciliation, + # causing cpd-public to get HostAlreadyClaimed and ArgoCD to mark the app + # Degraded — which blocks the wave-090 job from ever running. + # By restoring the correct host first, ArgoCD never sees the broken state. + # ----------------------------------------------------------------------- + echo + echo "Step 2: Asserting internal cpd route host is ${INTERNAL_CPD_HOST}..." + CURRENT_CPD_HOST=$(oc get route cpd -n "${CPD_INSTANCE_NAMESPACE}" \ + --ignore-not-found -o jsonpath='{.spec.host}') + if [[ "${CURRENT_CPD_HOST}" == "${INTERNAL_CPD_HOST}" ]]; then + echo " Internal cpd route host is already correct, no patch needed." + else + echo " Patching cpd route (current: ${CURRENT_CPD_HOST})..." + oc patch route cpd -n "${CPD_INSTANCE_NAMESPACE}" --type=merge \ + -p "{\"spec\":{\"host\":\"${INTERNAL_CPD_HOST}\"}}" + echo " Internal cpd route restored." + fi + + # ----------------------------------------------------------------------- + # Step 3: Patch ZenService zenCustomRoute (idempotent). + # This adds the public hostname to nginx's server_name whitelist. + # ZenService will overwrite the cpd route host again as a side effect, + # but Step 2 already ran so ArgoCD has already observed the route as healthy. # ----------------------------------------------------------------------- echo - echo "Step 2: Patching ZenService zenCustomRoute..." + echo "Step 3: Patching ZenService zenCustomRoute..." CURRENT_CUSTOM_HOST=$(oc get ZenService lite-cr -n "${CPD_INSTANCE_NAMESPACE}" \ --ignore-not-found -o jsonpath='{.spec.zenCustomRoute.route_host}') @@ -222,10 +249,10 @@ spec: echo " ZenService patched." # ----------------------------------------------------------------------- - # Step 3: Wait for ZenService to reconcile + # Step 4: Wait for ZenService to reconcile. # ----------------------------------------------------------------------- echo - echo "Step 3: Waiting for ZenService to reach Completed (up to 10 minutes)..." + echo "Step 4: Waiting for ZenService to reach Completed (up to 10 minutes)..." WAIT=0 while true; do ZS_STATUS=$(oc get ZenService lite-cr -n "${CPD_INSTANCE_NAMESPACE}" \ @@ -244,37 +271,16 @@ spec: done # ----------------------------------------------------------------------- - # Step 4: Restart nginx pods so new server_name whitelist takes effect - # nginx reads /nginx_data/defaults.d/external-server.active.conf at startup + # Step 5: Restart nginx pods so new server_name whitelist takes effect. + # nginx reads /nginx_data/defaults.d/external-server.active.conf at startup. # ----------------------------------------------------------------------- echo - echo "Step 4: Restarting nginx pods to load updated server_name config..." + echo "Step 5: Restarting nginx pods to load updated server_name config..." oc delete pods -n "${CPD_INSTANCE_NAMESPACE}" \ -l component=ibm-nginx --ignore-not-found echo " Nginx pods deleted — Kubernetes will recreate them automatically." fi - # ----------------------------------------------------------------------- - # Step 5: Always restore the internal cpd route unconditionally. - # ZenService overwrites spec.host on the cpd route as a side effect of - # zenCustomRoute — both on initial patch AND on subsequent reconciliations. - # Removing zenCustomRoute later does NOT auto-revert it. - # Running this unconditionally ensures the route is correct on every Job - # run, including re-runs triggered by ArgoCD after a values change. - # ----------------------------------------------------------------------- - echo - echo "Step 5: Asserting internal cpd route host is ${INTERNAL_CPD_HOST}..." - CURRENT_CPD_HOST=$(oc get route cpd -n "${CPD_INSTANCE_NAMESPACE}" \ - --ignore-not-found -o jsonpath='{.spec.host}') - if [[ "${CURRENT_CPD_HOST}" == "${INTERNAL_CPD_HOST}" ]]; then - echo " Internal cpd route host is already correct, no patch needed." - else - echo " Patching cpd route (current: ${CURRENT_CPD_HOST})..." - oc patch route cpd -n "${CPD_INSTANCE_NAMESPACE}" --type=merge \ - -p "{\"spec\":{\"host\":\"${INTERNAL_CPD_HOST}\"}}" - echo " Internal cpd route restored." - fi - echo echo "================================================================================" echo "CPD Public Route setup complete!" From e06e186eda8a580b87a062fc62d0002766acf934 Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Tue, 8 Sep 2026 01:26:24 +0530 Subject: [PATCH 17/27] fix: restore internal cpd route AFTER ZenService Completed (v4) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move cpd route restore from Step 2 (before ZenService patch) to Step 4 (after ZenService Completed). ZenService overwrites cpd route spec.host during its own reconcile cycle — restoring before was immediately undone. Restoring after ZenService Completed ensures the correct hostname sticks permanently. Also: Step 1 now detects if ZenService already overwrote the host and derives the correct internal hostname from the cluster ingress domain as a fallback. Steps: 1. Read internal cpd route host (with fallback if already overwritten) 2. Patch ZenService zenCustomRoute 3. Wait for ZenService Completed 4. Restore internal cpd route host ← key fix 5. Restart nginx pods Job version bumped v3 → v4. --- .../templates/09-ibm-cpd-public-route.yaml | 137 ++++++++++-------- 1 file changed, 74 insertions(+), 63 deletions(-) diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml index fbd3b44c6..3b2949c16 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml @@ -12,14 +12,16 @@ The Route itself is managed declaratively by ArgoCD (below) The Job only handles what ArgoCD cannot do declaratively: 1. Reads the internal cpd route host - 2. Immediately restores the internal cpd route host (before ZenService can overwrite it) - 3. Patches ZenService zenCustomRoute so nginx accepts the new hostname - 4. Waits for ZenService to reconcile + 2. Patches ZenService zenCustomRoute so nginx accepts the new hostname + 3. Waits for ZenService to reach Completed + 4. Restores the internal cpd route host (AFTER ZenService finishes — it overwrites it + as a side effect of zenCustomRoute reconciliation) 5. Restarts nginx pods to pick up the updated server_name whitelist - Step ordering is critical: the internal cpd route is restored BEFORE ZenService is patched - so ArgoCD never observes the cpd-public route in a HostAlreadyClaimed / Degraded state, - which would block the wave-090 job from running entirely. + Step ordering is critical: the internal cpd route is restored AFTER ZenService Completed, + not before patching it. ZenService overwrites cpd route spec.host during its own reconcile + cycle — restoring before would be immediately undone. Restoring after ensures the correct + hostname sticks and cpd-public is never left in HostAlreadyClaimed state. */}} {{- if .Values.cpd_public_route_enabled }} @@ -46,7 +48,7 @@ Increment this value whenever you make a change to an immutable field of the Job E.g. passing in a new environment variable. Included in $_job_hash (see below). */}} -{{- $_job_version := "v3" }} +{{- $_job_version := "v4" }} {{- /* 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_digest. @@ -196,8 +198,7 @@ spec: echo # ----------------------------------------------------------------------- - # Step 1: Read the internal cpd route host. - # We must capture this before ZenService has any chance to overwrite it. + # Step 1: Read the internal cpd route host before patching anything. # ----------------------------------------------------------------------- echo "Step 1: Reading internal cpd route host..." INTERNAL_CPD_HOST=$(oc get route cpd -n "${CPD_INSTANCE_NAMESPACE}" \ @@ -206,37 +207,26 @@ spec: echo "ERROR: Could not find internal cpd route in ${CPD_INSTANCE_NAMESPACE}" exit 1 fi - echo " Internal cpd route host: ${INTERNAL_CPD_HOST}" - - # ----------------------------------------------------------------------- - # Step 2: Immediately restore the internal cpd route host. - # This MUST happen before patching ZenService. ZenService overwrites the - # cpd route spec.host as a side effect of zenCustomRoute reconciliation, - # causing cpd-public to get HostAlreadyClaimed and ArgoCD to mark the app - # Degraded — which blocks the wave-090 job from ever running. - # By restoring the correct host first, ArgoCD never sees the broken state. - # ----------------------------------------------------------------------- - echo - echo "Step 2: Asserting internal cpd route host is ${INTERNAL_CPD_HOST}..." - CURRENT_CPD_HOST=$(oc get route cpd -n "${CPD_INSTANCE_NAMESPACE}" \ - --ignore-not-found -o jsonpath='{.spec.host}') - if [[ "${CURRENT_CPD_HOST}" == "${INTERNAL_CPD_HOST}" ]]; then - echo " Internal cpd route host is already correct, no patch needed." + # If ZenService already overwrote it, derive the correct host from the cluster domain. + # The correct internal host follows the pattern: cpd-. + if [[ "${INTERNAL_CPD_HOST}" == "${CPD_PUBLIC_HOST}" ]]; then + echo " WARNING: cpd route host already overwritten by ZenService (${INTERNAL_CPD_HOST})" + CLUSTER_DOMAIN=$(oc get ingresses.config.openshift.io cluster \ + -o jsonpath='{.spec.domain}') + INTERNAL_CPD_HOST="cpd-${CPD_INSTANCE_NAMESPACE}.${CLUSTER_DOMAIN}" + echo " Derived correct internal host: ${INTERNAL_CPD_HOST}" else - echo " Patching cpd route (current: ${CURRENT_CPD_HOST})..." - oc patch route cpd -n "${CPD_INSTANCE_NAMESPACE}" --type=merge \ - -p "{\"spec\":{\"host\":\"${INTERNAL_CPD_HOST}\"}}" - echo " Internal cpd route restored." + echo " Internal cpd route host: ${INTERNAL_CPD_HOST}" fi # ----------------------------------------------------------------------- - # Step 3: Patch ZenService zenCustomRoute (idempotent). + # Step 2: Patch ZenService zenCustomRoute (idempotent). # This adds the public hostname to nginx's server_name whitelist. - # ZenService will overwrite the cpd route host again as a side effect, - # but Step 2 already ran so ArgoCD has already observed the route as healthy. + # NOTE: ZenService will overwrite cpd route spec.host as a side effect of + # its reconcile — this is corrected in Step 4 after reconcile completes. # ----------------------------------------------------------------------- echo - echo "Step 3: Patching ZenService zenCustomRoute..." + echo "Step 2: Patching ZenService zenCustomRoute..." CURRENT_CUSTOM_HOST=$(oc get ZenService lite-cr -n "${CPD_INSTANCE_NAMESPACE}" \ --ignore-not-found -o jsonpath='{.spec.zenCustomRoute.route_host}') @@ -247,40 +237,61 @@ spec: oc patch ZenService lite-cr -n "${CPD_INSTANCE_NAMESPACE}" --type=merge \ -p "{\"spec\":{\"zenCustomRoute\":{\"route_host\":\"${CPD_PUBLIC_HOST}\"}}}" echo " ZenService patched." + fi - # ----------------------------------------------------------------------- - # Step 4: Wait for ZenService to reconcile. - # ----------------------------------------------------------------------- - echo - echo "Step 4: Waiting for ZenService to reach Completed (up to 10 minutes)..." - WAIT=0 - while true; do - ZS_STATUS=$(oc get ZenService lite-cr -n "${CPD_INSTANCE_NAMESPACE}" \ - --ignore-not-found -o jsonpath='{.status.zenStatus}') - echo " ZenService status: ${ZS_STATUS}" - if [[ "${ZS_STATUS}" == "Completed" ]]; then - echo " ZenService reconcile complete." - break - fi - WAIT=$((WAIT + 30)) - if [[ ${WAIT} -gt 600 ]]; then - echo "WARNING: ZenService did not reach Completed within 10 minutes. Proceeding anyway." - break - fi - sleep 30 - done + # ----------------------------------------------------------------------- + # Step 3: Wait for ZenService to reach Completed. + # ZenService overwrites cpd route spec.host during this reconcile — that + # is intentional and corrected immediately after in Step 4. + # ----------------------------------------------------------------------- + echo + echo "Step 3: Waiting for ZenService to reach Completed (up to 10 minutes)..." + WAIT=0 + while true; do + ZS_STATUS=$(oc get ZenService lite-cr -n "${CPD_INSTANCE_NAMESPACE}" \ + --ignore-not-found -o jsonpath='{.status.zenStatus}') + echo " ZenService status: ${ZS_STATUS}" + if [[ "${ZS_STATUS}" == "Completed" ]]; then + echo " ZenService reconcile complete." + break + fi + WAIT=$((WAIT + 30)) + if [[ ${WAIT} -gt 600 ]]; then + echo "WARNING: ZenService did not reach Completed within 10 minutes. Proceeding anyway." + break + fi + sleep 30 + done - # ----------------------------------------------------------------------- - # Step 5: Restart nginx pods so new server_name whitelist takes effect. - # nginx reads /nginx_data/defaults.d/external-server.active.conf at startup. - # ----------------------------------------------------------------------- - echo - echo "Step 5: Restarting nginx pods to load updated server_name config..." - oc delete pods -n "${CPD_INSTANCE_NAMESPACE}" \ - -l component=ibm-nginx --ignore-not-found - echo " Nginx pods deleted — Kubernetes will recreate them automatically." + # ----------------------------------------------------------------------- + # Step 4: Restore the internal cpd route host unconditionally. + # ZenService overwrites spec.host on the cpd route as a side effect of + # zenCustomRoute reconciliation. We restore it here, AFTER ZenService + # has fully reconciled, so the restore sticks and is not overwritten again. + # ----------------------------------------------------------------------- + echo + echo "Step 4: Restoring internal cpd route host to ${INTERNAL_CPD_HOST}..." + CURRENT_CPD_HOST=$(oc get route cpd -n "${CPD_INSTANCE_NAMESPACE}" \ + --ignore-not-found -o jsonpath='{.spec.host}') + if [[ "${CURRENT_CPD_HOST}" == "${INTERNAL_CPD_HOST}" ]]; then + echo " Internal cpd route host is already correct, no patch needed." + else + echo " Patching cpd route (current: ${CURRENT_CPD_HOST})..." + oc patch route cpd -n "${CPD_INSTANCE_NAMESPACE}" --type=merge \ + -p "{\"spec\":{\"host\":\"${INTERNAL_CPD_HOST}\"}}" + echo " Internal cpd route restored to ${INTERNAL_CPD_HOST}." fi + # ----------------------------------------------------------------------- + # Step 5: Restart nginx pods so new server_name whitelist takes effect. + # nginx reads /nginx_data/defaults.d/external-server.active.conf at startup. + # ----------------------------------------------------------------------- + echo + echo "Step 5: Restarting nginx pods to load updated server_name config..." + oc delete pods -n "${CPD_INSTANCE_NAMESPACE}" \ + -l component=ibm-nginx --ignore-not-found + echo " Nginx pods deleted — Kubernetes will recreate them automatically." + echo echo "================================================================================" echo "CPD Public Route setup complete!" From d4273076ec578ab678e88b5df83473aaec33698d Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Wed, 9 Sep 2026 01:18:26 +0530 Subject: [PATCH 18/27] fix: review comments --- .../templates/09-ibm-cpd-public-route.yaml | 10 ++++------ .../templates/010-ibm-sync-jobs.yaml | 2 +- .../templates/110-ibm-cp4d-app.yaml | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml index 3b2949c16..d49c88823 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml @@ -48,7 +48,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_digest. @@ -75,15 +75,11 @@ metadata: namespace: "{{ .Values.cpd_instance_namespace }}" annotations: argocd.argoproj.io/sync-wave: "089" -{{- if .Values.custom_labels }} labels: type: external route-type: external +{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 4 }} -{{- else }} - labels: - type: external - route-type: external {{- end }} spec: host: "cpd-public.{{ .Values.cis_domain }}" @@ -174,6 +170,8 @@ spec: env: - name: INSTANCE_ID value: "{{ .Values.instance_id }}" + - name: CPD_PUBLIC_ROUTE_ENABLED + value: "{{ .Values.cpd_public_route_enabled }}" - name: CPD_INSTANCE_NAMESPACE value: "{{ .Values.cpd_instance_namespace }}" - name: CPD_OPERATORS_NAMESPACE diff --git a/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml b/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml index 8c3932b2e..e9057a521 100644 --- a/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml +++ b/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml @@ -104,7 +104,7 @@ spec: {{- $visualinspection_str := ternary "" "visualinspection" (empty $visualinspection) -}} {{- $optimizer_str := ternary "" "optimizer" (empty $optimizer) -}} {{- $facilities_str := ternary "" "facilities" (empty $facilities) -}} - {{- $cpd_public_str := ternary (printf "cpd-public.%s" $core.cis_subdomain) "" (and (not (empty $core)) (not (empty .Values.ibm_cp4d)) (.Values.ibm_cp4d.cpd_public_route_enabled | default false)) -}} + {{- $cpd_public_str := ternary "cpd-public" "" (and (not (empty $core)) (not (empty .Values.ibm_cp4d)) (.Values.ibm_cp4d.cpd_public_route_enabled | default false)) -}} {{- $list := list $health_str $iot_str $core_str $manage_str $reportdb_str $monitor_str $predict_str $visualinspection_str $optimizer_str $facilities_str $cpd_public_str | compact }} cis_entries_to_add: {{ printf "%s" (join "," $list) }} diff --git a/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-app.yaml b/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-app.yaml index 8cfb89f57..f43aea300 100644 --- a/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-app.yaml @@ -69,7 +69,7 @@ spec: cpd_iam_integration: "{{ .Values.ibm_cp4d.cpd_iam_integration }}" cpd_primary_storage_class: "{{ .Values.ibm_cp4d.cpd_primary_storage_class }}" cpd_metadata_storage_class: "{{ .Values.ibm_cp4d.cpd_metadata_storage_class }}" - {{- if .Values.ibm_cp4d.cpd_public_route_enabled }} + {{- if and .Values.ibm_cp4d.cpd_public_route_enabled (eq .Values.ibm_mas_suite.dns_provider "cis") }} cpd_public_route_enabled: true cis_domain: "{{ .Values.ibm_mas_suite.cis_mas_domain }}" {{- end }} From 5884717063391cb90e96438565299c95077d6c62 Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Wed, 9 Sep 2026 13:20:56 +0530 Subject: [PATCH 19/27] fix: pass CPD_PUBLIC_ROUTE_ENABLED to suite_dns job - 010-ibm-sync-jobs.yaml (root app): pass cpd_public_route_enabled: true to sync-jobs chart values when cpd_public_route is enabled - 01-ibm-mas_suite_dns_Job.yaml: add CPD_PUBLIC_ROUTE_ENABLED env var so gitops_suite_dns function creates CIS DNS CNAME + edge cert automatically without relying on prior manual setup - bump suite_dns job version v3 -> v4 --- .../templates/01-ibm-mas_suite_dns_Job.yaml | 6 ++++-- .../ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) 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 165fa3991..6f1df3bb6 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 @@ -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 := "v3" }} +{{- $_job_version := "v4" }} {{- /* 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_digest @@ -138,8 +138,10 @@ spec: value: "{{ .Values.override_edge_certs }}" - name: CIS_ENTRIES_TO_ADD value: "{{ .Values.cis_entries_to_add }}" + - name: CPD_PUBLIC_ROUTE_ENABLED + value: "{{ .Values.cpd_public_route_enabled | default false }}" - name: CIS_ALLOWED_IPS - value: "{{ .Values.cis_allowed_ips }}" + value: "{{ .Values.cis_allowed_ips }}" - name: SM_AWS_REGION value: "{{ .Values.sm_aws_region }}" diff --git a/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml b/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml index e9057a521..836cc08be 100644 --- a/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml +++ b/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml @@ -108,6 +108,9 @@ spec: {{- $list := list $health_str $iot_str $core_str $manage_str $reportdb_str $monitor_str $predict_str $visualinspection_str $optimizer_str $facilities_str $cpd_public_str | compact }} cis_entries_to_add: {{ printf "%s" (join "," $list) }} + {{- if and (not (empty .Values.ibm_cp4d)) .Values.ibm_cp4d.cpd_public_route_enabled }} + cpd_public_route_enabled: true + {{- end }} {{- if .Values.override_dns_cis_flags_to_false }} update_dns_entries: "false" From 27cb628c3316f835c6c6fb246201c91d0f3d17e9 Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Wed, 9 Sep 2026 15:50:56 +0530 Subject: [PATCH 20/27] fix: remove CPD_PUBLIC_ROUTE_ENABLED from suite_dns job CPD_PUBLIC_ROUTE_ENABLED is not needed in the suite_dns job because: - cis_entries_to_add already contains 'cpd-public' when cpd_public_route_enabled is true - ansible-devops derives edge_certs_cpd_public from cis_entries_to_add directly - setting CPD_PUBLIC_ROUTE_ENABLED=true in the CLI would override CIS_ENTRIES_TO_ADD entirely, wiping out core/manage/reportdb/facilities DNS entries DNS CNAME and edge cert are created correctly via cis_entries_to_add alone. Revert suite_dns job version v4 -> v3. --- .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml | 4 +--- .../ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) 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 6f1df3bb6..ef40ec55a 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 @@ -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 := "v4" }} +{{- $_job_version := "v3" }} {{- /* 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_digest @@ -138,8 +138,6 @@ spec: value: "{{ .Values.override_edge_certs }}" - name: CIS_ENTRIES_TO_ADD value: "{{ .Values.cis_entries_to_add }}" - - name: CPD_PUBLIC_ROUTE_ENABLED - value: "{{ .Values.cpd_public_route_enabled | default false }}" - name: CIS_ALLOWED_IPS value: "{{ .Values.cis_allowed_ips }}" diff --git a/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml b/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml index 836cc08be..14a8cf857 100644 --- a/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml +++ b/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml @@ -108,10 +108,6 @@ spec: {{- $list := list $health_str $iot_str $core_str $manage_str $reportdb_str $monitor_str $predict_str $visualinspection_str $optimizer_str $facilities_str $cpd_public_str | compact }} cis_entries_to_add: {{ printf "%s" (join "," $list) }} - {{- if and (not (empty .Values.ibm_cp4d)) .Values.ibm_cp4d.cpd_public_route_enabled }} - cpd_public_route_enabled: true - {{- end }} - {{- if .Values.override_dns_cis_flags_to_false }} update_dns_entries: "false" delete_wildcards: "false" From 869920f02fa82d5a87e358140279c75fa0899302 Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Wed, 9 Sep 2026 18:13:05 +0530 Subject: [PATCH 21/27] fix: add CPD_PUBLIC_ROUTE_ENABLED to suite_dns job for DNS CNAME creation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The suite_dns ansible role uses cpd_public_route_enabled (from CPD_PUBLIC_ROUTE_ENABLED env var) in dnsentries.yml.j2 to create the cpd-public DNS CNAME. Without this env var the CNAME is never created even though the edge cert is ordered correctly via cis_entries_to_add. The CLI gitops_suite_dns bug (overwriting CIS_ENTRIES_TO_ADD entirely) is fixed separately in the CLI repo — it now appends cpd-public instead of overwriting. Since cis_entries_to_add already contains cpd-public, the append is a no-op and does not affect the cert ordering flow. - 010-ibm-sync-jobs.yaml: pass cpd_public_route_enabled: true to chart values - 01-ibm-mas_suite_dns_Job.yaml: add CPD_PUBLIC_ROUTE_ENABLED env var, bump v3->v4 --- .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml | 4 +++- .../ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 ef40ec55a..6f1df3bb6 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 @@ -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 := "v3" }} +{{- $_job_version := "v4" }} {{- /* 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_digest @@ -138,6 +138,8 @@ spec: value: "{{ .Values.override_edge_certs }}" - name: CIS_ENTRIES_TO_ADD value: "{{ .Values.cis_entries_to_add }}" + - name: CPD_PUBLIC_ROUTE_ENABLED + value: "{{ .Values.cpd_public_route_enabled | default false }}" - name: CIS_ALLOWED_IPS value: "{{ .Values.cis_allowed_ips }}" diff --git a/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml b/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml index 14a8cf857..8ca9e4d7d 100644 --- a/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml +++ b/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml @@ -108,6 +108,9 @@ spec: {{- $list := list $health_str $iot_str $core_str $manage_str $reportdb_str $monitor_str $predict_str $visualinspection_str $optimizer_str $facilities_str $cpd_public_str | compact }} cis_entries_to_add: {{ printf "%s" (join "," $list) }} + {{- if and (not (empty .Values.ibm_cp4d)) .Values.ibm_cp4d.cpd_public_route_enabled }} + cpd_public_route_enabled: true + {{- end }} {{- if .Values.override_dns_cis_flags_to_false }} update_dns_entries: "false" delete_wildcards: "false" From 86da58e17751897fb32cd7f111a886e7a08daefa Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Wed, 9 Sep 2026 21:57:08 +0530 Subject: [PATCH 22/27] =?UTF-8?q?test:=20bump=20suite=5Fdns=20job=20versio?= =?UTF-8?q?n=20v4=E2=86=92v5=20to=20re-trigger=20end-to-end=20on=20mas-clu?= =?UTF-8?q?ster-8/inst1002?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6f1df3bb6..5f36394d6 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 @@ -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 := "v4" }} +{{- $_job_version := "v5" }} {{- /* 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_digest From dae6ace7626f54fe2bef3fe1f493765f90651cf4 Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Thu, 10 Sep 2026 00:04:47 +0530 Subject: [PATCH 23/27] fix(MASCORE-15972): update CLI digest to 9488282 (cpd-public proxied:false fix) + bump suite_dns v6 --- .../templates/_ecr-token-updater-helpers.tpl | 2 +- .../000-job-cleaner/templates/04-jobcleaner_CronJob.yaml | 2 +- .../templates/04-postsync-update-sm_Job.yaml | 2 +- .../030-ibm-dro/templates/12-2-dro-dns_job.yaml | 2 +- .../030-ibm-dro/templates/14-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 +- .../templates/02-cluster-verify_Job.yaml | 2 +- .../templates/03-cluster-promoter_Job.yaml | 2 +- .../templates/00-aws-docdb-add-user_Job.yaml | 2 +- .../templates/00-preinstall-mas-rbac_Job.yaml | 2 +- .../templates/01-ibm-mas_suite_certs_Job.yaml | 2 +- .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml | 4 ++-- .../templates/PostDelete-aws-docdb-remove-user_Job.yaml | 2 +- .../100-ibm-sls/templates/07-postsync-update-sm_Job.yaml | 2 +- .../101-ibm-sync-jobs-cp4d/templates/02-ibm-cp4d-presync.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 +- .../110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml | 2 +- .../templates/07-postsync-migration-job.yaml | 2 +- .../templates/00-presync-migration-job.yaml | 2 +- .../templates/03-tenant-migration-job.yaml | 2 +- .../templates/06-aiservice-km-s3-secret.yaml | 2 +- .../templates/08-aiservice-postsyncjob.yaml | 2 +- .../templates/08-postsync-migration-job.yaml | 2 +- .../templates/98-presync-copy-sls.yaml | 2 +- .../templates/00-presync-await-crd_Job.yaml | 2 +- .../120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml | 2 +- .../templates/04-db2u-Volatile-Runstats_Cron.yaml | 2 +- .../templates/07-postsync-setup-db2_Job.yaml | 2 +- .../templates/08-postsync-db2-audit-policy_Job.yaml | 2 +- .../120-ibm-db2u-database/templates/09-db2u-Audit_Cron.yaml | 2 +- .../templates/10-postsync-setup-hadr.yaml | 2 +- .../templates/00-presync-create-database.yaml | 2 +- .../templates/01-dbs-rds-postsync-setup.yaml | 2 +- .../templates/03-backup-cronjobs.yaml | 2 +- .../120-ibm-spark/templates/02-ibm-spark-control-plane.yaml | 2 +- .../120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml | 2 +- .../templates/01-cpd-service-post-ops.yaml | 2 +- .../templates/00-presync-create-db2-rds-user-Job.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 +- .../templates/postdelete-delete-cr.yaml | 2 +- .../templates/postdelete-delete-cr.yaml | 2 +- .../templates/postdelete-delete-cr.yaml | 2 +- .../templates/postdelete-delete-cr.yaml | 2 +- .../templates/postdelete-delete-cr.yaml | 2 +- .../templates/postdelete-delete-cr.yaml | 2 +- .../templates/postdelete-delete-cr.yaml | 2 +- .../templates/05-postsync-add-label_Job.yaml | 2 +- .../templates/06-postsync-configtool-oidc.yaml | 2 +- .../templates/07-postsync-set_welcome_messsage_Job.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/703-postsync-rds-app-roles.yaml | 2 +- .../templates/postdelete-delete-cr.yaml | 2 +- .../templates/001-ibm-create-initial-users.yaml | 2 +- .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 2 +- .../100-ibm-sls/templates/08-postsync-update-sm_Job.yaml | 2 +- .../junitreporter/templates/00-presync-report-starter.yaml | 2 +- .../junitreporter/templates/10-postsync-report-starter.yaml | 2 +- 80 files changed, 81 insertions(+), 81 deletions(-) diff --git a/cluster-applications/000-image-mirroring/templates/_ecr-token-updater-helpers.tpl b/cluster-applications/000-image-mirroring/templates/_ecr-token-updater-helpers.tpl index 7b8672f16..ba3cf3a32 100644 --- a/cluster-applications/000-image-mirroring/templates/_ecr-token-updater-helpers.tpl +++ b/cluster-applications/000-image-mirroring/templates/_ecr-token-updater-helpers.tpl @@ -3,7 +3,7 @@ ECR Token Updater Pod Template This template defines the pod specification used by both the CronJob and the initial Job */}} {{- define "ecr-token-updater.podTemplate" -}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} metadata: {{- if .Values.custom_labels }} labels: 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 0a059d6eb..4b7328649 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- $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 4ad9df872..55dd5f4f1 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/cluster-applications/030-ibm-dro/templates/12-2-dro-dns_job.yaml b/cluster-applications/030-ibm-dro/templates/12-2-dro-dns_job.yaml index ee0f0e608..fc6f0ecb0 100644 --- a/cluster-applications/030-ibm-dro/templates/12-2-dro-dns_job.yaml +++ b/cluster-applications/030-ibm-dro/templates/12-2-dro-dns_job.yaml @@ -18,7 +18,7 @@ data: type: Opaque --- {{- if and (eq .Values.dns_provider "cis") (not (empty .Values.cis_crn)) (not (empty .Values.dro_public_domain)) }} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- $_job_name_prefix := "ibm-dro-dns" }} {{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }} {{- $_job_config_values := omit .Values "junitreporter" }} diff --git a/cluster-applications/030-ibm-dro/templates/14-postsync-update-sm_Job.yaml b/cluster-applications/030-ibm-dro/templates/14-postsync-update-sm_Job.yaml index e70b6c99b..bf0d3ff7c 100644 --- a/cluster-applications/030-ibm-dro/templates/14-postsync-update-sm_Job.yaml +++ b/cluster-applications/030-ibm-dro/templates/14-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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/cluster-applications/032-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml b/cluster-applications/032-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml index b38525f21..e7e3371a1 100644 --- a/cluster-applications/032-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml +++ b/cluster-applications/032-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml @@ -2,7 +2,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $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 ae08d53eb..373eeac10 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $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 efa4dbf09..dfea9366b 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} --- 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 66a45ec3b..2e85a6ca1 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* 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 b4d8c4cfa..a8fdcf276 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* 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 c718ea711..e79f5c9c6 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* 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 263f211a3..880e3dec8 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 @@ -12,7 +12,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* 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-preinstall-mas-rbac_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-preinstall-mas-rbac_Job.yaml index d5a73978b..4041fc1f8 100644 --- a/instance-applications/010-ibm-sync-jobs/templates/00-preinstall-mas-rbac_Job.yaml +++ b/instance-applications/010-ibm-sync-jobs/templates/00-preinstall-mas-rbac_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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* 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 350a43838..d26145474 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 @@ -11,7 +11,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* 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 5f36394d6..9e0a02b89 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 @@ -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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* A dict of values that influence the behaviour of the job in some way. @@ -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 := "v5" }} +{{- $_job_version := "v6" }} {{- /* 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_digest 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 5e617fb9f..d9b867586 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 @@ -8,7 +8,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} # 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 95a5762fb..31ec1b5d8 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/101-ibm-sync-jobs-cp4d/templates/02-ibm-cp4d-presync.yaml b/instance-applications/101-ibm-sync-jobs-cp4d/templates/02-ibm-cp4d-presync.yaml index 04d2a6ef9..9cb8511c2 100644 --- a/instance-applications/101-ibm-sync-jobs-cp4d/templates/02-ibm-cp4d-presync.yaml +++ b/instance-applications/101-ibm-sync-jobs-cp4d/templates/02-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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* 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 c3b04facb..264160107 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* 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 8ec54de0b..3250b4f81 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* 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 5cbd451c0..f82b14d3c 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* 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 9e303724d..6d2e9b6fd 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* 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 c58a5fdd3..a97ce6c27 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* 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 68f475f7d..cb8b8dd7b 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* 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-cpd-public-route.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml index d49c88823..4d931172f 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml @@ -34,7 +34,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/113-ibm-aiservice/templates/07-postsync-migration-job.yaml b/instance-applications/113-ibm-aiservice/templates/07-postsync-migration-job.yaml index de992e391..ad8dcb2cd 100644 --- a/instance-applications/113-ibm-aiservice/templates/07-postsync-migration-job.yaml +++ b/instance-applications/113-ibm-aiservice/templates/07-postsync-migration-job.yaml @@ -1,7 +1,7 @@ {{- if hasPrefix "9.2." (toString .Values.aiservice_channel) }} {{- $_job_name_prefix := "postsync-aiservice-migration" }} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- $_job_config_values := omit .Values "junitreporter" }} {{- $_job_version := "v1" }} {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/00-presync-migration-job.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/00-presync-migration-job.yaml index cc432c878..964f4ee2a 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/00-presync-migration-job.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/00-presync-migration-job.yaml @@ -6,7 +6,7 @@ ################################################################################################### {{- $_job_name_prefix := "presync-tenant-migration" }} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- $_job_config_values := omit .Values "junitreporter" }} {{- $_job_version := "v2" }} {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/03-tenant-migration-job.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/03-tenant-migration-job.yaml index d81385816..03f575395 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/03-tenant-migration-job.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/03-tenant-migration-job.yaml @@ -1,5 +1,5 @@ {{- $_job_name_prefix := "tenant-migration" }} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- $_job_config_values := omit .Values "junitreporter" }} {{- $_job_version := "v2" }} # We use the timestamp to ensure a unique job name on each run but preserve the existing name generation diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-km-s3-secret.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-km-s3-secret.yaml index 6cec3a796..b92c04232 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-km-s3-secret.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-km-s3-secret.yaml @@ -1,6 +1,6 @@ {{- if .Values.application_admin_role }} {{- $_job_name_prefix := "presync-copy-ai-secrets" }} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- $_job_config_values := omit .Values "junitreporter" }} {{- $_job_version := "v5" }} {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/08-aiservice-postsyncjob.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/08-aiservice-postsyncjob.yaml index 615d25be7..8aa3b7a60 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/08-aiservice-postsyncjob.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/08-aiservice-postsyncjob.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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }}{{- /* +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }}{{- /* 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 diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/08-postsync-migration-job.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/08-postsync-migration-job.yaml index bd13a0185..08216b770 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/08-postsync-migration-job.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/08-postsync-migration-job.yaml @@ -1,5 +1,5 @@ {{- $_job_name_prefix := "postsync-tenant-migration" }} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- $_job_config_values := omit .Values "junitreporter" }} {{- $_job_version := "v3" }} {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/98-presync-copy-sls.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/98-presync-copy-sls.yaml index 3b6f8c8be..437ff4a83 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/98-presync-copy-sls.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/98-presync-copy-sls.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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* 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 ee93512f8..3cf9fa4f4 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 @@ -2,7 +2,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} --- # 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 88cc3c497..91d7a6fc1 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 @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} #apiVersion: batch/v1beta1 kind: CronJob diff --git a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Volatile-Runstats_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Volatile-Runstats_Cron.yaml index 6228133db..18972968d 100644 --- a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Volatile-Runstats_Cron.yaml +++ b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Volatile-Runstats_Cron.yaml @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} # # CronJob for Volatile Tables RUNSTATS 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 445535936..c21105648 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 @@ -18,7 +18,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/120-ibm-db2u-database/templates/08-postsync-db2-audit-policy_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/08-postsync-db2-audit-policy_Job.yaml index c0dbc738c..8eb47ef19 100644 --- a/instance-applications/120-ibm-db2u-database/templates/08-postsync-db2-audit-policy_Job.yaml +++ b/instance-applications/120-ibm-db2u-database/templates/08-postsync-db2-audit-policy_Job.yaml @@ -29,7 +29,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/120-ibm-db2u-database/templates/09-db2u-Audit_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/09-db2u-Audit_Cron.yaml index 1dfd89270..86636a0bd 100644 --- a/instance-applications/120-ibm-db2u-database/templates/09-db2u-Audit_Cron.yaml +++ b/instance-applications/120-ibm-db2u-database/templates/09-db2u-Audit_Cron.yaml @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} # # CronJob for DB2 Audit Log Extraction 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 f35a48026..89449b395 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 @@ -11,7 +11,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/120-ibm-dbs-rds-database/templates/00-presync-create-database.yaml b/instance-applications/120-ibm-dbs-rds-database/templates/00-presync-create-database.yaml index 54ccb003e..f7ad0493b 100644 --- a/instance-applications/120-ibm-dbs-rds-database/templates/00-presync-create-database.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/templates/00-presync-create-database.yaml @@ -1,6 +1,6 @@ {{- if .Values.application_admin_role }} {{- $_job_name_prefix := "dbs-rds-presync-create-db" }} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- $_job_config_values := omit .Values "junitreporter" }} {{- $_job_version := "v1" }} {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} diff --git a/instance-applications/120-ibm-dbs-rds-database/templates/01-dbs-rds-postsync-setup.yaml b/instance-applications/120-ibm-dbs-rds-database/templates/01-dbs-rds-postsync-setup.yaml index d26839c61..23cf88ebd 100644 --- a/instance-applications/120-ibm-dbs-rds-database/templates/01-dbs-rds-postsync-setup.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/templates/01-dbs-rds-postsync-setup.yaml @@ -8,7 +8,7 @@ Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/120-ibm-dbs-rds-database/templates/03-backup-cronjobs.yaml b/instance-applications/120-ibm-dbs-rds-database/templates/03-backup-cronjobs.yaml index 674c38c8d..f5af50e92 100644 --- a/instance-applications/120-ibm-dbs-rds-database/templates/03-backup-cronjobs.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/templates/03-backup-cronjobs.yaml @@ -2,7 +2,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} --- # Full Backup CronJob (Sundays at 2 AM) 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 385156286..308981396 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* 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 f7d34f7f8..d17b06823 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml b/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml index fc60408bd..679c54575 100644 --- a/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml +++ b/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* 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-rds-user-Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-rds-user-Job.yaml index de9543c58..d992c708f 100644 --- a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-rds-user-Job.yaml +++ b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-rds-user-Job.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} - {{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} + {{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $ns := printf "mas-%s-core" .Values.instance_id }} {{ $prefix := printf "pre-jdbc-create-user-%s" .Values.mas_config_name }} 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 da7f72fbc..f24b9b190 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $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 4421b0d32..f54d3521c 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $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 9bb368428..1a89d30ae 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 @@ -5,7 +5,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $ns := printf "mas-%s-core" .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 e7a1fe332..abf53429d 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 @@ -22,7 +22,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} --- apiVersion: batch/v1 diff --git a/instance-applications/130-ibm-mas-aicfg-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-aicfg-config/templates/postdelete-delete-cr.yaml index 46a315902..cef7c14ea 100644 --- a/instance-applications/130-ibm-mas-aicfg-config/templates/postdelete-delete-cr.yaml +++ b/instance-applications/130-ibm-mas-aicfg-config/templates/postdelete-delete-cr.yaml @@ -1,7 +1,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} --- apiVersion: batch/v1 diff --git a/instance-applications/130-ibm-mas-app-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-app-config/templates/postdelete-delete-cr.yaml index 14dcc81f5..8893dda30 100644 --- a/instance-applications/130-ibm-mas-app-config/templates/postdelete-delete-cr.yaml +++ b/instance-applications/130-ibm-mas-app-config/templates/postdelete-delete-cr.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $cr_name := .Values.mas_config_name }} {{ $cr_kind := .Values.mas_config_kind }} 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 2b17c724e..f79835ee2 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $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 2b17c724e..f79835ee2 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $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 acf1e07c7..86dbe1e0c 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $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 2b17c724e..f79835ee2 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $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 2b17c724e..f79835ee2 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $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 881e18aeb..e72495abf 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 @@ -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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* 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 e575a0ce3..d08c806e8 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 @@ -11,7 +11,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/130-ibm-mas-suite/templates/07-postsync-set_welcome_messsage_Job.yaml b/instance-applications/130-ibm-mas-suite/templates/07-postsync-set_welcome_messsage_Job.yaml index d862337e9..7b9d09839 100644 --- a/instance-applications/130-ibm-mas-suite/templates/07-postsync-set_welcome_messsage_Job.yaml +++ b/instance-applications/130-ibm-mas-suite/templates/07-postsync-set_welcome_messsage_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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* 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 2b17c724e..f79835ee2 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $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 2aced2823..77ac8e610 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,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} --- # 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 0b1aad636..0142d6ffe 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 @@ -7,7 +7,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $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 93b9aa870..bf13237ce 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 @@ -7,7 +7,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $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 d913db0a6..77b4b2c9c 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 @@ -6,7 +6,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $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 a8693e487..a6eaccf14 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 @@ -1,7 +1,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $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 60ac49425..b89630a8d 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 @@ -5,7 +5,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} # 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 97d665a75..f1f13107f 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 @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} # 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 c0781a1b5..402216c1b 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 @@ -6,7 +6,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} # 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 d2304dd76..e197a1453 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 @@ -5,7 +5,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} # 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 efdfb9d7a..072c12d20 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 @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $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 440f7fc7f..836ebf955 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $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 df0bafad1..ea77982b7 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 @@ -87,7 +87,7 @@ will take care of differentiating the jobs. Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* 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/703-postsync-rds-app-roles.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/703-postsync-rds-app-roles.yaml index 9e941d942..aa3582526 100644 --- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/703-postsync-rds-app-roles.yaml +++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/703-postsync-rds-app-roles.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $app_ns := .Values.mas_app_namespace }} {{ $np_name := "postsync-app-rds-roles-np" }} diff --git a/instance-applications/550-ibm-mas-addons-config/templates/postdelete-delete-cr.yaml b/instance-applications/550-ibm-mas-addons-config/templates/postdelete-delete-cr.yaml index 328ac9aa2..d335b5aec 100644 --- a/instance-applications/550-ibm-mas-addons-config/templates/postdelete-delete-cr.yaml +++ b/instance-applications/550-ibm-mas-addons-config/templates/postdelete-delete-cr.yaml @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- $_addon_type := "additional-resources" }} {{- $_addon_cr_name := printf "%s-addons-%s" .Values.instance_id $_addon_type }} 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 9924947fd..6c76e3d95 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 @@ -12,7 +12,7 @@ Use the build/bin/set-cli-image-tag.sh script to update this value across all ch Included in $_job_hash (see below). 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:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml index 3f40ed6c3..47b31a6ac 100644 --- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml +++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml @@ -1,5 +1,5 @@ -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $aws_secret := "aws"}} {{- $_job_name_prefix := "ibm-sls-dns" }} {{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }} diff --git a/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml b/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml index 314d269b0..fc0957412 100644 --- a/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml +++ b/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml @@ -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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{- /* 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 8855ebe3c..43599f6f7 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $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 048aff93b..103f9069f 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} {{ $preprefix := printf "pre-jreporter-%s" .Values.reporter_name }} {{ $time_cm := printf "%s-synctime" $preprefix }} From 903a415311741af3e38c59df87b5a88210158829 Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Thu, 10 Sep 2026 00:08:04 +0530 Subject: [PATCH 24/27] Revert "fix(MASCORE-15972): update CLI digest to 9488282 (cpd-public proxied:false fix) + bump suite_dns v6" This reverts commit dae6ace7626f54fe2bef3fe1f493765f90651cf4. --- .../templates/_ecr-token-updater-helpers.tpl | 2 +- .../000-job-cleaner/templates/04-jobcleaner_CronJob.yaml | 2 +- .../templates/04-postsync-update-sm_Job.yaml | 2 +- .../030-ibm-dro/templates/12-2-dro-dns_job.yaml | 2 +- .../030-ibm-dro/templates/14-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 +- .../templates/02-cluster-verify_Job.yaml | 2 +- .../templates/03-cluster-promoter_Job.yaml | 2 +- .../templates/00-aws-docdb-add-user_Job.yaml | 2 +- .../templates/00-preinstall-mas-rbac_Job.yaml | 2 +- .../templates/01-ibm-mas_suite_certs_Job.yaml | 2 +- .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml | 4 ++-- .../templates/PostDelete-aws-docdb-remove-user_Job.yaml | 2 +- .../100-ibm-sls/templates/07-postsync-update-sm_Job.yaml | 2 +- .../101-ibm-sync-jobs-cp4d/templates/02-ibm-cp4d-presync.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 +- .../110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml | 2 +- .../templates/07-postsync-migration-job.yaml | 2 +- .../templates/00-presync-migration-job.yaml | 2 +- .../templates/03-tenant-migration-job.yaml | 2 +- .../templates/06-aiservice-km-s3-secret.yaml | 2 +- .../templates/08-aiservice-postsyncjob.yaml | 2 +- .../templates/08-postsync-migration-job.yaml | 2 +- .../templates/98-presync-copy-sls.yaml | 2 +- .../templates/00-presync-await-crd_Job.yaml | 2 +- .../120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml | 2 +- .../templates/04-db2u-Volatile-Runstats_Cron.yaml | 2 +- .../templates/07-postsync-setup-db2_Job.yaml | 2 +- .../templates/08-postsync-db2-audit-policy_Job.yaml | 2 +- .../120-ibm-db2u-database/templates/09-db2u-Audit_Cron.yaml | 2 +- .../templates/10-postsync-setup-hadr.yaml | 2 +- .../templates/00-presync-create-database.yaml | 2 +- .../templates/01-dbs-rds-postsync-setup.yaml | 2 +- .../templates/03-backup-cronjobs.yaml | 2 +- .../120-ibm-spark/templates/02-ibm-spark-control-plane.yaml | 2 +- .../120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml | 2 +- .../templates/01-cpd-service-post-ops.yaml | 2 +- .../templates/00-presync-create-db2-rds-user-Job.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 +- .../templates/postdelete-delete-cr.yaml | 2 +- .../templates/postdelete-delete-cr.yaml | 2 +- .../templates/postdelete-delete-cr.yaml | 2 +- .../templates/postdelete-delete-cr.yaml | 2 +- .../templates/postdelete-delete-cr.yaml | 2 +- .../templates/postdelete-delete-cr.yaml | 2 +- .../templates/postdelete-delete-cr.yaml | 2 +- .../templates/05-postsync-add-label_Job.yaml | 2 +- .../templates/06-postsync-configtool-oidc.yaml | 2 +- .../templates/07-postsync-set_welcome_messsage_Job.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/703-postsync-rds-app-roles.yaml | 2 +- .../templates/postdelete-delete-cr.yaml | 2 +- .../templates/001-ibm-create-initial-users.yaml | 2 +- .../100-ibm-sls/templates/07-ibm-sls-dns_job.yaml | 2 +- .../100-ibm-sls/templates/08-postsync-update-sm_Job.yaml | 2 +- .../junitreporter/templates/00-presync-report-starter.yaml | 2 +- .../junitreporter/templates/10-postsync-report-starter.yaml | 2 +- 80 files changed, 81 insertions(+), 81 deletions(-) diff --git a/cluster-applications/000-image-mirroring/templates/_ecr-token-updater-helpers.tpl b/cluster-applications/000-image-mirroring/templates/_ecr-token-updater-helpers.tpl index ba3cf3a32..7b8672f16 100644 --- a/cluster-applications/000-image-mirroring/templates/_ecr-token-updater-helpers.tpl +++ b/cluster-applications/000-image-mirroring/templates/_ecr-token-updater-helpers.tpl @@ -3,7 +3,7 @@ ECR Token Updater Pod Template This template defines the pod specification used by both the CronJob and the initial Job */}} {{- define "ecr-token-updater.podTemplate" -}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} metadata: {{- if .Values.custom_labels }} labels: 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 4b7328649..0a059d6eb 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- $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 55dd5f4f1..4ad9df872 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/cluster-applications/030-ibm-dro/templates/12-2-dro-dns_job.yaml b/cluster-applications/030-ibm-dro/templates/12-2-dro-dns_job.yaml index fc6f0ecb0..ee0f0e608 100644 --- a/cluster-applications/030-ibm-dro/templates/12-2-dro-dns_job.yaml +++ b/cluster-applications/030-ibm-dro/templates/12-2-dro-dns_job.yaml @@ -18,7 +18,7 @@ data: type: Opaque --- {{- if and (eq .Values.dns_provider "cis") (not (empty .Values.cis_crn)) (not (empty .Values.dro_public_domain)) }} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- $_job_name_prefix := "ibm-dro-dns" }} {{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }} {{- $_job_config_values := omit .Values "junitreporter" }} diff --git a/cluster-applications/030-ibm-dro/templates/14-postsync-update-sm_Job.yaml b/cluster-applications/030-ibm-dro/templates/14-postsync-update-sm_Job.yaml index bf0d3ff7c..e70b6c99b 100644 --- a/cluster-applications/030-ibm-dro/templates/14-postsync-update-sm_Job.yaml +++ b/cluster-applications/030-ibm-dro/templates/14-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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/cluster-applications/032-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml b/cluster-applications/032-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml index e7e3371a1..b38525f21 100644 --- a/cluster-applications/032-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml +++ b/cluster-applications/032-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml @@ -2,7 +2,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 373eeac10..ae08d53eb 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 dfea9366b..efa4dbf09 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} --- 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 2e85a6ca1..66a45ec3b 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 a8fdcf276..b4d8c4cfa 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 e79f5c9c6..c718ea711 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 880e3dec8..263f211a3 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 @@ -12,7 +12,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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-preinstall-mas-rbac_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-preinstall-mas-rbac_Job.yaml index 4041fc1f8..d5a73978b 100644 --- a/instance-applications/010-ibm-sync-jobs/templates/00-preinstall-mas-rbac_Job.yaml +++ b/instance-applications/010-ibm-sync-jobs/templates/00-preinstall-mas-rbac_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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 d26145474..350a43838 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 @@ -11,7 +11,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 9e0a02b89..5f36394d6 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 @@ -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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. @@ -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 := "v6" }} +{{- $_job_version := "v5" }} {{- /* 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_digest 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 d9b867586..5e617fb9f 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 @@ -8,7 +8,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} # 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 31ec1b5d8..95a5762fb 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/101-ibm-sync-jobs-cp4d/templates/02-ibm-cp4d-presync.yaml b/instance-applications/101-ibm-sync-jobs-cp4d/templates/02-ibm-cp4d-presync.yaml index 9cb8511c2..04d2a6ef9 100644 --- a/instance-applications/101-ibm-sync-jobs-cp4d/templates/02-ibm-cp4d-presync.yaml +++ b/instance-applications/101-ibm-sync-jobs-cp4d/templates/02-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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 264160107..c3b04facb 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 3250b4f81..8ec54de0b 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 f82b14d3c..5cbd451c0 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 6d2e9b6fd..9e303724d 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 a97ce6c27..c58a5fdd3 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 cb8b8dd7b..68f475f7d 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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-cpd-public-route.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml index 4d931172f..d49c88823 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml @@ -34,7 +34,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/113-ibm-aiservice/templates/07-postsync-migration-job.yaml b/instance-applications/113-ibm-aiservice/templates/07-postsync-migration-job.yaml index ad8dcb2cd..de992e391 100644 --- a/instance-applications/113-ibm-aiservice/templates/07-postsync-migration-job.yaml +++ b/instance-applications/113-ibm-aiservice/templates/07-postsync-migration-job.yaml @@ -1,7 +1,7 @@ {{- if hasPrefix "9.2." (toString .Values.aiservice_channel) }} {{- $_job_name_prefix := "postsync-aiservice-migration" }} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- $_job_config_values := omit .Values "junitreporter" }} {{- $_job_version := "v1" }} {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/00-presync-migration-job.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/00-presync-migration-job.yaml index 964f4ee2a..cc432c878 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/00-presync-migration-job.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/00-presync-migration-job.yaml @@ -6,7 +6,7 @@ ################################################################################################### {{- $_job_name_prefix := "presync-tenant-migration" }} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- $_job_config_values := omit .Values "junitreporter" }} {{- $_job_version := "v2" }} {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/03-tenant-migration-job.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/03-tenant-migration-job.yaml index 03f575395..d81385816 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/03-tenant-migration-job.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/03-tenant-migration-job.yaml @@ -1,5 +1,5 @@ {{- $_job_name_prefix := "tenant-migration" }} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- $_job_config_values := omit .Values "junitreporter" }} {{- $_job_version := "v2" }} # We use the timestamp to ensure a unique job name on each run but preserve the existing name generation diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-km-s3-secret.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-km-s3-secret.yaml index b92c04232..6cec3a796 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-km-s3-secret.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-km-s3-secret.yaml @@ -1,6 +1,6 @@ {{- if .Values.application_admin_role }} {{- $_job_name_prefix := "presync-copy-ai-secrets" }} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- $_job_config_values := omit .Values "junitreporter" }} {{- $_job_version := "v5" }} {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/08-aiservice-postsyncjob.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/08-aiservice-postsyncjob.yaml index 8aa3b7a60..615d25be7 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/08-aiservice-postsyncjob.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/08-aiservice-postsyncjob.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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }}{{- /* +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }}{{- /* 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 diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/08-postsync-migration-job.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/08-postsync-migration-job.yaml index 08216b770..bd13a0185 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/08-postsync-migration-job.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/08-postsync-migration-job.yaml @@ -1,5 +1,5 @@ {{- $_job_name_prefix := "postsync-tenant-migration" }} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- $_job_config_values := omit .Values "junitreporter" }} {{- $_job_version := "v3" }} {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/98-presync-copy-sls.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/98-presync-copy-sls.yaml index 437ff4a83..3b6f8c8be 100644 --- a/instance-applications/115-ibm-aiservice-tenant/templates/98-presync-copy-sls.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/templates/98-presync-copy-sls.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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 3cf9fa4f4..ee93512f8 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 @@ -2,7 +2,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} --- # 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 91d7a6fc1..88cc3c497 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 @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} #apiVersion: batch/v1beta1 kind: CronJob diff --git a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Volatile-Runstats_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Volatile-Runstats_Cron.yaml index 18972968d..6228133db 100644 --- a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Volatile-Runstats_Cron.yaml +++ b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Volatile-Runstats_Cron.yaml @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} # # CronJob for Volatile Tables RUNSTATS 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 c21105648..445535936 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 @@ -18,7 +18,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/120-ibm-db2u-database/templates/08-postsync-db2-audit-policy_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/08-postsync-db2-audit-policy_Job.yaml index 8eb47ef19..c0dbc738c 100644 --- a/instance-applications/120-ibm-db2u-database/templates/08-postsync-db2-audit-policy_Job.yaml +++ b/instance-applications/120-ibm-db2u-database/templates/08-postsync-db2-audit-policy_Job.yaml @@ -29,7 +29,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/120-ibm-db2u-database/templates/09-db2u-Audit_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/09-db2u-Audit_Cron.yaml index 86636a0bd..1dfd89270 100644 --- a/instance-applications/120-ibm-db2u-database/templates/09-db2u-Audit_Cron.yaml +++ b/instance-applications/120-ibm-db2u-database/templates/09-db2u-Audit_Cron.yaml @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} # # CronJob for DB2 Audit Log Extraction 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 89449b395..f35a48026 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 @@ -11,7 +11,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/120-ibm-dbs-rds-database/templates/00-presync-create-database.yaml b/instance-applications/120-ibm-dbs-rds-database/templates/00-presync-create-database.yaml index f7ad0493b..54ccb003e 100644 --- a/instance-applications/120-ibm-dbs-rds-database/templates/00-presync-create-database.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/templates/00-presync-create-database.yaml @@ -1,6 +1,6 @@ {{- if .Values.application_admin_role }} {{- $_job_name_prefix := "dbs-rds-presync-create-db" }} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- $_job_config_values := omit .Values "junitreporter" }} {{- $_job_version := "v1" }} {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} diff --git a/instance-applications/120-ibm-dbs-rds-database/templates/01-dbs-rds-postsync-setup.yaml b/instance-applications/120-ibm-dbs-rds-database/templates/01-dbs-rds-postsync-setup.yaml index 23cf88ebd..d26839c61 100644 --- a/instance-applications/120-ibm-dbs-rds-database/templates/01-dbs-rds-postsync-setup.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/templates/01-dbs-rds-postsync-setup.yaml @@ -8,7 +8,7 @@ Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/120-ibm-dbs-rds-database/templates/03-backup-cronjobs.yaml b/instance-applications/120-ibm-dbs-rds-database/templates/03-backup-cronjobs.yaml index f5af50e92..674c38c8d 100644 --- a/instance-applications/120-ibm-dbs-rds-database/templates/03-backup-cronjobs.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/templates/03-backup-cronjobs.yaml @@ -2,7 +2,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} --- # Full Backup CronJob (Sundays at 2 AM) 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 308981396..385156286 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 d17b06823..f7d34f7f8 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml b/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml index 679c54575..fc60408bd 100644 --- a/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.yaml +++ b/instance-applications/121-ibm-post-sync-job-cp4d-services/templates/01-cpd-service-post-ops.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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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-rds-user-Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-rds-user-Job.yaml index d992c708f..de9543c58 100644 --- a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-rds-user-Job.yaml +++ b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-rds-user-Job.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} - {{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} + {{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $ns := printf "mas-%s-core" .Values.instance_id }} {{ $prefix := printf "pre-jdbc-create-user-%s" .Values.mas_config_name }} 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 f24b9b190..da7f72fbc 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 f54d3521c..4421b0d32 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 1a89d30ae..9bb368428 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 @@ -5,7 +5,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $ns := printf "mas-%s-core" .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 abf53429d..e7a1fe332 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 @@ -22,7 +22,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} --- apiVersion: batch/v1 diff --git a/instance-applications/130-ibm-mas-aicfg-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-aicfg-config/templates/postdelete-delete-cr.yaml index cef7c14ea..46a315902 100644 --- a/instance-applications/130-ibm-mas-aicfg-config/templates/postdelete-delete-cr.yaml +++ b/instance-applications/130-ibm-mas-aicfg-config/templates/postdelete-delete-cr.yaml @@ -1,7 +1,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} --- apiVersion: batch/v1 diff --git a/instance-applications/130-ibm-mas-app-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-app-config/templates/postdelete-delete-cr.yaml index 8893dda30..14dcc81f5 100644 --- a/instance-applications/130-ibm-mas-app-config/templates/postdelete-delete-cr.yaml +++ b/instance-applications/130-ibm-mas-app-config/templates/postdelete-delete-cr.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $cr_name := .Values.mas_config_name }} {{ $cr_kind := .Values.mas_config_kind }} 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 f79835ee2..2b17c724e 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 f79835ee2..2b17c724e 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 86dbe1e0c..acf1e07c7 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 f79835ee2..2b17c724e 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 f79835ee2..2b17c724e 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 e72495abf..881e18aeb 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 @@ -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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 d08c806e8..e575a0ce3 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 @@ -11,7 +11,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/130-ibm-mas-suite/templates/07-postsync-set_welcome_messsage_Job.yaml b/instance-applications/130-ibm-mas-suite/templates/07-postsync-set_welcome_messsage_Job.yaml index 7b9d09839..d862337e9 100644 --- a/instance-applications/130-ibm-mas-suite/templates/07-postsync-set_welcome_messsage_Job.yaml +++ b/instance-applications/130-ibm-mas-suite/templates/07-postsync-set_welcome_messsage_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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 f79835ee2..2b17c724e 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 77ac8e610..2aced2823 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,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} --- # 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 0142d6ffe..0b1aad636 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 @@ -7,7 +7,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 bf13237ce..93b9aa870 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 @@ -7,7 +7,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 77b4b2c9c..d913db0a6 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 @@ -6,7 +6,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 a6eaccf14..a8693e487 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 @@ -1,7 +1,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 b89630a8d..60ac49425 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 @@ -5,7 +5,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} # 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 f1f13107f..97d665a75 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 @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} # 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 402216c1b..c0781a1b5 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 @@ -6,7 +6,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} # 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 e197a1453..d2304dd76 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 @@ -5,7 +5,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} # 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 072c12d20..efdfb9d7a 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 @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 836ebf955..440f7fc7f 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 ea77982b7..df0bafad1 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 @@ -87,7 +87,7 @@ will take care of differentiating the jobs. Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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/703-postsync-rds-app-roles.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/703-postsync-rds-app-roles.yaml index aa3582526..9e941d942 100644 --- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/703-postsync-rds-app-roles.yaml +++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/703-postsync-rds-app-roles.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $app_ns := .Values.mas_app_namespace }} {{ $np_name := "postsync-app-rds-roles-np" }} diff --git a/instance-applications/550-ibm-mas-addons-config/templates/postdelete-delete-cr.yaml b/instance-applications/550-ibm-mas-addons-config/templates/postdelete-delete-cr.yaml index d335b5aec..328ac9aa2 100644 --- a/instance-applications/550-ibm-mas-addons-config/templates/postdelete-delete-cr.yaml +++ b/instance-applications/550-ibm-mas-addons-config/templates/postdelete-delete-cr.yaml @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- $_addon_type := "additional-resources" }} {{- $_addon_cr_name := printf "%s-addons-%s" .Values.instance_id $_addon_type }} 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 6c76e3d95..9924947fd 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 @@ -12,7 +12,7 @@ Use the build/bin/set-cli-image-tag.sh script to update this value across all ch Included in $_job_hash (see below). 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:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml index 47b31a6ac..3f40ed6c3 100644 --- a/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml +++ b/sls-applications/100-ibm-sls/templates/07-ibm-sls-dns_job.yaml @@ -1,5 +1,5 @@ -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $aws_secret := "aws"}} {{- $_job_name_prefix := "ibm-sls-dns" }} {{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }} diff --git a/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml b/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml index fc0957412..314d269b0 100644 --- a/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml +++ b/sls-applications/100-ibm-sls/templates/08-postsync-update-sm_Job.yaml @@ -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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{- /* 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 43599f6f7..8855ebe3c 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $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 103f9069f..048aff93b 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-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:9488282c746f808c7120d52b9801370e08dd0ffcf3880f641189bdca0fec6ae6" }} +{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} {{ $preprefix := printf "pre-jreporter-%s" .Values.reporter_name }} {{ $time_cm := printf "%s-synctime" $preprefix }} From 63430e721d2d4e61d4553fe28f62d3f0666c3556 Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Thu, 17 Sep 2026 18:02:41 +0530 Subject: [PATCH 25/27] =?UTF-8?q?feat(MASCORE-15972):=20fix=20526=20?= =?UTF-8?q?=E2=80=94=20add=20LE=20cert=20+=20reencrypt=20Route=20with=20ex?= =?UTF-8?q?ternalCertificate=20for=20cpd-public?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add cert-manager Certificate (cpd-public-cert) using -cis-le-prod ClusterIssuer to produce a publicly-trusted Let's Encrypt cert for cpd-public. - Route now uses reencrypt termination with externalCertificate referencing cpd-public-tls secret so CIS strict-mode SSL can verify the origin cert (no more HTTP 526) - Add create verb to routes in Role (Job needs it for imperative apply) - Add cert-manager Certificate get/list to Role - Bump job version v5 -> v6 --- .../templates/09-ibm-cpd-public-route.yaml | 59 ++++++++++++++++--- 1 file changed, 51 insertions(+), 8 deletions(-) diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml index d49c88823..17563f51f 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml @@ -9,8 +9,13 @@ - CIS DNS CNAME: cpd-public. → cluster public NLB - CIS edge certificate (Let's Encrypt) for the hostname - The Route itself is managed declaratively by ArgoCD (below) - The Job only handles what ArgoCD cannot do declaratively: + A cert-manager Certificate resource (below) requests a Let's Encrypt production cert + for cpd-public. via the -cis-le-prod ClusterIssuer (dns01/CIS). + This produces a publicly-trusted cert that CIS strict-mode SSL can verify on the origin, + avoiding HTTP 526 errors. + + The Route (reencrypt) is managed declaratively by ArgoCD using the LE cert secret. + The Job handles what ArgoCD cannot do declaratively: 1. Reads the internal cpd route host 2. Patches ZenService zenCustomRoute so nginx accepts the new hostname 3. Waits for ZenService to reach Completed @@ -48,7 +53,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_digest. @@ -66,8 +71,37 @@ By convention, we sha1sum this value to guarantee we never exceed the 63 char li {{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }} --- -# Route managed by ArgoCD — passthrough TLS, picked up by the public ingress controller -# via the type: external label (routeSelector: matchLabels: type: external) +# cert-manager Certificate — requests a Let's Encrypt production cert for the public hostname. +# Uses the -cis-le-prod ClusterIssuer (dns01 via CIS webhook). +# The resulting secret (cpd-public-tls) is used by the Route below so that CIS strict-mode +# SSL can verify the origin cert and avoid HTTP 526 errors. +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: cpd-public-cert + namespace: "{{ .Values.cpd_instance_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "088" +{{- if .Values.custom_labels }} + labels: +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} +spec: + secretName: cpd-public-tls + commonName: "cpd-public.{{ .Values.cis_domain }}" + dnsNames: + - "cpd-public.{{ .Values.cis_domain }}" + duration: 8760h0m0s + renewBefore: 720h0m0s + privateKey: + size: 2048 + issuerRef: + kind: ClusterIssuer + name: "{{ .Values.instance_id }}-cis-le-prod" + +--- +# Route — reencrypt termination using the LE cert from cpd-public-tls secret. +# type=external label picks it up on the public ingress controller (routeSelector matchLabels). apiVersion: route.openshift.io/v1 kind: Route metadata: @@ -87,8 +121,14 @@ spec: port: targetPort: ibm-nginx-https-port tls: - termination: passthrough - insecureEdgeTerminationPolicy: None + termination: reencrypt + insecureEdgeTerminationPolicy: Redirect + # externalCertificate references the LE cert secret produced by the Certificate above. + # The router mounts tls.crt/tls.key from this secret as the edge (client-facing) cert. + # destinationCACertificate is omitted — the router trusts the origin (ibm-nginx-svc) + # via the cluster CA bundle injected by OpenShift service-ca. + externalCertificate: + name: cpd-public-tls --- # Role in cpd_instance_namespace — patch ZenService, routes, restart nginx pods @@ -107,9 +147,12 @@ rules: - verbs: [get, list, patch] apiGroups: [zen.cpd.ibm.com] resources: [zenservices] - - verbs: [get, list, patch] + - verbs: [get, list, create, patch] apiGroups: [route.openshift.io] resources: [routes] + - verbs: [get, list] + apiGroups: [cert-manager.io] + resources: [certificates] - verbs: [get, list, delete] apiGroups: [""] resources: [pods] From 06513b7005d96d32224439315a6b4489d28250d6 Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Thu, 17 Sep 2026 18:02:41 +0530 Subject: [PATCH 26/27] =?UTF-8?q?feat(MASCORE-15972):=20fix=20526=20?= =?UTF-8?q?=E2=80=94=20add=20LE=20cert=20+=20reencrypt=20Route=20with=20ex?= =?UTF-8?q?ternalCertificate=20for=20cpd-public?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add cert-manager Certificate (cpd-public-cert) using -cis-le-prod ClusterIssuer to produce a publicly-trusted Let's Encrypt cert for cpd-public. - Route now uses reencrypt termination with externalCertificate referencing cpd-public-tls secret so CIS strict-mode SSL can verify the origin cert (no more HTTP 526) - Add create verb to routes in Role (Job needs it for imperative apply) - Add cert-manager Certificate get/list to Role - Bump job version v5 -> v6 From a8ea6c525657f5801ac89ff6b3c2d99aa7c87f6d Mon Sep 17 00:00:00 2001 From: Chiranjiv Kushwah Date: Thu, 17 Sep 2026 18:04:23 +0530 Subject: [PATCH 27/27] sync(MASCORE-15972): bring 15972-cpd_route_public in sync with argo-test-branch - suite_dns job: add MAS_CHANNEL env var + echo line - 07-ibm-cp4d_patch_zenservice: update CLI digest to b6df7b17 - 08-ibm-cp4d-post-verify: update CLI digest to b6df7b17 - ibm-mas-instance-root/values.yaml: add fvt_gitops defaults block --- .../templates/01-ibm-mas_suite_dns_Job.yaml | 3 +++ .../templates/07-ibm-cp4d_patch_zenservice.yaml | 2 +- .../templates/08-ibm-cp4d-post-verify.yaml | 2 +- root-applications/ibm-mas-instance-root/values.yaml | 12 ++++++++++++ 4 files changed, 17 insertions(+), 2 deletions(-) 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 5f36394d6..1e3491fc8 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 @@ -142,6 +142,8 @@ spec: value: "{{ .Values.cpd_public_route_enabled | default false }}" - name: CIS_ALLOWED_IPS value: "{{ .Values.cis_allowed_ips }}" + - name: MAS_CHANNEL + value: "{{ .Values.mas_channel }}" - name: SM_AWS_REGION value: "{{ .Values.sm_aws_region }}" @@ -199,6 +201,7 @@ spec: echo "DELETE_WILDCARDS Flag ............... ${COLOR_MAGENTA}${DELETE_WILDCARDS}" echo "OVERRIDE_EDGE_CERTS Flag ............ ${COLOR_MAGENTA}${OVERRIDE_EDGE_CERTS}" echo "CIS_ENTRIES_TO_ADD ................. ${COLOR_MAGENTA}${CIS_ENTRIES_TO_ADD}" + echo "MAS Channel ......................... ${COLOR_MAGENTA}${MAS_CHANNEL}" echo "OCP_INGRESS ........................ ${COLOR_MAGENTA}${OCP_INGRESS}" echo "SM_AWS_REGION ....................... ${COLOR_MAGENTA}${SM_AWS_REGION}" 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 9e303724d..3ac1a9495 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} {{- /* 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 c58a5fdd3..9c1e952ac 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-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:30d03b2ac994efe036af0dc91d0319f7f2c7cb6bb216ce0602f263165591848a" }} +{{- $_cli_image_digest := "sha256:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/root-applications/ibm-mas-instance-root/values.yaml b/root-applications/ibm-mas-instance-root/values.yaml index d3a1a342e..6395055b1 100644 --- a/root-applications/ibm-mas-instance-root/values.yaml +++ b/root-applications/ibm-mas-instance-root/values.yaml @@ -48,6 +48,18 @@ devops: mongo_uri: build_number: +# SaaS GitOps test suite configuration. +# When enabled, a PostSync Job is created in the postsyncjobs namespace that +# runs the fvt-gitops test image against the deployed MAS instance and stores +# results in MongoDB. +fvt_gitops: + enabled: true + # Which test suite to run: suite | manage | cluster + test_suite: "suite" + # fvt-gitops container image coordinates + image_repo: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/mas-devops/fvt-gitops" + image_tag: "latest" + # Flags to opt out of adoption metric reporting. Defaults to true (reporting enabled) mas_feature_usage: true mas_deployment_progression: true