External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-10-30 06:13:29 -02:30
Code Issues Packages Projects Releases Wiki Activity

fix: correct CiliumBGPNodeConfigOverride CRD wait condition and deprecate legacy BGP Peering Policy (#13366)

Browse Source 
* fix: correct CiliumBGPNodeConfigOverride CRD wait condition and deprecate legacy BGP Peering Policy

- Fix copy-paste bug where cilium_bgp_advertisements was used instead of
  cilium_bgp_node_config_overrides when waiting for the
  CiliumBGPNodeConfigOverride CRD. This caused the CRD readiness check
  to be skipped when only node config overrides were configured.
- Add deprecation notices across docs, sample inventory, and defaults
  to guide users away from the legacy v2alpha1 CiliumBGPPeeringPolicy
  toward the supported BGP v2 API variables.

* fix(cilium): simplify BGP node override condition
This commit is contained in:
Dasmat Hansda
2026-09-26 10:00:27 +00:00
committed by GitHub
parent d75f23cba3
commit e62c778293
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/CNI/cilium.md
+4
View File
@@ -172,6 +172,10 @@ For further information, check [BGP Control Plane Resources documentation](https
### BGP Peering Policies (Legacy < v1.16)
> **Warning:** The `cilium_bgp_peering_policies` variable uses the deprecated `CiliumBGPPeeringPolicy` (`cilium.io/v2alpha1`) CRD.
> Starting with Cilium v1.16, this CRD is deprecated and generates warnings in Cilium logs.
> Migrate to the new BGP v2 API using `cilium_bgp_cluster_configs`, `cilium_bgp_peer_configs`, `cilium_bgp_advertisements`, and `cilium_bgp_node_config_overrides`.
Cilium's BGP Peering Policies can be configured with the `cilium_bgp_peering_policies` variable:
```yml
inventory/sample/group_vars/k8s_cluster/k8s-net-cilium.yml
+3 -1
View File
@@ -334,7 +334,9 @@ cilium_l2announcements: false
# - name: "peer-65000-tor2"
# localAddress: fd00:11:0:2::2
# -- Configure BGP Peers (Legacy v1.16+)
# -- Configure BGP Peers (Legacy < v1.16)
# Deprecated: cilium_bgp_peering_policies uses the v2alpha1 CiliumBGPPeeringPolicy CRD which is deprecated in Cilium v1.16+.
# Use the new bgpv2 API variables instead: cilium_bgp_cluster_configs, cilium_bgp_peer_configs, cilium_bgp_advertisements, and cilium_bgp_node_config_overrides.
# cilium_bgp_peering_policies:
# - name: "01-bgp-peering-policy"
# spec:
roles/network_plugin/cilium/defaults/main.yml
+2
View File
@@ -305,6 +305,8 @@ cilium_bgp_advertisements: []
cilium_bgp_node_config_overrides: []
# -- Configure BGP Peers (Legacy < v1.16)
# Deprecated: cilium_bgp_peering_policies uses the v2alpha1 CiliumBGPPeeringPolicy CRD which is deprecated in Cilium v1.16+.
# Migrate to cilium_bgp_cluster_configs, cilium_bgp_peer_configs, cilium_bgp_advertisements, and cilium_bgp_node_config_overrides.
cilium_bgp_peering_policies: []
# -- Whether to enable CNP status updates.
roles/network_plugin/cilium/tasks/apply.yml
+1 -1
View File
@@ -212,7 +212,7 @@
failed_when: false
when:
- inventory_hostname == groups['kube_control_plane'][0]
- cilium_bgp_advertisements is defined and (cilium_bgp_advertisements|length>0)
- cilium_bgp_node_config_overrides != []
- name: Cilium | Create CiliumBGPNodeConfigOverride manifests
template: