github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add extraArgs to tailscale 

Signed-off-by: Manuel Buil <mbuil@suse.com>
pull/8466/head
Manuel Buil 2023-09-14 18:24:19 +02:00
parent 01e6b5b8d3
commit 221fdd60c4
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cli/cmds/agent.go
View File

@ -157,13 +157,13 @@ var (
} }
VPNAuth = &cli.StringFlag{ VPNAuth = &cli.StringFlag{
Name: "vpn-auth", Name: "vpn-auth",
Usage: "(agent/networking) (experimental) Credentials for the VPN provider. It must include the provider name and join key in the format name=<vpn-provider>,joinKey=<key>[,controlServerURL=<url>]", Usage: "(agent/networking) (experimental) Credentials for the VPN provider. It must include the provider name and join key in the format name=<vpn-provider>,joinKey=<key>[,controlServerURL=<url>][,extraArgs=<args>]",
EnvVar: version.ProgramUpper + "_VPN_AUTH", EnvVar: version.ProgramUpper + "_VPN_AUTH",
Destination: &AgentConfig.VPNAuth, Destination: &AgentConfig.VPNAuth,
} }
VPNAuthFile = &cli.StringFlag{ VPNAuthFile = &cli.StringFlag{
Name: "vpn-auth-file", Name: "vpn-auth-file",
Usage: "(agent/networking) (experimental) File containing credentials for the VPN provider. It must include the provider name and join key in the format name=<vpn-provider>,joinKey=<key>[,controlServerURL=<url>]", Usage: "(agent/networking) (experimental) File containing credentials for the VPN provider. It must include the provider name and join key in the format name=<vpn-provider>,joinKey=<key>[,controlServerURL=<url>][,extraArgs=<args>]",
EnvVar: version.ProgramUpper + "_VPN_AUTH_FILE", EnvVar: version.ProgramUpper + "_VPN_AUTH_FILE",
Destination: &AgentConfig.VPNAuthFile, Destination: &AgentConfig.VPNAuthFile,
} }

22
pkg/vpn/vpn.go
View File

@ -35,6 +35,7 @@ type vpnCliAuthInfo struct {
Name string Name string
JoinKey string JoinKey string
ControlServerURL string ControlServerURL string
ExtraCLIFlags []string
} }
// StartVPN starts the VPN interface. General function in case we want to add more vpn integrations // StartVPN starts the VPN interface. General function in case we want to add more vpn integrations
@ -53,6 +54,10 @@ func StartVPN(vpnAuthConfigFile string) error {
if authInfo.ControlServerURL != "" { if authInfo.ControlServerURL != "" {
args = append(args, "--login-server", authInfo.ControlServerURL) args = append(args, "--login-server", authInfo.ControlServerURL)
} }
if len(authInfo.ExtraCLIFlags) > 0 {
args = append(args, authInfo.ExtraCLIFlags...)
}
logrus.Debugf("Flags passed to tailscale up: %v", args)
output, err := util.ExecCommand("tailscale", args) output, err := util.ExecCommand("tailscale", args)
if err != nil { if err != nil {
return errors.Wrap(err, "tailscale up failed: "+output) return errors.Wrap(err, "tailscale up failed: "+output)
@ -80,7 +85,12 @@ func GetVPNInfo(vpnAuth string) (VPNInfo, error) {
// getVPNAuthInfo returns the required authInfo object // getVPNAuthInfo returns the required authInfo object
func getVPNAuthInfo(vpnAuth string) (vpnCliAuthInfo, error) { func getVPNAuthInfo(vpnAuth string) (vpnCliAuthInfo, error) {
var authInfo vpnCliAuthInfo var authInfo vpnCliAuthInfo
vpnParameters := strings.Split(vpnAuth, ",")
// Separate extraArgs which will be passed directly to the vpn binary command
vpnCommand, extraArgs := processCLIArgs(vpnAuth)
authInfo.ExtraCLIFlags = extraArgs
vpnParameters := strings.Split(vpnCommand, ",")
for _, vpnKeyValues := range vpnParameters { for _, vpnKeyValues := range vpnParameters {
vpnKeyValue := strings.Split(vpnKeyValues, "=") vpnKeyValue := strings.Split(vpnKeyValues, "=")
switch vpnKeyValue[0] { switch vpnKeyValue[0] {
@ -139,3 +149,13 @@ func getTailscaleInfo() (VPNInfo, error) {
return VPNInfo{IPv4Address: net.ParseIP(ipv4Address), IPv6Address: net.ParseIP(ipv6Address), NodeID: "", ProviderName: "tailscale", VPNInterface: tailscaleIf}, nil return VPNInfo{IPv4Address: net.ParseIP(ipv4Address), IPv6Address: net.ParseIP(ipv6Address), NodeID: "", ProviderName: "tailscale", VPNInterface: tailscaleIf}, nil
} }
// processCLIArgs separates the extraArgs part from the command.
// Note that tailscale flags of type list are comma separated and don't accept spaces, thus we can use strings.Fields to separate flags
func processCLIArgs(command string) (string, []string) {
subCommands := strings.Split(command, ",extraArgs=")
if len(subCommands) > 1 {
return subCommands[0], strings.Fields(subCommands[1])
}
return subCommands[0], []string{}
}