Skip to content

Commit 5f86784

Browse files
committed
Enable separate Envoy daemonset by default for Cilium 1.17 and newer
With Cilium 1.17 the separate Envoy daemonset is also supported on OpenShift, so we can enable it by default.
1 parent b0470eb commit 5f86784

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

class/defaults.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ parameters:
3333
confPath: /var/run/multus/cni/net.d
3434
endpointRoutes:
3535
enabled: true
36-
# Make <=1.15 behavior (embedded envoy) explicit
37-
envoy:
38-
enabled: false
3936
hubble:
4037
metrics:
4138
enabled:

component/render-helm-values.jsonnet

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,15 @@ local rewriteLBIPAMRequireLBClass =
113113
else
114114
{};
115115

116+
local envoyDefault = {
117+
envoy: {
118+
enabled: util.version.minor > 16,
119+
},
120+
};
121+
116122
local cilium_values = std.prune(
117123
rewriteLBIPAMRequireLBClass +
124+
envoyDefault +
118125
com.makeMergeable(params.cilium_helm_values) +
119126
replaceDeprecatedIPv4PodCIDR +
120127
renderPodCIDRList +

tests/golden/olm-enterprise/cilium/cilium/olm/cluster-network-07-cilium-ciliumconfig.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
egressGatewayHA:
2727
enabled: false
2828
envoy:
29-
enabled: false
29+
enabled: true
3030
hubble:
3131
metrics:
3232
enabled:

0 commit comments

Comments
 (0)