Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix custom dashboard yaml parsing #701

Merged
merged 2 commits into from
Oct 24, 2023
Merged

Fix custom dashboard yaml parsing #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85c8706
Fix custom dashboard yaml parsing
nrfox Oct 24, 2023
c62af79
Add custom dashboards fix to 1.73
nrfox Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion roles/default/kiali-deploy/tasks/snake_camel_case.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') %}
Expand Down Expand Up @@ -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 }}
8 changes: 7 additions & 1 deletion roles/v1.73/kiali-deploy/tasks/snake_camel_case.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') %}
Expand Down Expand Up @@ -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 }}
Loading