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

Merge pull request #239 from takmatsu/add-hosts 

Add tls-san flag
pull/264/head
Darren Shepherd 2019-03-25 09:54:21 -07:00 committed by GitHub
parent 9a57e6fd0f 3a6b305455
commit 4463408819
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cli/cmds/server.go
View File

@ -16,6 +16,7 @@ type Server struct {
DisableAgent bool DisableAgent bool
KubeConfigOutput string KubeConfigOutput string
KubeConfigMode string KubeConfigMode string
KnownIPs cli.StringSlice
} }
var ServerConfig Server var ServerConfig Server
@ -94,6 +95,11 @@ func NewServerCommand(action func(*cli.Context) error) cli.Command {
Destination: &ServerConfig.KubeConfigMode, Destination: &ServerConfig.KubeConfigMode,
EnvVar: "K3S_KUBECONFIG_MODE", EnvVar: "K3S_KUBECONFIG_MODE",
}, },
cli.StringSliceFlag{
Name: "tls-san",
Usage: "Add additional hostname or IP as a Subject Alternative Name in the TLS cert",
Value: &ServerConfig.KnownIPs,
},
NodeIPFlag, NodeIPFlag,
NodeNameFlag, NodeNameFlag,
DockerFlag, DockerFlag,

8
pkg/cli/server/server.go
View File

@ -77,7 +77,7 @@ func run(app *cli.Context, cfg *cmds.Server) error {
serverConfig.ControlConfig.KubeConfigMode = cfg.KubeConfigMode serverConfig.ControlConfig.KubeConfigMode = cfg.KubeConfigMode
serverConfig.TLSConfig.HTTPSPort = cfg.HTTPSPort serverConfig.TLSConfig.HTTPSPort = cfg.HTTPSPort
serverConfig.TLSConfig.HTTPPort = cfg.HTTPPort serverConfig.TLSConfig.HTTPPort = cfg.HTTPPort
serverConfig.TLSConfig.KnownIPs = knownIPs() serverConfig.TLSConfig.KnownIPs = knownIPs(cfg.KnownIPs)
_, serverConfig.ControlConfig.ClusterIPRange, err = net2.ParseCIDR(cfg.ClusterCIDR) _, serverConfig.ControlConfig.ClusterIPRange, err = net2.ParseCIDR(cfg.ClusterCIDR)
if err != nil { if err != nil {
@ -146,10 +146,8 @@ func run(app *cli.Context, cfg *cmds.Server) error {
return agent.Run(ctx, agentConfig) return agent.Run(ctx, agentConfig)
} }
func knownIPs() []string { func knownIPs(ips []string) []string {
ips := []string{ ips = append(ips, "127.0.0.1")
"127.0.0.1",
}
ip, err := net.ChooseHostInterface() ip, err := net.ChooseHostInterface()
if err == nil { if err == nil {
ips = append(ips, ip.String()) ips = append(ips, ip.String())