From 46a0dc9a5117985475e7ad21136bf0cf324a6f3a Mon Sep 17 00:00:00 2001 From: ErmolenkoMaxim <111919473+ErmolenkoMaxim@users.noreply.github.com> Date: Sat, 17 May 2025 10:35:13 +0300 Subject: [PATCH] Add support for hubble-export-file-max-backups and max-size-mb variables (#12072) * feat(cilium): add configurable Hubble export log rotation parameters - Adds support for `cilium_hubble_export_file_max_backups` and `cilium_hubble_export_file_max_size_mb` - Applies values only if `cilium_hubble_export_file_path` is defined - Default values are set in role defaults - Cleans up template logic by removing unnecessary conditionals * Fix indentation for hubble export settings * Fix undefined variable issue with ipwrap in kubeconfig override that caused pre-commit errors * Update main.yml rollback --- roles/network_plugin/cilium/defaults/main.yml | 3 +++ roles/network_plugin/cilium/templates/cilium/config.yml.j2 | 2 ++ 2 files changed, 5 insertions(+) diff --git a/roles/network_plugin/cilium/defaults/main.yml b/roles/network_plugin/cilium/defaults/main.yml index afa45fa6b..b6d4e6c49 100644 --- a/roles/network_plugin/cilium/defaults/main.yml +++ b/roles/network_plugin/cilium/defaults/main.yml @@ -348,3 +348,6 @@ cilium_certgen_args: cilium_clusterrole_rules_operator_extra_vars: [] cilium_enable_host_firewall: false cilium_policy_audit_mode: false + +cilium_hubble_export_file_max_backups: "5" +cilium_hubble_export_file_max_size_mb: "10" diff --git a/roles/network_plugin/cilium/templates/cilium/config.yml.j2 b/roles/network_plugin/cilium/templates/cilium/config.yml.j2 index 83bae4645..291d83e3b 100644 --- a/roles/network_plugin/cilium/templates/cilium/config.yml.j2 +++ b/roles/network_plugin/cilium/templates/cilium/config.yml.j2 @@ -221,6 +221,8 @@ data: hubble-tls-key-file: /var/lib/cilium/tls/hubble/server.key hubble-tls-client-ca-files: /var/lib/cilium/tls/hubble/client-ca.crt {% endif %} + hubble-export-file-max-backups: "{{ cilium_hubble_export_file_max_backups }}" + hubble-export-file-max-size-mb: "{{ cilium_hubble_export_file_max_size_mb }}" {% endif %} # IP Masquerade Agent