Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

change name of variable

Browse Source 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
This commit is contained in:
Brian Downs 2020-08-19 14:30:53 -07:00
parent a4b2953017
commit fa2c1422b3
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,7 @@ type Server struct {
ClusterInit bool ClusterInit bool
ClusterReset bool ClusterReset bool
EncryptSecrets bool EncryptSecrets bool
SetupHooks []func(config.Control) error StartupHooks []func(config.Control) error
} }
var ServerConfig Server var ServerConfig Server

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

@ -193,7 +193,7 @@ func run(app *cli.Context, cfg *cmds.Server) error {
return errors.Wrap(err, "Invalid tls-min-version") return errors.Wrap(err, "Invalid tls-min-version")
} }
serverConfig.SetupHooks = append(serverConfig.SetupHooks, cfg.SetupHooks...) serverConfig.StartupHooks = append(serverConfig.StartupHooks, cfg.StartupHooks...)
// TLS config based on mozilla ssl-config generator // TLS config based on mozilla ssl-config generator
// https://ssl-config.mozilla.org/#server=golang&version=1.13.6&config=intermediate&guideline=5.4 // https://ssl-config.mozilla.org/#server=golang&version=1.13.6&config=intermediate&guideline=5.4

2
pkg/server/server.go
View File

@ -60,7 +60,7 @@ func StartServer(ctx context.Context, config *Config) error {
return errors.Wrap(err, "starting tls server") return errors.Wrap(err, "starting tls server")
} }
for _, hook := range config.SetupHooks { for _, hook := range config.StartupHooks {
hook(config.ControlConfig) hook(config.ControlConfig)
} }

2
pkg/server/types.go
View File

@ -10,5 +10,5 @@ type Config struct {
ControlConfig config.Control ControlConfig config.Control
Rootless bool Rootless bool
SupervisorPort int SupervisorPort int
SetupHooks []func(config.Control) error StartupHooks []func(config.Control) error
} }