Merge pull request #250 from yoink00/master

Allow flannel interface to be specified on the command line

pkg/cli/cmds/agent.go

@@ -19,6 +19,7 @@ type Agent struct {
 	Docker                   bool
 	ContainerRuntimeEndpoint string
 	NoFlannel                bool
+	FlannelIface             string
 	Debug                    bool
 	Rootless                 bool
 	AgentShared
@@ -54,6 +55,11 @@ var (
 		Usage:       "(agent) Disable embedded flannel",
 		Destination: &AgentConfig.NoFlannel,
 	}
+	FlannelIfaceFlag = cli.StringFlag{
+		Name:        "flannel-iface",
+		Usage:       "(agent) Override default flannel interface",
+		Destination: &AgentConfig.FlannelIface,
+	}
 	CRIEndpointFlag = cli.StringFlag{
 		Name:        "container-runtime-endpoint",
 		Usage:       "(agent) Disable embedded containerd and use alternative CRI implementation",
@@ -121,6 +127,7 @@ func NewAgentCommand(action func(ctx *cli.Context) error) cli.Command {
 			},
 			DockerFlag,
 			FlannelFlag,
+			FlannelIfaceFlag,
 			NodeNameFlag,
 			NodeIPFlag,
 			CRIEndpointFlag,

pkg/cli/cmds/server.go

@@ -134,6 +134,7 @@ func NewServerCommand(action func(*cli.Context) error) cli.Command {
 			NodeNameFlag,
 			DockerFlag,
 			FlannelFlag,
+			FlannelIfaceFlag,
 			CRIEndpointFlag,
 			ResolvConfFlag,
 			ExtraKubeletArgs,