Skip to content

Make kube-api-server to return errors from healthcheck #585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mangelajo merged 1 commit into from
Feb 3, 2022
Merged

Make kube-api-server to return errors from healthcheck #585

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions pkg/controllers/kube-apiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,24 +215,25 @@ func (s *KubeAPIServer) configureOAuth(cfg *config.MicroshiftConfig) error {

func (s *KubeAPIServer) Run(ctx context.Context, ready chan<- struct{}, stopped chan<- struct{}) error {
defer close(stopped)
errorChannel := make(chan error, 1)

// run readiness check
go func() {
restConfig, err := clientcmd.BuildConfigFromFlags("", s.kubeconfig)
if err != nil {
klog.Warningf("%s readiness check: %v", s.Name(), err)
return
klog.Errorf("%s readiness check: %v", s.Name(), err)
errorChannel <- err
}

versionedClient, err := kubernetes.NewForConfig(restConfig)
if err != nil {
klog.Warningf("%s readiness check: %v", s.Name(), err)
return
klog.Errorf("%s readiness check: %v", s.Name(), err)
errorChannel <- err
}

if genericcontrollermanager.WaitForAPIServer(versionedClient, kubeAPIStartupTimeout*time.Second) != nil {
klog.Warningf("%s readiness check timed out: %v", s.Name(), err)
return
klog.Errorf("%s readiness check timed out: %v", s.Name(), err)
errorChannel <- err
}

klog.Infof("%s is ready", s.Name())
Expand All @@ -249,8 +250,9 @@ func (s *KubeAPIServer) Run(ctx context.Context, ready chan<- struct{}, stopped
return fmt.Errorf("%s configuration error: %v", s.Name(), utilerrors.NewAggregate(errs))
}

if err := kubeapiserver.Run(completedOptions, ctx.Done()); err != nil {
return err
}
return ctx.Err()
go func() {
errorChannel <- kubeapiserver.Run(completedOptions, ctx.Done())
}()

return <-errorChannel
}