Skip to content

Commit 0b5c8a9

Browse files
committed
[minor] Add logic to call new cert role funciton
1 parent 868acba commit 0b5c8a9

File tree

2 files changed

+36
-3
lines changed

2 files changed

+36
-3
lines changed

instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ spec:
135135
value: "{{ .Values.delete_wildcards }}"
136136
- name: OVERRIDE_EDGE_CERTS
137137
value: "{{ .Values.override_edge_certs }}"
138+
- name: CIS_ENTRIES_TO_ADD
139+
value: "{{ .Values.cis_entries_to_add }}"
138140

139141
- name: SM_AWS_REGION
140142
value: "{{ .Values.sm_aws_region }}"
@@ -191,6 +193,7 @@ spec:
191193
echo "update DNS entries Flag ............. ${COLOR_MAGENTA}${UPDATE_DNS_ENTRIES}"
192194
echo "DELETE_WILDCARDS Flag ............... ${COLOR_MAGENTA}${DELETE_WILDCARDS}"
193195
echo "OVERRIDE_EDGE_CERTS Flag ............ ${COLOR_MAGENTA}${OVERRIDE_EDGE_CERTS}"
196+
echo "CIS_ENTRIES_TO_ADD ................. ${COLOR_MAGENTA}${CIS_ENTRIES_TO_ADD}"
194197
195198
echo "OCP_INGRESS ........................ ${COLOR_MAGENTA}${OCP_INGRESS}"
196199
echo "SM_AWS_REGION ....................... ${COLOR_MAGENTA}${SM_AWS_REGION}"
@@ -208,9 +211,6 @@ spec:
208211
export MAS_MANUAL_CERT_MGMT=False
209212
fi
210213
211-
212-
export SAAS_MODE=True
213-
214214
# Ref - https://github.com/ibm-mas/ansible-devops/blob/master/ibm/mas_devops/roles/suite_dns/README.md
215215
export ROLE_NAME=suite_dns
216216
ansible-playbook ibm.mas_devops.run_role

root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,39 @@ spec:
7474
cis_proxy: "{{ .Values.ibm_mas_suite.cis_proxy }}"
7575
cis_service_name: "{{ .Values.ibm_mas_suite.cis_service_name }}"
7676
77+
{{- $health := .Values.ibm_suite_app_health_install -}}
78+
{{- $iot := .Values.ibm_suite_app_iot_install -}}
79+
{{- $core := .Values.ibm_mas_suite -}}
80+
{{- $manage := .Values.ibm_suite_app_manage_install -}}
81+
{{- $monitor := .Values.ibm_suite_app_monitor_install -}}
82+
{{- $predict := .Values.ibm_suite_app_predict_install -}}
83+
{{- $visualinspection := .Values.ibm_suite_app_visualinspection_install -}}
84+
{{- $optimizer := .Values.ibm_suite_app_optimizer_install -}}
85+
{{- $facilities := .Values.ibm_suite_app_facilities_install -}}
86+
87+
{{- $health_str := printf "%s" (default "" $health) -}}
88+
{{- $iot_str := printf "%s" (default "" $iot) -}}
89+
{{- $core_str := printf "%s" (default "" $core) -}}
90+
{{- $manage_str := printf "%s" (default "" $manage) -}}
91+
{{- $monitor_str := printf "%s" (default "" $monitor) -}}
92+
{{- $predict_str := printf "%s" (default "" $predict) -}}
93+
{{- $visualinspection_str := printf "%s" (default "" $visualinspection) -}}
94+
{{- $optimizer_str := printf "%s" (default "" $optimizer) -}}
95+
{{- $facilities_str := printf "%s" (default "" $facilities) -}}
96+
97+
{{- $health_comma_separated := printf "%s" (if (gt (len $health_str) 0) "health") -}}
98+
{{- $iot_comma_separated := printf "%s" (if (gt (len $iot_str) 0) "iot") -}}
99+
{{- $core_comma_separated := printf "%s" (if (gt (len $core_str) 0) "core") -}}
100+
{{- $manage_comma_separated := printf "%s" (if (gt (len $manage_str) 0) "manage") -}}
101+
{{- $reportdb_comma_separated := printf "%s" (if (gt (len $manage_str) 0) "reportdb") -}}
102+
{{- $monitor_comma_separated := printf "%s" (if (gt (len $monitor_str) 0) "monitor") -}}
103+
{{- $predict_comma_separated := printf "%s" (if (gt (len $predict_str) 0) "predict") -}}
104+
{{- $visualinspection_comma_separated := printf "%s" (if (gt (len $visualinspection_str) 0) "visualinspection") -}}
105+
{{- $optimizer_comma_separated := printf "%s" (if (gt (len $optimizer_str) 0) "optimizer") -}}
106+
{{- $facilities_comma_separated := printf "%s" (if (gt (len $facilities_str) 0) "facilities") -}}
107+
108+
{{- $list := list $health_comma_separated $iot_comma_separated $core_comma_separated $manage_comma_separated $reportdb_comma_separated $monitor_comma_separated $predict_comma_separated $visualinspection_comma_separated $optimizer_comma_separated $facilities_comma_separated -}}
109+
cis_entries_to_add: {{ printf "%s" (join "," $list) }}
77110
78111
{{- if .Values.override_dns_cis_flags_to_false }}
79112
update_dns_entries: "false"

0 commit comments

Comments
 (0)