Skip to content

Commit

Permalink
feat: Add self-defined template configure file for embedded flannel
Browse files Browse the repository at this point in the history
-Add an additional parameter to k3s agent like '--flannel-conf-tpl' to set a template of flannel conf.
-Use that to render a real conf for embedded flannel.
Issue k3s-io#1531
  • Loading branch information
Encore222 committed Mar 17, 2020
1 parent db90dd6 commit 43c9fce
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/agent/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ func get(envInfo *cmds.Agent) (*config.Node, error) {
nodeConfig.FlannelConfOverride = true
}

if nodeConfig.FlannelConfTpl != "" {
if envInfo.FlannelConfTpl != "" {
nodeConfig.FlannelConfTpl = envInfo.FlannelConfTpl
nodeConfig.FlannelConfOverride = true
}
Expand Down

0 comments on commit 43c9fce

Please sign in to comment.