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

Add context to server daemon functions that wait

pull/1007/head
Erik Wilson 2019-11-05 04:44:35 -07:00
parent 7aa3d08385
commit 01f6e0e64e
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/daemons/control/server.go
View File

@ -91,7 +91,7 @@ func Server(ctx context.Context, cfg *config.Control) error {
return err
}
if err := waitForAPIServer(runtime); err != nil {
if err := waitForAPIServer(ctx, runtime); err != nil {
return err
}
@ -105,7 +105,7 @@ func Server(ctx context.Context, cfg *config.Control) error {
controllerManager(cfg, runtime)
if !cfg.DisableCCM {
cloudControllerManager(cfg, runtime)
cloudControllerManager(ctx, cfg, runtime)
}
return nil
@ -782,7 +782,7 @@ func expired(certFile string) bool {
return certutil.IsCertExpired(certificates[0])
}
func cloudControllerManager(cfg *config.Control, runtime *config.ControlRuntime) {
func cloudControllerManager(ctx context.Context, cfg *config.Control, runtime *config.ControlRuntime) {
argsMap := map[string]string{
"kubeconfig": runtime.KubeConfigCloudController,
"allocate-node-cidrs": "true",
@ -808,8 +808,12 @@ func cloudControllerManager(cfg *config.Control, runtime *config.ControlRuntime)
// check for the cloud controller rbac binding
if err := checkForCloudControllerPrivileges(runtime); err != nil {
logrus.Infof("Waiting for cloudcontroller rbac role to be created")
time.Sleep(time.Second)
continue
select {
case <-ctx.Done():
logrus.Fatalf("cloud-controller-manager context canceled: %v", ctx.Err())
case <-time.After(time.Second):
continue
}
}
break
}
@ -831,7 +835,7 @@ func checkForCloudControllerPrivileges(runtime *config.ControlRuntime) error {
return nil
}
func waitForAPIServer(runtime *config.ControlRuntime) error {
func waitForAPIServer(ctx context.Context, runtime *config.ControlRuntime) error {
restConfig, err := clientcmd.BuildConfigFromFlags("", runtime.KubeConfigAdmin)
if err != nil {
return err
@ -849,7 +853,12 @@ func waitForAPIServer(runtime *config.ControlRuntime) error {
return nil
}
logrus.Infof("waiting for apiserver to become available")
time.Sleep(1 * time.Second)
select {
case <-ctx.Done():
return ctx.Err()
case <-time.After(time.Second):
continue
}
}
return fmt.Errorf("timeout waiting for apiserver")