Skip to content

Commit 8658d5d

Browse files
committed
fix(cilium): keep per-type xDS while the 1.20 upgrade rolls
The 1.20 chart renders envoy-xds-mode "ads" and an adsConfig bootstrap for cilium-envoy unless xdsMode or upgradeCompatibility says otherwise. A 1.19 agent never registers the aggregated discovery service, and a 1.20 agent in ADS mode registers nothing else. The agent and envoy DaemonSets roll independently, so on every node where their versions differ envoy gets no configuration until both pods are replaced, and Gateway traffic stops on all nodes at once during the upgrade. Pin xdsMode to split, the per-type xDS both versions serve and the agent's own default when the key is absent. Moving to ADS is a separate step once every node runs 1.20. Assisted-by: LLM Signed-off-by: Aleksei Sviridkin <[email protected]>
1 parent 2b91eaa commit 8658d5d

2 files changed

Lines changed: 33 additions & 0 deletions

File tree

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
suite: cilium-envoy keeps per-type xDS
2+
3+
# The 1.20 chart defaults envoy-xds-mode to "ads" and gives cilium-envoy an
4+
# adsConfig bootstrap. A 1.19 agent serves only per-type xDS and a 1.20 agent
5+
# in ADS mode serves only ADS, so while the agent and envoy DaemonSets roll,
6+
# every node whose two pods differ in version leaves envoy without config.
7+
# values.yaml pins split; these assert both halves of what it renders.
8+
tests:
9+
- it: the agent serves per-type xDS
10+
template: charts/cilium/templates/cilium-configmap.yaml
11+
documentSelector:
12+
path: kind
13+
value: ConfigMap
14+
asserts:
15+
- equal:
16+
path: data["envoy-xds-mode"]
17+
value: split
18+
19+
- it: the envoy bootstrap asks for per-type xDS, not ADS
20+
template: charts/cilium/templates/cilium-envoy/configmap.yaml
21+
asserts:
22+
- notMatchRegex:
23+
path: data["bootstrap-config.json"]
24+
pattern: adsConfig
25+
- matchRegex:
26+
path: data["bootstrap-config.json"]
27+
pattern: apiConfigSource

‎packages/system/cilium/values.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ cilium:
4545
digest: "sha256:136a7dfff4d6adcd448424c2354144160028a8e96eb6558b917fd3ee6d7b39fe"
4646
envoy:
4747
enabled: true
48+
# Keep the per-type xDS the 1.19 agent and envoy speak. The 1.20 chart
49+
# defaults to ADS, which a 1.19 agent never serves and a 1.20 agent in
50+
# ADS mode serves exclusively, so while the agent and envoy DaemonSets
51+
# roll, a node with mixed versions gives envoy no config. Moving to ADS
52+
# needs a step of its own once every node runs 1.20.
53+
xdsMode: split
4854
# Upstream default is {} — no requests/limits. The embedded envoy DaemonSet
4955
# idles at ~100 MB RAM/node and grows under L7 traffic; without requests
5056
# the DaemonSet schedules onto any node with no reserved headroom, and

0 commit comments

Comments
 (0)