Skip to content

Commit ee784a1

Browse files
authored
[patch] Additional conditional logic for CIS & Cloudflare (#29)
1 parent 7ed3d26 commit ee784a1

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/mas/devops/templates/pipelinerun-install.yml.j2

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,7 @@ spec:
346346
# -------------------------------------------------------------------------
347347
- name: dns_provider
348348
value: "{{ dns_provider }}"
349+
{%- if cloudflare_apitoken is defined and cloudflare_apitoken != "" %}
349350

350351
# MAS DNS Integrations - Cloudflare Support
351352
# -------------------------------------------------------------------------
@@ -357,6 +358,8 @@ spec:
357358
value: "{{ cloudflare_zone }}"
358359
- name: cloudflare_subdomain
359360
value: "{{ cloudflare_subdomain }}"
361+
{%- endif %}
362+
{%- if cis_apikey is defined and cis_apikey != "" %}
360363

361364
# MAS DNS Integrations - CIS Support
362365
# -------------------------------------------------------------------------
@@ -368,6 +371,8 @@ spec:
368371
value: "{{ cis_crn }}"
369372
- name: cis_subdomain
370373
value: "{{ cis_subdomain }}"
374+
{%- endif %}
375+
{%- if cis_service_name is defined and cis_service_name != "" %}
371376

372377
# MAS DNS Integrations - CIS Security Enhancement Support
373378
# -------------------------------------------------------------------------
@@ -379,6 +384,7 @@ spec:
379384
value: "{{ override_edge_certs }}"
380385
- name: cis_proxy
381386
value: "{{ cis_proxy }}"
387+
{%- endif %}
382388
{%- endif %}
383389
{%- if aws_access_key_id is defined and aws_access_key_id != "" %}
384390

@@ -694,7 +700,7 @@ spec:
694700
value: "{{ mas_app_channel_aibroker }}"
695701
{%- endif %}
696702
{%- if mas_aibroker_storage_provider is defined and mas_aibroker_storage_provider != "" %}
697-
703+
698704
# AI Broker - OpenData Hub Storage
699705
# -------------------------------------------------------------------------
700706
- name: mas_aibroker_storage_provider
@@ -716,7 +722,7 @@ spec:
716722
- name: mas_aibroker_storage_tenants_bucket
717723
value: "{{ mas_aibroker_storage_tenants_bucket }}"
718724
- name: mas_aibroker_storage_templates_bucket
719-
value: "{{ mas_aibroker_storage_templates_bucket }}"
725+
value: "{{ mas_aibroker_storage_templates_bucket }}"
720726
- name: mas_aibroker_tenant_name
721727
value: "{{ mas_aibroker_tenant_name }}"
722728
{%- endif %}
@@ -751,7 +757,7 @@ spec:
751757
{%- if mas_aibroker_s3_action is defined and mas_aibroker_s3_action != "" %}
752758

753759
# AI Broker - S3
754-
# -------------------------------------------------------------------------
760+
# -------------------------------------------------------------------------
755761
- name: mas_aibroker_s3_action
756762
value: "{{ mas_aibroker_s3_action }}"
757763
- name: mas_aibroker_apikey_action

0 commit comments

Comments
 (0)