diff --git a/calico-cloud/_includes/components/FelixConfig/config-params.json b/calico-cloud/_includes/components/FelixConfig/config-params.json index 8f6cd44252..876a8d4667 100644 --- a/calico-cloud/_includes/components/FelixConfig/config-params.json +++ b/calico-cloud/_includes/components/FelixConfig/config-params.json @@ -6440,8 +6440,8 @@ "Required": false, "OnParseFailure": "ReplaceWithDefault", "AllowedConfigSources": "All", - "Description": "Used to enable/disable dynamically changing aggregation levels. Default is true.", - "DescriptionHTML": "
Used to enable/disable dynamically changing aggregation levels. Default is true.
", + "Description": "Used to enable/disable dynamically changing aggregation levels. Default is false.", + "DescriptionHTML": "Used to enable/disable dynamically changing aggregation levels. Default is false.
", "UserEditable": true, "GoType": "*bool", "OpenSourceOnly": false diff --git a/calico-cloud_versioned_docs/version-23-2/_includes/components/FelixConfig/config-params.json b/calico-cloud_versioned_docs/version-23-2/_includes/components/FelixConfig/config-params.json index 8f6cd44252..876a8d4667 100644 --- a/calico-cloud_versioned_docs/version-23-2/_includes/components/FelixConfig/config-params.json +++ b/calico-cloud_versioned_docs/version-23-2/_includes/components/FelixConfig/config-params.json @@ -6440,8 +6440,8 @@ "Required": false, "OnParseFailure": "ReplaceWithDefault", "AllowedConfigSources": "All", - "Description": "Used to enable/disable dynamically changing aggregation levels. Default is true.", - "DescriptionHTML": "Used to enable/disable dynamically changing aggregation levels. Default is true.
", + "Description": "Used to enable/disable dynamically changing aggregation levels. Default is false.", + "DescriptionHTML": "Used to enable/disable dynamically changing aggregation levels. Default is false.
", "UserEditable": true, "GoType": "*bool", "OpenSourceOnly": false diff --git a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/FelixConfig/config-params.json b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/FelixConfig/config-params.json index 0b129efe0f..bc5116230a 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/FelixConfig/config-params.json +++ b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/FelixConfig/config-params.json @@ -5799,8 +5799,8 @@ "Required": false, "OnParseFailure": "ReplaceWithDefault", "AllowedConfigSources": "All", - "Description": "Used to enable/disable dynamically changing aggregation levels. Default is true.", - "DescriptionHTML": "Used to enable/disable dynamically changing aggregation levels. Default is true.
", + "Description": "Used to enable/disable dynamically changing aggregation levels. Default is false.", + "DescriptionHTML": "Used to enable/disable dynamically changing aggregation levels. Default is false.
", "UserEditable": true, "GoType": "*bool", "OpenSourceOnly": false diff --git a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/FelixConfig/config-params.json b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/FelixConfig/config-params.json index 3c28de306c..b73f467f29 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/FelixConfig/config-params.json +++ b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/FelixConfig/config-params.json @@ -5976,8 +5976,8 @@ "Required": false, "OnParseFailure": "ReplaceWithDefault", "AllowedConfigSources": "All", - "Description": "Used to enable/disable dynamically changing aggregation levels. Default is true.", - "DescriptionHTML": "Used to enable/disable dynamically changing aggregation levels. Default is true.
", + "Description": "Used to enable/disable dynamically changing aggregation levels. Default is false.", + "DescriptionHTML": "Used to enable/disable dynamically changing aggregation levels. Default is false.
", "UserEditable": true, "GoType": "*bool", "OpenSourceOnly": false diff --git a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/FelixConfig/config-params.json b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/FelixConfig/config-params.json index 8f6cd44252..876a8d4667 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/FelixConfig/config-params.json +++ b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/FelixConfig/config-params.json @@ -6440,8 +6440,8 @@ "Required": false, "OnParseFailure": "ReplaceWithDefault", "AllowedConfigSources": "All", - "Description": "Used to enable/disable dynamically changing aggregation levels. Default is true.", - "DescriptionHTML": "Used to enable/disable dynamically changing aggregation levels. Default is true.
", + "Description": "Used to enable/disable dynamically changing aggregation levels. Default is false.", + "DescriptionHTML": "Used to enable/disable dynamically changing aggregation levels. Default is false.
", "UserEditable": true, "GoType": "*bool", "OpenSourceOnly": false diff --git a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/FelixConfig/config-params.json b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/FelixConfig/config-params.json index 8f6cd44252..876a8d4667 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/FelixConfig/config-params.json +++ b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/FelixConfig/config-params.json @@ -6440,8 +6440,8 @@ "Required": false, "OnParseFailure": "ReplaceWithDefault", "AllowedConfigSources": "All", - "Description": "Used to enable/disable dynamically changing aggregation levels. Default is true.", - "DescriptionHTML": "Used to enable/disable dynamically changing aggregation levels. Default is true.
", + "Description": "Used to enable/disable dynamically changing aggregation levels. Default is false.", + "DescriptionHTML": "Used to enable/disable dynamically changing aggregation levels. Default is false.
", "UserEditable": true, "GoType": "*bool", "OpenSourceOnly": false diff --git a/calico-enterprise_versioned_docs/version-3.24-2/_includes/components/FelixConfig/config-params.json b/calico-enterprise_versioned_docs/version-3.24-2/_includes/components/FelixConfig/config-params.json index 8f6cd44252..876a8d4667 100644 --- a/calico-enterprise_versioned_docs/version-3.24-2/_includes/components/FelixConfig/config-params.json +++ b/calico-enterprise_versioned_docs/version-3.24-2/_includes/components/FelixConfig/config-params.json @@ -6440,8 +6440,8 @@ "Required": false, "OnParseFailure": "ReplaceWithDefault", "AllowedConfigSources": "All", - "Description": "Used to enable/disable dynamically changing aggregation levels. Default is true.", - "DescriptionHTML": "Used to enable/disable dynamically changing aggregation levels. Default is true.
", + "Description": "Used to enable/disable dynamically changing aggregation levels. Default is false.", + "DescriptionHTML": "Used to enable/disable dynamically changing aggregation levels. Default is false.
", "UserEditable": true, "GoType": "*bool", "OpenSourceOnly": false diff --git a/scripts/felix-config-overrides.json b/scripts/felix-config-overrides.json new file mode 100644 index 0000000000..d0325aa8c0 --- /dev/null +++ b/scripts/felix-config-overrides.json @@ -0,0 +1,18 @@ +[ + { + "field": "FlowLogsDynamicAggregationEnabled", + "reason": "felix/config/config_params.go tags this field `bool;false` (unchanged across all versions), but the doc comment in api/pkg/apis/projectcalico/v3/felixconfig.go has always said 'Default is true.' -- a long-standing stale comment, not a behavior change. Corrected on tigera/calico-private master via PR #12538 (merged 2026-07-16, incidental to an unrelated fluentd-removal change) but not yet backported to any release branch. Remove this entry once a synced file no longer needs it -- a WARNING below will announce that automatically.", + "patches": [ + { + "key": "Description", + "expected": "Used to enable/disable dynamically changing aggregation levels. Default is true.", + "value": "Used to enable/disable dynamically changing aggregation levels. Default is false." + }, + { + "key": "DescriptionHTML", + "expected": "Used to enable/disable dynamically changing aggregation levels. Default is true.
", + "value": "Used to enable/disable dynamically changing aggregation levels. Default is false.
" + } + ] + } +] diff --git a/scripts/patch-felix-config-overrides.sh b/scripts/patch-felix-config-overrides.sh new file mode 100755 index 0000000000..03f44dbe40 --- /dev/null +++ b/scripts/patch-felix-config-overrides.sh @@ -0,0 +1,92 @@ +#!/usr/bin/env bash + +# Patches known-stale upstream Felix config doc text into a freshly-synced +# config-params.json, in place. Overrides are declared in felix-config-overrides.json, +# scoped by NameConfigFile so a patch can never touch an unrelated field that happens +# to share the same description text. +# +# Called from update_felix_config() in update-felix-config.sh, after the fetched file +# has been validated as JSON and before it replaces the checked-in copy. + +set -euo pipefail + +readonly SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +readonly OVERRIDES_FILE="${SCRIPT_DIR}/felix-config-overrides.json" + +if [[ $# -ne 1 ]]; then + echo "Usage: $(basename "${BASH_SOURCE[0]}")