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

Return the error since it just gets logged and retried anyways 

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/4014/head
Brad Davidson 2021-09-13 16:20:53 -07:00 committed by Brad Davidson
parent 5986898419
commit b72306ce3d
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,7 +331,7 @@ func cloudControllerManager(ctx context.Context, cfg *config.Control, runtime *c
return return
case err := <-promise(func() error { return checkForCloudControllerPrivileges(ctx, runtime, 5*time.Second) }): case err := <-promise(func() error { return checkForCloudControllerPrivileges(ctx, runtime, 5*time.Second) }):
if err != nil { if err != nil {
logrus.Infof("Waiting for cloud-controller-manager privileges to become available") logrus.Infof("Waiting for cloud-controller-manager privileges to become available: %v", err)
continue continue
} }
return return
@ -375,11 +375,7 @@ func checkForCloudControllerPrivileges(ctx context.Context, runtime *config.Cont
} }
return false, nil return false, nil
}) })
return err
if err != nil {
logrus.Errorf("error encountered waitng for cloud-controller-manager privileges: %v", err)
}
return nil
} }
func waitForAPIServerInBackground(ctx context.Context, runtime *config.ControlRuntime) error { func waitForAPIServerInBackground(ctx context.Context, runtime *config.ControlRuntime) error {