Skip to content

OpenShift CRD Manager service must signal stop when completed #581

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
copejon merged 1 commit into from
Feb 2, 2022
Merged

OpenShift CRD Manager service must signal stop when completed #581

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
7 changes: 5 additions & 2 deletions pkg/controllers/openshift-crd-manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@ func (s *OpenShiftCRDManager) Dependencies() []string {
}

func (s *OpenShiftCRDManager) Run(ctx context.Context, ready chan<- struct{}, stopped chan<- struct{}) error {
defer close(ready)
// To-DO add readiness check
Copy link
Copy Markdown
Contributor Author

@mangelajo mangelajo Jan 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the check is already there (waitForCrdEstablishment)

defer close(stopped)

if err := assets.ApplyCRDs(s.cfg); err != nil {
klog.Errorf("%s unable to apply default CRDs: %v", s.Name(), err)
return err
}
klog.Infof("%s applied default CRDs", s.Name())

Expand All @@ -51,5 +52,7 @@ func (s *OpenShiftCRDManager) Run(ctx context.Context, ready chan<- struct{}, st
klog.Errorf("%s unable to confirm all CRDs are ready: %v", s.Name(), err)
}
klog.Infof("%s all CRDs are ready", s.Name())
close(ready)

return ctx.Err()
}