Commit 324bb559 authored by Brian Downs's avatar Brian Downs

add ctx to hook, handle hook errors

parent fa2c1422
package cmds
import (
"context"
"github.com/rancher/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/version"
"github.com/rancher/spur/cli"
......@@ -55,7 +57,7 @@ type Server struct {
ClusterInit bool
ClusterReset bool
EncryptSecrets bool
StartupHooks []func(config.Control) error
StartupHooks []func(context.Context, config.Control) error
}
var ServerConfig Server
......
......@@ -61,7 +61,9 @@ func StartServer(ctx context.Context, config *Config) error {
}
for _, hook := range config.StartupHooks {
hook(config.ControlConfig)
if err := hook(ctx, config.ControlConfig); err != nil {
return errors.Wrap(err, "startup hook")
}
}
ip := net2.ParseIP(config.ControlConfig.BindAddress)
......
package server
import (
"context"
"github.com/rancher/k3s/pkg/daemons/config"
)
......@@ -10,5 +12,5 @@ type Config struct {
ControlConfig config.Control
Rootless bool
SupervisorPort int
StartupHooks []func(config.Control) error
StartupHooks []func(context.Context, config.Control) error
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment