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

Simplify startWrangler a bit 

We no longer make dynamiclistener generate CA certs.
pull/687/head
YAMAMOTO Takashi 2019-07-30 10:03:39 +09:00
parent 4a65764c3b
commit 88e668cf6f
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/server/server.go
View File

@ -11,7 +11,6 @@ import (
"path/filepath"
"strconv"
"strings"
"time"
"github.com/pkg/errors"
"github.com/rancher/dynamiclistener"
@ -72,7 +71,6 @@ func StartServer(ctx context.Context, config *Config) (string, error) {
func startWrangler(ctx context.Context, config *Config) (string, error) {
var (
err error
tlsServer dynamiclistener.ServerInterface
tlsConfig = &config.TLSConfig
controlConfig = &config.ControlConfig
)
@ -86,14 +84,12 @@ func startWrangler(ctx context.Context, config *Config) (string, error) {
return "", err
}
tlsConfig.CACerts = string(caBytes)
certs := string(caBytes)
tlsConfig.CACerts = certs
tlsConfig.CAKey = string(caKeyBytes)
tlsConfig.Handler = router(controlConfig, controlConfig.Runtime.Tunnel, func() (string, error) {
if tlsServer == nil {
return "", nil
}
return tlsServer.CACert()
return certs, nil
})
sc, err := newContext(ctx, controlConfig.Runtime.KubeConfigAdmin)
@ -105,7 +101,7 @@ func startWrangler(ctx context.Context, config *Config) (string, error) {
return "", err
}
tlsServer, err = tls.NewServer(ctx, sc.K3s.K3s().V1().ListenerConfig(), *tlsConfig)
_, err = tls.NewServer(ctx, sc.K3s.K3s().V1().ListenerConfig(), *tlsConfig)
if err != nil {
return "", err
}
@ -114,16 +110,6 @@ func startWrangler(ctx context.Context, config *Config) (string, error) {
return "", err
}
certs := ""
for certs == "" {
certs, err = tlsServer.CACert()
if err != nil {
logrus.Infof("waiting to generate CA certs")
time.Sleep(time.Second)
continue
}
}
go leader.RunOrDie(ctx, "", "k3s", sc.K8s, func(ctx context.Context) {
if err := masterControllers(ctx, sc, config); err != nil {
panic(err)