From e2f9c0f035c15a62e0382e0defc3bcf59aa7d42b Mon Sep 17 00:00:00 2001 From: Abhirup Choudhury Date: Tue, 28 Jul 2026 20:52:45 +0530 Subject: [PATCH 1/3] [patch] allowlisting changes --- .../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 3415507be..ab5caea44 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:887cc3059a04601241687711df0c03d662931e6719121eec0eb0490001b2c8b9" }} +{{- $_cli_image_digest := "sha256:5e66b92a7377476bfc861b0b96b09780b00e9b9bf7438ca210905fe260c2eed7" }} {{- /* A dict of values that influence the behaviour of the job in some way. @@ -138,6 +138,8 @@ spec: value: "{{ .Values.override_edge_certs }}" - name: CIS_ENTRIES_TO_ADD value: "{{ .Values.cis_entries_to_add }}" + - name: 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 5e32b96e2..729e95cae 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 @@ -80,6 +80,9 @@ spec: cis_waf: "{{ .Values.ibm_mas_suite.cis_waf }}" cis_proxy: "{{ .Values.ibm_mas_suite.cis_proxy }}" cis_service_name: "{{ .Values.ibm_mas_suite.cis_service_name }}" + {{- if not (empty .Values.ibm_mas_suite.allow_list) }} + cis_allowed_ips: "{{ .Values.ibm_mas_suite.allow_list }}" + {{- end }} {{- $health := .Values.ibm_suite_app_health_install -}} {{- $iot := .Values.ibm_suite_app_iot_install -}} From 89373042979a269ba3a3d8c4290dce3e368adfba Mon Sep 17 00:00:00 2001 From: Abhirup Choudhury Date: Tue, 18 Aug 2026 19:25:39 +0530 Subject: [PATCH 2/3] support new configuration for allowlisting --- .../ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml | 2 +- .../templates/550-ibm-mas-addons-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 729e95cae..26b8d330d 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 @@ -81,7 +81,7 @@ spec: cis_proxy: "{{ .Values.ibm_mas_suite.cis_proxy }}" cis_service_name: "{{ .Values.ibm_mas_suite.cis_service_name }}" {{- if not (empty .Values.ibm_mas_suite.allow_list) }} - cis_allowed_ips: "{{ .Values.ibm_mas_suite.allow_list }}" + cis_allowed_ips: "{{ .Values.ibm_mas_suite.allow_list.ips }}" {{- end }} {{- $health := .Values.ibm_suite_app_health_install -}} diff --git a/root-applications/ibm-mas-instance-root/templates/550-ibm-mas-addons-config.yaml b/root-applications/ibm-mas-instance-root/templates/550-ibm-mas-addons-config.yaml index 63204623c..0a38febb5 100644 --- a/root-applications/ibm-mas-instance-root/templates/550-ibm-mas-addons-config.yaml +++ b/root-applications/ibm-mas-instance-root/templates/550-ibm-mas-addons-config.yaml @@ -47,7 +47,7 @@ spec: instance_id: "{{ .Values.instance.id }}" cluster_admin_role: {{ .Values.cluster_admin_role }} application_admin_role: {{ .Values.application_admin_role }} - allow_list: "{{ .Values.allow_list }}" + allow_list: "{{ .Values.allow_list.ips }}" enhanced_dr: {{ .Values.enhanced_dr }} extensions: {{ .Values.extensions }} additional_vpn: {{ .Values.additional_vpn }} From 0d1b24f522f3eb91ef8865458c27c0c4f4aeecd4 Mon Sep 17 00:00:00 2001 From: Abhirup Choudhury Date: Wed, 19 Aug 2026 12:11:21 +0530 Subject: [PATCH 3/3] Update 550-ibm-mas-addons-config.yaml --- .../templates/550-ibm-mas-addons-config.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/root-applications/ibm-mas-instance-root/templates/550-ibm-mas-addons-config.yaml b/root-applications/ibm-mas-instance-root/templates/550-ibm-mas-addons-config.yaml index 0a38febb5..e5d9611a9 100644 --- a/root-applications/ibm-mas-instance-root/templates/550-ibm-mas-addons-config.yaml +++ b/root-applications/ibm-mas-instance-root/templates/550-ibm-mas-addons-config.yaml @@ -47,7 +47,9 @@ spec: instance_id: "{{ .Values.instance.id }}" cluster_admin_role: {{ .Values.cluster_admin_role }} application_admin_role: {{ .Values.application_admin_role }} + {{- if not (empty .Values.allow_list) }} allow_list: "{{ .Values.allow_list.ips }}" + {{- end }} enhanced_dr: {{ .Values.enhanced_dr }} extensions: {{ .Values.extensions }} additional_vpn: {{ .Values.additional_vpn }}