epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-07 18:47:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix indentation issue in Cilium values file and ensure booleans are lowercase (#12283)

Browse Source 
This patch fixes the indentation in the `encryption` section.
Previously configuration like this:

```yml
cilium_encryption_enabled: true
cilium_encryption_type: wireguard
```

Would template to a `values.yaml` file with indentation that looks like this:

```yml
encryption:
  enabled: True
    type: wireguard
    nodeEncryption: False
```

instead of this:

```yml
encryption:
  enabled: true
  type: wireguard
  nodeEncryption: false
```

This syntax issue causes an error during Cilium installation.

This patch also makes all boolean values in this template file go through the `to_json` filter.
Since values like `True` and `False` are not compliant with the YAML v1.2 spec,
avoiding them is preferable.

`to_json` may be used for all other values in this template to ensure we end up with
a valid YAML document in all cases (even when various strings include special characters),
but this was left for another (future) patch.

Co-authored-by: Slavi Pantaleev <slavi@devture.com>
This commit is contained in:
k8s-infra-cherrypick-robot
2025-06-10 07:50:24 -07:00
committed by GitHub
parent a12e53e845
commit 6ec991e772
1 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
roles/network_plugin/cilium/templates/values.yaml.j2
View File

@@ -1,6 +1,7 @@
#jinja2: trim_blocks: True, lstrip_blocks: True
MTU: {{ cilium_mtu }} MTU: {{ cilium_mtu }}
debug: debug:
enabled: {{ cilium_debug }} enabled: {{ cilium_debug | to_json }}
image: image:
repository: {{ cilium_image_repo }} repository: {{ cilium_image_repo }}
@@ -10,12 +11,12 @@ k8sServiceHost: "auto"
k8sServicePort: "auto" k8sServicePort: "auto"
ipv4: ipv4:
enabled: {{ cilium_enable_ipv4 }} enabled: {{ cilium_enable_ipv4 | to_json }}
ipv6: ipv6:
enabled: {{ cilium_enable_ipv6 }} enabled: {{ cilium_enable_ipv6 | to_json }}
l2announcements: l2announcements:
enabled: {{ cilium_l2announcements }} enabled: {{ cilium_l2announcements | to_json }}
healthPort: {{ cilium_agent_health_port }} healthPort: {{ cilium_agent_health_port }}
@@ -26,11 +27,11 @@ tunnelProtocol: {{ cilium_tunnel_mode }}
loadbalancer: loadbalancer:
mode: {{ cilium_loadbalancer_mode }} mode: {{ cilium_loadbalancer_mode }}
kubeProxyReplacement: {{ cilium_kube_proxy_replacement }} kubeProxyReplacement: {{ cilium_kube_proxy_replacement | to_json }}
{% if cilium_dns_proxy_enable_transparent_mode is defined %} {% if cilium_dns_proxy_enable_transparent_mode is defined %}
dnsProxy: dnsProxy:
enableTransparentMode: {{ cilium_dns_proxy_enable_transparent_mode }} enableTransparentMode: {{ cilium_dns_proxy_enable_transparent_mode | to_json }}
{% endif %} {% endif %}
extraVolumes: extraVolumes:
@@ -43,54 +44,53 @@ extraArgs:
{{ cilium_agent_extra_args | to_nice_yaml(indent=2) | indent(2) }} {{ cilium_agent_extra_args | to_nice_yaml(indent=2) | indent(2) }}
bpf: bpf:
masquerade: {{ cilium_enable_bpf_masquerade }} masquerade: {{ cilium_enable_bpf_masquerade | to_json }}
hostLegacyRouting: {{ cilium_enable_host_legacy_routing }} hostLegacyRouting: {{ cilium_enable_host_legacy_routing | to_json }}
monitorAggregation: {{ cilium_monitor_aggregation }} monitorAggregation: {{ cilium_monitor_aggregation }}
preallocateMaps: {{ cilium_preallocate_bpf_maps }} preallocateMaps: {{ cilium_preallocate_bpf_maps | to_json }}
mapDynamicSizeRatio: {{ cilium_bpf_map_dynamic_size_ratio }} mapDynamicSizeRatio: {{ cilium_bpf_map_dynamic_size_ratio }}
cni: cni:
exclusive: {{ cilium_cni_exclusive }} exclusive: {{ cilium_cni_exclusive | to_json }}
logFile: {{ cilium_cni_log_file }} logFile: {{ cilium_cni_log_file }}
autoDirectNodeRoutes: {{ cilium_auto_direct_node_routes }} autoDirectNodeRoutes: {{ cilium_auto_direct_node_routes | to_json }}
ipv4NativeRoutingCIDR: {{ cilium_native_routing_cidr }} ipv4NativeRoutingCIDR: {{ cilium_native_routing_cidr }}
ipv6NativeRoutingCIDR: {{ cilium_native_routing_cidr_ipv6 }} ipv6NativeRoutingCIDR: {{ cilium_native_routing_cidr_ipv6 }}
encryption: encryption:
enabled: {{ cilium_encryption_enabled }} enabled: {{ cilium_encryption_enabled | to_json }}
{% if cilium_encryption_enabled %} {% if cilium_encryption_enabled %}
type: {{ cilium_encryption_type }} type: {{ cilium_encryption_type }}
{% if cilium_encryption_type == 'wireguard' %} {% if cilium_encryption_type == 'wireguard' %}
nodeEncryption: {{ cilium_encryption_node_encryption }} nodeEncryption: {{ cilium_encryption_node_encryption | to_json }}
{% endif %} {% endif %}
{% endif %}
{% endif %}
bandwidthManager: bandwidthManager:
enabled: {{ cilium_enable_bandwidth_manager }} enabled: {{ cilium_enable_bandwidth_manager | to_json }}
bbr: {{ cilium_enable_bandwidth_manager_bbr }} bbr: {{ cilium_enable_bandwidth_manager_bbr | to_json }}
ipMasqAgent: ipMasqAgent:
enabled: {{ cilium_ip_masq_agent_enable }} enabled: {{ cilium_ip_masq_agent_enable | to_json }}
{% if cilium_ip_masq_agent_enable %} {% if cilium_ip_masq_agent_enable %}
config: config:
nonMasqueradeCIDRs: {{ cilium_non_masquerade_cidrs }} nonMasqueradeCIDRs: {{ cilium_non_masquerade_cidrs }}
masqLinkLocal: {{ cilium_masq_link_local }} masqLinkLocal: {{ cilium_masq_link_local | to_json }}
masqLinkLocalIPv6: {{ cilium_masq_link_local_ipv6 }} masqLinkLocalIPv6: {{ cilium_masq_link_local_ipv6 | to_json }}
# cilium_ip_masq_resync_interval # cilium_ip_masq_resync_interval
{% endif %} {% endif %}
hubble: hubble:
enabled: {{ cilium_enable_hubble }} enabled: {{ cilium_enable_hubble | to_json }}
relay: relay:
enabled: {{ cilium_enable_hubble }} enabled: {{ cilium_enable_hubble | to_json }}
image: image:
repository: {{ cilium_hubble_relay_image_repo }} repository: {{ cilium_hubble_relay_image_repo }}
tag: {{ cilium_hubble_relay_image_tag }} tag: {{ cilium_hubble_relay_image_tag }}
ui: ui:
enabled: {{ cilium_enable_hubble_ui }} enabled: {{ cilium_enable_hubble_ui | to_json }}
backend: backend:
image: image:
repository: {{ cilium_hubble_ui_backend_image_repo }} repository: {{ cilium_hubble_ui_backend_image_repo }}
@@ -100,18 +100,18 @@ hubble:
repository: {{ cilium_hubble_ui_image_repo }} repository: {{ cilium_hubble_ui_image_repo }}
tag: {{ cilium_hubble_ui_image_tag }} tag: {{ cilium_hubble_ui_image_tag }}
metrics: metrics:
enabled: {{ cilium_hubble_metrics }} enabled: {{ cilium_hubble_metrics | to_json }}
export: export:
fileMaxBackups: {{ cilium_hubble_export_file_max_backups }} fileMaxBackups: {{ cilium_hubble_export_file_max_backups }}
fileMaxSizeMb: {{ cilium_hubble_export_file_max_size_mb }} fileMaxSizeMb: {{ cilium_hubble_export_file_max_size_mb }}
dynamic: dynamic:
enabled: {{ cilium_hubble_export_dynamic_enabled }} enabled: {{ cilium_hubble_export_dynamic_enabled | to_json }}
config: config:
content: content:
{{ cilium_hubble_export_dynamic_config_content | to_nice_yaml(indent=10) | indent(10) }} {{ cilium_hubble_export_dynamic_config_content | to_nice_yaml(indent=10) | indent(10) }}
gatewayAPI: gatewayAPI:
enabled: {{ cilium_gateway_api_enabled }} enabled: {{ cilium_gateway_api_enabled | to_json }}
ipam: ipam:
mode: {{ cilium_ipam_mode }} mode: {{ cilium_ipam_mode }}
@@ -126,7 +126,7 @@ ipam:
cgroup: cgroup:
autoMount: autoMount:
enabled: {{ cilium_cgroup_auto_mount }} enabled: {{ cilium_cgroup_auto_mount | to_json }}
hostRoot: {{ cilium_cgroup_host_root }} hostRoot: {{ cilium_cgroup_host_root }}
operator: operator:
@@ -147,11 +147,11 @@ cluster:
id: {{ cilium_cluster_id }} id: {{ cilium_cluster_id }}
name: {{ cilium_cluster_name }} name: {{ cilium_cluster_name }}
enableIPv4Masquerade: {{ cilium_enable_ipv4_masquerade }} enableIPv4Masquerade: {{ cilium_enable_ipv4_masquerade | to_json }}
enableIPv6Masquerade: {{ cilium_enable_ipv6_masquerade }} enableIPv6Masquerade: {{ cilium_enable_ipv6_masquerade | to_json }}
hostFirewall: hostFirewall:
enabled: {{ cilium_enable_host_firewall }} enabled: {{ cilium_enable_host_firewall | to_json }}
certgen: certgen:
image: image: