Browse Source

fix: remove trailing backslash and yaml indent (#9339)

* fix: remove trailing backslash

* fixed indent in cilium config template
pull/9342/head
Rene Luria 2 years ago
committed by GitHub
parent
commit
3646dc0bd2
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
  1. 18
      roles/network_plugin/cilium/templates/cilium/config.yml.j2
  2. 2
      roles/network_plugin/cilium/templates/cilium/ds.yml.j2

18
roles/network_plugin/cilium/templates/cilium/config.yml.j2

@ -142,12 +142,12 @@ data:
{% if cilium_version | regex_replace('v') is version('1.12', '<') %} {% if cilium_version | regex_replace('v') is version('1.12', '<') %}
native-routing-cidr: "{{ cilium_native_routing_cidr }}" native-routing-cidr: "{{ cilium_native_routing_cidr }}"
{% else %} {% else %}
{% if cilium_native_routing_cidr | length %}
{% if cilium_native_routing_cidr | length %}
ipv4-native-routing-cidr: "{{ cilium_native_routing_cidr }}" ipv4-native-routing-cidr: "{{ cilium_native_routing_cidr }}"
{% endif %}
{% if cilium_native_routing_cidr_ipv6 | length %}
{% endif %}
{% if cilium_native_routing_cidr_ipv6 | length %}
ipv6-native-routing-cidr: "{{ cilium_native_routing_cidr_ipv6 }}" ipv6-native-routing-cidr: "{{ cilium_native_routing_cidr_ipv6 }}"
{% endif %}
{% endif %}
{% endif %} {% endif %}
auto-direct-node-routes: "{{ cilium_auto_direct_node_routes }}" auto-direct-node-routes: "{{ cilium_auto_direct_node_routes }}"
@ -182,16 +182,16 @@ data:
# Enable transparent network encryption # Enable transparent network encryption
{% if cilium_encryption_enabled %} {% if cilium_encryption_enabled %}
{% if cilium_encryption_type == "ipsec" %}
{% if cilium_encryption_type == "ipsec" %}
enable-ipsec: "true" enable-ipsec: "true"
ipsec-key-file: /etc/ipsec/keys ipsec-key-file: /etc/ipsec/keys
encrypt-node: "{{ cilium_ipsec_node_encryption }}" encrypt-node: "{{ cilium_ipsec_node_encryption }}"
{% endif %}
{% endif %}
{% if cilium_encryption_type == "wireguard" %}
{% if cilium_encryption_type == "wireguard" %}
enable-wireguard: "true" enable-wireguard: "true"
enable-wireguard-userspace-fallback: "{{ cilium_wireguard_userspace_fallback }}" enable-wireguard-userspace-fallback: "{{ cilium_wireguard_userspace_fallback }}"
{% endif %}
{% endif %}
{% endif %} {% endif %}
# IPAM settings # IPAM settings
@ -236,4 +236,4 @@ data:
{% endfor %} {% endfor %}
masqLinkLocal: {{ cilium_masq_link_local|bool }} masqLinkLocal: {{ cilium_masq_link_local|bool }}
resyncInterval: "{{ cilium_ip_masq_resync_interval }}" resyncInterval: "{{ cilium_ip_masq_resync_interval }}"
{% endif %}
{% endif %}

2
roles/network_plugin/cilium/templates/cilium/ds.yml.j2

@ -167,7 +167,7 @@ spec:
- name: cilium-config-path - name: cilium-config-path
mountPath: /tmp/cilium/config-map mountPath: /tmp/cilium/config-map
readOnly: true readOnly: true
{% if cilium_ip_masq_agent_enable %}\
{% if cilium_ip_masq_agent_enable %}
- name: ip-masq-agent - name: ip-masq-agent
mountPath: /etc/config mountPath: /etc/config
readOnly: true readOnly: true

Loading…
Cancel
Save