From 4b4e941d4eed1f11f06b1076d4918cd4f95958c8 Mon Sep 17 00:00:00 2001 From: Nick Fox Date: Tue, 24 Oct 2023 17:25:52 -0400 Subject: [PATCH] Fix custom dashboard yaml parsing (#701) --- roles/default/kiali-deploy/tasks/snake_camel_case.yaml | 8 +++++++- roles/v1.73/kiali-deploy/tasks/snake_camel_case.yaml | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/roles/default/kiali-deploy/tasks/snake_camel_case.yaml b/roles/default/kiali-deploy/tasks/snake_camel_case.yaml index 4b82d4c9..e99439bc 100644 --- a/roles/default/kiali-deploy/tasks/snake_camel_case.yaml +++ b/roles/default/kiali-deploy/tasks/snake_camel_case.yaml @@ -17,6 +17,12 @@ {% set kiali_vars=kiali_vars | combine({'deployment': {'affinity': {'pod': current_cr.spec.deployment.affinity.pod }}}, recursive=True) %} {% endif %} {# #} + {# custom_dashboards #} + {% if kiali_vars.custom_dashboards is defined and kiali_vars.custom_dashboards | length > 0 %} + {% set _=kiali_vars.pop('custom_dashboards') %} + {% set kiali_vars=kiali_vars | combine({'custom_dashboards': current_cr.spec.custom_dashboards }, recursive=True) %} + {% endif %} + {# #} {# deployment.affinity.pod_anti #} {% if kiali_vars.deployment.affinity is defined and kiali_vars.deployment.affinity.pod_anti is defined and kiali_vars.deployment.affinity.pod_anti | length > 0 %} {% set _=kiali_vars['deployment']['affinity'].pop('pod_anti') %} @@ -119,4 +125,4 @@ {% set kiali_vars=kiali_vars | combine({'deployment': {'security_context': current_cr.spec.deployment.security_context}}, recursive=True) %} {% endif %} {# #} - {{ kiali_vars }} \ No newline at end of file + {{ kiali_vars }} diff --git a/roles/v1.73/kiali-deploy/tasks/snake_camel_case.yaml b/roles/v1.73/kiali-deploy/tasks/snake_camel_case.yaml index 4b82d4c9..e99439bc 100644 --- a/roles/v1.73/kiali-deploy/tasks/snake_camel_case.yaml +++ b/roles/v1.73/kiali-deploy/tasks/snake_camel_case.yaml @@ -17,6 +17,12 @@ {% set kiali_vars=kiali_vars | combine({'deployment': {'affinity': {'pod': current_cr.spec.deployment.affinity.pod }}}, recursive=True) %} {% endif %} {# #} + {# custom_dashboards #} + {% if kiali_vars.custom_dashboards is defined and kiali_vars.custom_dashboards | length > 0 %} + {% set _=kiali_vars.pop('custom_dashboards') %} + {% set kiali_vars=kiali_vars | combine({'custom_dashboards': current_cr.spec.custom_dashboards }, recursive=True) %} + {% endif %} + {# #} {# deployment.affinity.pod_anti #} {% if kiali_vars.deployment.affinity is defined and kiali_vars.deployment.affinity.pod_anti is defined and kiali_vars.deployment.affinity.pod_anti | length > 0 %} {% set _=kiali_vars['deployment']['affinity'].pop('pod_anti') %} @@ -119,4 +125,4 @@ {% set kiali_vars=kiali_vars | combine({'deployment': {'security_context': current_cr.spec.deployment.security_context}}, recursive=True) %} {% endif %} {# #} - {{ kiali_vars }} \ No newline at end of file + {{ kiali_vars }}