From 85c870657e21b2b0e18e4b6f9b1e283ecf33db3d Mon Sep 17 00:00:00 2001 From: Nick Fox Date: Tue, 24 Oct 2023 12:21:08 -0400 Subject: [PATCH 1/2] Fix custom dashboard yaml parsing --- roles/default/kiali-deploy/tasks/snake_camel_case.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 }} From c62af7917133ddd7d236310458d3b96434777203 Mon Sep 17 00:00:00 2001 From: Nick Fox Date: Tue, 24 Oct 2023 13:55:47 -0400 Subject: [PATCH 2/2] Add custom dashboards fix to 1.73 --- roles/v1.73/kiali-deploy/tasks/snake_camel_case.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 }}