From 4b803e9cdf4a9365b12c158787abbe2172d5321c Mon Sep 17 00:00:00 2001 From: Casey Callendrello Date: Tue, 14 Feb 2023 16:21:02 +0100 Subject: [PATCH] daemon: ignore CILIUM_CUSTOM_CNI_CONF when writing cni configuration This file was overly-cautious when mimicking cni-install.sh's behavior. It turns out we want to be able to disable cni-install.sh but still have the daemon write the configuration file. This preserves existing behavior in 1.12. Thus, we need to remove the bit that bails out if the environment variable is set. Fixes: 12b7b11e1 Signed-off-by: Casey Callendrello --- daemon/cmd/cni.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/daemon/cmd/cni.go b/daemon/cmd/cni.go index 90be0deb4673c..3560b1ad87aa5 100644 --- a/daemon/cmd/cni.go +++ b/daemon/cmd/cni.go @@ -119,12 +119,6 @@ func (d *Daemon) startCNIConfWriter(opts *option.DaemonConfig, cleaner *daemonCl return } - // We used to disable CNI generation with this environment variable - // It's no longer documented, but we need to still support it. - if os.Getenv("CILIUM_CUSTOM_CNI_CONF") == "true" { - return - } - d.controllers.UpdateController(cniControllerName, controller.ControllerParams{ DoFunc: func(ctx context.Context) error {