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 a375ca448..ff01aee30 100644 --- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml +++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml @@ -26,7 +26,7 @@ Increment this value whenever you make a change to an immutable field of the Job E.g. passing in a new environment variable. Included in $_job_hash (see below). */}} -{{- $_job_version := "v2" }} +{{- $_job_version := "v3" }} {{- /* 10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_tag @@ -207,6 +207,10 @@ spec: else export MAS_MANUAL_CERT_MGMT=False fi + + + export SAAS_MODE=True + # Ref - https://github.com/ibm-mas/ansible-devops/blob/master/ibm/mas_devops/roles/suite_dns/README.md export ROLE_NAME=suite_dns ansible-playbook ibm.mas_devops.run_role diff --git a/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml b/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml index 250efa9d2..c3b1aba65 100644 --- a/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml +++ b/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml @@ -138,6 +138,8 @@ spec: value: "{{ .Values.avp.values_varname }}" - name: auto_delete value: "{{ .Values.auto_delete }}" + - name: override_dns_cis_flags_to_false + value: "{{ .Values.override_dns_cis_flags_to_false }}" destination: server: 'https://kubernetes.default.svc' namespace: {{ .Values.argo.namespace }} diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index 99efe4fdc..355fae30c 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -201,6 +201,8 @@ spec: value: "{{ .Values.devops.mongo_uri }}" - name: devops.build_number value: "{{ .Values.devops.build_number }}" + - name: override_dns_cis_flags_to_false + value: "{{ .Values.override_dns_cis_flags_to_false }}" destination: server: 'https://kubernetes.default.svc' namespace: {{ .Values.argo.namespace }} diff --git a/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml b/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml index cce987fce..3cd295dde 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 @@ -76,9 +76,17 @@ 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 .Values.override_dns_cis_flags_to_false }} + update_dns_entries: "false" + delete_wildcards: "false" + override_edge_certs: "false" + {{- else }} update_dns_entries: "{{ .Values.ibm_mas_suite.update_dns_entries }}" delete_wildcards: "{{ .Values.ibm_mas_suite.delete_wildcards }}" override_edge_certs: "{{ .Values.ibm_mas_suite.override_edge_certs }}" + {{- end}} {{- if .Values.ibm_mas_suite.manual_certs }} manual_certs: {{ .Values.ibm_mas_suite.manual_certs | toYaml | nindent 14 }} @@ -100,6 +108,7 @@ spec: mas_wipe_mongo_data: {{ .Values.mas_wipe_mongo_data }} + - name: ARGOCD_APP_NAME value: syncres {{- if not (empty .Values.avp.secret) }}