Skip to content

K
k3s
Commit 3f3ff12b authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson
Browse files
Options

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: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent b13cb4ad
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
pkg/agent/templates/templates.go
View file @ 3f3ff12b
......@@ -102,10 +102,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 }}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment