Merge pull request #382 from xiaods/dev

fix: remove NoFlannel
xiaods · Nov 20, 2024 · 8572b1e · 8572b1e
2 parents 71e2e71 + 18771b6
commit 8572b1e
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/pkg/agent/templates/templates_linux.go b/pkg/agent/templates/templates_linux.go
@@ -63,11 +63,9 @@ enable_keychain = true
 {{end}}
 {{end}}
 
-{{- if not .NodeConfig.NoFlannel }}
 [plugins."io.containerd.grpc.v1.cri".cni]
   bin_dir = "{{ .NodeConfig.AgentConfig.CNIBinDir }}"
   conf_dir = "{{ .NodeConfig.AgentConfig.CNIConfDir }}"
-{{end}}
 
 {{- if or .NodeConfig.Containerd.BlockIOConfig .NodeConfig.Containerd.RDTConfig }}
 [plugins."io.containerd.service.v1.tasks-service"]