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

[release-3.4] Fix the bug of too many spaces in an array #2253

Merged
merged 1 commit into from
Oct 30, 2023
Merged

[release-3.4] Fix the bug of too many spaces in an array #2253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 4 deletions roles/common/templates/custom-values-opensearch-data.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,20 +260,20 @@ imagePullSecrets: []

{% if common.opensearch.nodeSelector is defined and common.opensearch.nodeSelector is not none %}
nodeSelector:
{{ common.opensearch.nodeSelector | to_nice_yaml(indent=2) | indent(4) }}
{{ common.opensearch.nodeSelector | to_nice_yaml(indent=2) | indent(2) }}
{% elif nodeSelector is defined and nodeSelector is not none %}
nodeSelector:
{{ nodeSelector | to_nice_yaml(indent=2) | indent(4) }}
{{ nodeSelector | to_nice_yaml(indent=2) | indent(2) }}
{% else %}
nodeSelector: {}
{% endif %}

{% if common.opensearch.tolerations is defined and common.opensearch.tolerations is not none %}
tolerations:
{{ common.opensearch.tolerations | to_nice_yaml(indent=2) | indent(4) }}
{{ common.opensearch.tolerations | to_nice_yaml(indent=2) | indent(2) }}
{% elif tolerations is defined and tolerations is not none %}
tolerations:
{{ tolerations | to_nice_yaml(indent=2) | indent(4) }}
{{ tolerations | to_nice_yaml(indent=2) | indent(2) }}
{% else %}
tolerations: []
{% endif %}
Expand Down
12 changes: 6 additions & 6 deletions roles/common/templates/custom-values-opensearch-master.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,9 @@ antiAffinityTopologyKey: "kubernetes.io/hostname"
antiAffinity: "soft"


{% if common.es.nodeAffinity is defined and common.es.nodeAffinity is not none %}
{% if common.opensearch.nodeAffinity is defined and common.opensearch.nodeAffinity is not none %}
nodeAffinity:
{{ common.opensearch.nodeAffinity | to_nice_yaml(indent=2) | indent(4) }}
{{ common.opensearch.nodeAffinity | to_nice_yaml(indent=2) | indent(2) }}
{% else %}
nodeAffinity: {}
{% endif %}
Expand Down Expand Up @@ -282,20 +282,20 @@ schedulerName: ""
imagePullSecrets: []
{% if common.opensearch.nodeSelector is defined and common.opensearch.nodeSelector is not none %}
nodeSelector:
{{ common.opensearch.nodeSelector | to_nice_yaml(indent=2) | indent(4) }}
{{ common.opensearch.nodeSelector | to_nice_yaml(indent=2) | indent(2) }}
{% elif nodeSelector is defined and nodeSelector is not none %}
nodeSelector:
{{ nodeSelector | to_nice_yaml(indent=2) | indent(4) }}
{{ nodeSelector | to_nice_yaml(indent=2) | indent(2) }}
{% else %}
nodeSelector: {}
{% endif %}

{% if common.opensearch.tolerations is defined and common.opensearch.tolerations is not none %}
tolerations:
{{ common.opensearch.tolerations | to_nice_yaml(indent=2) | indent(4) }}
{{ common.opensearch.tolerations | to_nice_yaml(indent=2) | indent(2) }}
{% elif tolerations is defined and tolerations is not none %}
tolerations:
{{ tolerations | to_nice_yaml(indent=2) | indent(4) }}
{{ tolerations | to_nice_yaml(indent=2) | indent(2) }}
{% else %}
tolerations: []
{% endif %}
Expand Down