Fix custom dashboard yaml parsing (#701)

kiali · Oct 24, 2023 · 4b4e941 · 4b4e941
1 parent 7657327
commit 4b4e941
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git 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 }}
+      {{ 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
@@ -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 }}
+      {{ kiali_vars }}