From 7b1c48212aadcd8a72449cb4e3fec306cfeb6c91 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Thu, 20 Feb 2025 18:45:10 +0000 Subject: [PATCH] Render CNI dir config whenever vars are set RKE2 on Windows sets CNI bin dirs in node config even though embedded flannel is disabled (NoFlannel=true). We need to gate rendering this config on the vars being, set NOT on NoFlannel being false. Signed-off-by: Brad Davidson --- pkg/agent/templates/templates.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/agent/templates/templates.go b/pkg/agent/templates/templates.go index d9303b64a0..509d2c103c 100644 --- a/pkg/agent/templates/templates.go +++ b/pkg/agent/templates/templates.go @@ -109,10 +109,10 @@ enable_keychain = true {{end}} {{end}} -{{- if not .NodeConfig.NoFlannel }} +{{- if or .NodeConfig.AgentConfig.CNIBinDir .NodeConfig.AgentConfig.CNIConfDir }} [plugins."io.containerd.grpc.v1.cri".cni] - bin_dir = {{ printf "%q" .NodeConfig.AgentConfig.CNIBinDir }} - conf_dir = {{ printf "%q" .NodeConfig.AgentConfig.CNIConfDir }} + {{ if .NodeConfig.AgentConfig.CNIBinDir }}bin_dir = {{ printf "%q" .NodeConfig.AgentConfig.CNIBinDir }}{{end}} + {{ if .NodeConfig.AgentConfig.CNIConfDir }}conf_dir = {{ printf "%q" .NodeConfig.AgentConfig.CNIConfDir }}{{end}} {{end}} {{- if or .NodeConfig.Containerd.BlockIOConfig .NodeConfig.Containerd.RDTConfig }} @@ -201,10 +201,10 @@ state = {{ printf "%q" .NodeConfig.Containerd.State }} [plugins.'io.containerd.cri.v1.images'.registry] config_path = {{ printf "%q" .NodeConfig.Containerd.Registry }} -{{ if not .NodeConfig.NoFlannel }} +{{- if or .NodeConfig.AgentConfig.CNIBinDir .NodeConfig.AgentConfig.CNIConfDir }} [plugins.'io.containerd.cri.v1.runtime'.cni] - bin_dir = {{ printf "%q" .NodeConfig.AgentConfig.CNIBinDir }} - conf_dir = {{ printf "%q" .NodeConfig.AgentConfig.CNIConfDir }} + {{ with .NodeConfig.AgentConfig.CNIBinDir }}bin_dir = {{ printf "%q" . }}{{ end }} + {{ with .NodeConfig.AgentConfig.CNIConfDir }}conf_dir = {{ printf "%q" . }}{{ end }} {{ end }} {{ if or .NodeConfig.Containerd.BlockIOConfig .NodeConfig.Containerd.RDTConfig }}