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 8f5609499..b3af7327c 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} 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 3eb48d054..8a3a928d5 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- $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 c87cf7bbd..634e12cf1 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 c2430b3f3..41ff632bc 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- $_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 504cbac56..def68699a 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 4ef4745af..74085c655 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 9cce45d2b..ffd76bbb2 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 7665793e6..9720759ab 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} --- 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 c6de354e8..f08e0b76c 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 fe8ebbff1..ac262993f 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 d49b3107c..9e0b037ae 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 103909a45..85646d4c1 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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-patch-ingress-namespace-ownership_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-patch-ingress-namespace-ownership_Job.yaml index 695548c6c..6e3e05b58 100644 --- a/instance-applications/010-ibm-sync-jobs/templates/00-patch-ingress-namespace-ownership_Job.yaml +++ b/instance-applications/010-ibm-sync-jobs/templates/00-patch-ingress-namespace-ownership_Job.yaml @@ -15,7 +15,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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 abc81224a..6ddfff395 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 73ef79043..b3d94fefb 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 a4e6117d7..6d30c5e23 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 := "v4" }} +{{- $_job_version := "v5" }} {{- /* 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 }}" - name: MAS_CHANNEL 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 933142d31..b734c0c11 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} # 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 4e1e012c5..a3154a20f 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 c837d9aff..e00a492ce 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 8fbe3889a..db82e62f5 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 eb675bc50..d0d72e57f 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/110-ibm-cp4d/README.md b/instance-applications/110-ibm-cp4d/README.md index d5ff5b70e..8b90c5487 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` | +| `Certificate` | `cpd-public-cert` LE cert for public CPD route | CP4D instance namespace | When `cpd_public_route_enabled` is true | `cluster_admin_role` | +| `ClusterIssuer` | `-cis-le-prod` issuer referenced by `cpd-public-cert` (not created by this chart) | N/A (cluster-scoped) | 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,9 @@ 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_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/03-ibm-cp4d-mcs_patch_sa.yaml b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml index 46eca66ca..d91639efc 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 3ac1a9495..61894b98f 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 9c1e952ac..e04a229e3 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 6b6ff5fb3..795cb77ed 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 new file mode 100644 index 000000000..e7dfd6911 --- /dev/null +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cpd-public-route.yaml @@ -0,0 +1,360 @@ + +{{- /* + 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 + + 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 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 + 4. Restores the internal cpd route host (AFTER ZenService finishes — it overwrites it + as a side effect of zenCustomRoute reconciliation) + 5. Injects the LE cert (cpd-public-tls) into the cpd-public Route after ZenService + has reconciled (ZenService overwrites spec.tls during reconcile) + 5b. Sets destinationCACertificate to IBM-Data-and-AI-CA (ibm-nginx-internal-tls-ca) + so the OCP router can complete the reencrypt TLS handshake with nginx + 6. Restarts nginx pods to pick up the updated server_name whitelist + + 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 }} + +{{- /* +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:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} + +{{- /* +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 := "v12" }} + +{{- /* +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 }} + +--- +# 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 injected into the Route by the Job 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" + +--- +# Role in cpd_instance_namespace — patch ZenService, routes, secrets, restart nginx pods +kind: Role +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: cpd-public-route-role + namespace: "{{ .Values.cpd_instance_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "089" +{{- if .Values.custom_labels }} + labels: +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} +rules: + - verbs: [get, list, patch] + apiGroups: [zen.cpd.ibm.com] + resources: [zenservices] + - verbs: [get, list, create, patch] + apiGroups: [route.openshift.io] + resources: [routes] + - verbs: [get, list, delete] + apiGroups: [""] + resources: [pods] + - verbs: [get] + apiGroups: [""] + resources: [secrets] + resourceNames: [cpd-public-tls, ibm-nginx-internal-tls-ca] + +--- +kind: RoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: cpd-public-route-rb + namespace: "{{ .Values.cpd_instance_namespace }}" + 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: Role + name: cpd-public-route-role + +--- +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: CPD_INSTANCE_NAMESPACE + value: "{{ .Values.cpd_instance_namespace }}" + - name: CPD_OPERATORS_NAMESPACE + value: "{{ .Values.cpd_operators_namespace }}" + - name: CIS_DOMAIN + value: "{{ .Values.cis_domain }}" + command: + - /bin/bash + - -c + - | + + set -e + + CPD_PUBLIC_HOST="cpd-public.${CIS_DOMAIN}" + + echo + echo "================================================================================" + echo "CPD Public Route — ZenService patch + cert injection + nginx restart" + echo "================================================================================" + echo "- CPD Instance Namespace ............ ${CPD_INSTANCE_NAMESPACE}" + echo "- Public Hostname ................... ${CPD_PUBLIC_HOST}" + echo + + # ----------------------------------------------------------------------- + # 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}" \ + --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 + # If ZenService already overwrote it with the public host, derive the correct + # internal host from the cluster domain: 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 " Internal cpd route host: ${INTERNAL_CPD_HOST}" + fi + + # ----------------------------------------------------------------------- + # Step 2: Patch ZenService zenCustomRoute (idempotent). + # This adds the public hostname to nginx's server_name whitelist. + # 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 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}') + + if [[ "${CURRENT_CUSTOM_HOST}" == "${CPD_PUBLIC_HOST}" ]]; then + echo " ZenService zenCustomRoute already set to ${CPD_PUBLIC_HOST}, skipping patch." + else + echo " Patching ZenService lite-cr..." + oc patch ZenService lite-cr -n "${CPD_INSTANCE_NAMESPACE}" --type=merge \ + -p "{\"spec\":{\"zenCustomRoute\":{\"route_host\":\"${CPD_PUBLIC_HOST}\"}}}" + echo " ZenService patched." + fi + + # ----------------------------------------------------------------------- + # 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 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: Inject LE cert into cpd-public Route AFTER ZenService Completed. + # ZenService overwrites spec.tls during reconcile — injecting after ensures + # the LE cert sticks. RouteExternalCertificate FeatureGate is DISABLED on + # this cluster so inline injection is the only available mechanism. + # ----------------------------------------------------------------------- + echo + echo "Step 5: Injecting LE cert from cpd-public-tls into cpd-public Route..." + TLS_CRT=$(oc get secret cpd-public-tls -n "${CPD_INSTANCE_NAMESPACE}" \ + --ignore-not-found -o jsonpath='{.data.tls\.crt}' | base64 -d) + TLS_KEY=$(oc get secret cpd-public-tls -n "${CPD_INSTANCE_NAMESPACE}" \ + --ignore-not-found -o jsonpath='{.data.tls\.key}' | base64 -d) + if [[ -z "${TLS_CRT}" ]]; then + echo " WARNING: cpd-public-tls secret not found — CIS strict-mode SSL may return 526" + else + ISSUER=$(echo "${TLS_CRT}" | openssl x509 -noout -issuer 2>/dev/null | sed 's/issuer=//') + echo " LE cert issuer: ${ISSUER}" + TLS_CRT_ESC=$(echo "${TLS_CRT}" | awk '{printf "%s\\n", $0}') + TLS_KEY_ESC=$(echo "${TLS_KEY}" | awk '{printf "%s\\n", $0}') + oc patch route cpd-public -n "${CPD_INSTANCE_NAMESPACE}" --type=merge -p \ + "{\"spec\":{\"tls\":{\"certificate\":\"${TLS_CRT_ESC}\",\"key\":\"${TLS_KEY_ESC}\"}}}" + echo " LE cert injected." + fi + + # ----------------------------------------------------------------------- + # Step 5b: Set destinationCACertificate so the OCP router can verify nginx's + # origin cert during the reencrypt TLS handshake. + # Nginx serves a cert signed by IBM-Data-and-AI-CA, which is the self-signed + # CA stored in ibm-nginx-internal-tls-ca (cert.crt key). + # Without this the router cannot verify the origin and returns HTTP 503. + # ----------------------------------------------------------------------- + echo + echo "Step 5b: Setting destinationCACertificate on cpd-public Route..." + NGINX_CA=$(oc get secret ibm-nginx-internal-tls-ca -n "${CPD_INSTANCE_NAMESPACE}" \ + --ignore-not-found -o jsonpath='{.data.cert\.crt}' | base64 -d) + if [[ -z "${NGINX_CA}" ]]; then + echo " WARNING: ibm-nginx-internal-tls-ca not found — router may return 503" + else + NGINX_CA_ESC=$(echo "${NGINX_CA}" | awk '{printf "%s\\n", $0}') + oc patch route cpd-public -n "${CPD_INSTANCE_NAMESPACE}" --type=merge -p \ + "{\"spec\":{\"tls\":{\"destinationCACertificate\":\"${NGINX_CA_ESC}\"}}}" + echo " destinationCACertificate set to IBM-Data-and-AI-CA." + fi + + # ----------------------------------------------------------------------- + # Step 6: Restart nginx pods so new server_name whitelist takes effect. + # ----------------------------------------------------------------------- + echo + echo "Step 6: 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!" + echo " Route: cpd-public (reencrypt + LE cert, type=external)" + echo " URL: https://${CPD_PUBLIC_HOST}" + echo " Internal: https://${INTERNAL_CPD_HOST} (unchanged)" + echo "================================================================================" + + restartPolicy: Never + serviceAccountName: cpd-sa + backoffLimit: 4 + +{{- end }} diff --git a/instance-applications/110-ibm-cp4d/values.yaml b/instance-applications/110-ibm-cp4d/values.yaml index 631fbe216..60a16d9bf 100644 --- a/instance-applications/110-ibm-cp4d/values.yaml +++ b/instance-applications/110-ibm-cp4d/values.yaml @@ -10,3 +10,8 @@ cpd_product_version: "" cpd_iam_integration: false cpd_primary_storage_class: "" cpd_metadata_storage_class: "" +# Public CPD route config — set cpd_public_route_enabled: true to expose CPD on a public URL +# 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_domain: "" 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 a735a61e0..391a7396d 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- $_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 76664b605..c34f51bc7 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- $_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 284755ac2..57bc5e396 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- $_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 f962b515e..9aa028403 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- $_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 4bf4dace6..693b887e6 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }}{{- /* +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }}{{- /* 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 d437358b3..416e86219 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- $_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 64315c476..8b907385c 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 ca14a5911..905c14601 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} --- # 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 9929f7077..17e85e281 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} #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 c8b79dc41..25bc89540 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} # # 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 92d0be701..06acb1349 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 84620453d..b51234114 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 1b33f56f4..a42e1d5aa 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} # # 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 bcee15043..785c7ae4f 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 877911fc3..e656ce758 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- $_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 325e50683..de318b046 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 4b937fc3e..64dc3790f 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} --- # 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 7798b9625..f4d6cd636 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 a65df960d..21a579ef8 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 1e5a98231..d5a627b5d 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 809d8b1ff..0a5bb854d 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} + {{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 e15efd1f1..2e000d5a7 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 2bf4b6454..1b8619aae 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 5b45adcc2..2abfe115a 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $ns := printf "mas-%s-core" .Values.instance_id }} {{ $syncres_ns := printf "mas-%s-syncres" .Values.instance_id }} 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 e9b9817a8..1846b7129 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} --- 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 c4172cb56..371f015fa 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} --- 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 0abd48cf1..5a12f3cd9 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 9ec7bb77c..44cbe4d67 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 9ec7bb77c..44cbe4d67 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 b585ddb1a..bfaa924c3 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 9ec7bb77c..44cbe4d67 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 9ec7bb77c..44cbe4d67 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 9b079b8da..19adbebc6 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 97119cd7d..430724fa0 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 5d6985035..c14c877e2 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 9ec7bb77c..44cbe4d67 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 d956febd1..0973ceabe 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} --- # 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 3ce342d96..2598549a3 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 0c507d564..5497a84ed 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 294142b85..aabbc6491 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 16de9c1af..b13d6062d 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 98252384a..2dc739c66 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} # 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 bdf7ff10b..27a96bab9 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} # 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 64639a8e5..3ddaf7a42 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} # 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 ab4e9a93c..a672aa736 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} # 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 4294ef27d..28ae87dcd 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 937941534..3c1c0e95e 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 52e972eac..942ebb1ec 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 b863c5a5b..db8a05a43 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 1525c6b98..361f3a752 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- $_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 e2e4d40a1..c34992f72 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* A dict of values that influence the behaviour of the job in some way. 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 185d89376..499ccddf4 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 @@ -110,10 +110,13 @@ spec: {{- $visualinspection_str := ternary "" "visualinspection" (empty $visualinspection) -}} {{- $optimizer_str := ternary "" "optimizer" (empty $optimizer) -}} {{- $facilities_str := ternary "" "facilities" (empty $facilities) -}} + {{- $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 | 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 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" 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 490ccef2b..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,6 +69,10 @@ 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 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 }} {{- if not (empty .Values.ibm_wsl) }} wsl_channel: "{{ .Values.ibm_wsl.wsl_channel }}" {{- end }} 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 c9737da0b..562434e25 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 2a0dc1d73..a1b1f2b1a 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{- /* 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 f1a46feac..657c579dc 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $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 9b22d267e..3bb7aedb8 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:b6df7b173b131d7340087a1a5d7ed51ff16cef7fcac7291a269b2ad1937a61af" }} +{{- $_cli_image_digest := "sha256:e1fa9ce3f7f30c3c7803bf03684620cc1ce71b1410a89d0d18b02bf2bd7d8724" }} {{ $preprefix := printf "pre-jreporter-%s" .Values.reporter_name }} {{ $time_cm := printf "%s-synctime" $preprefix }}