Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions pkg/controllers/infra-services-controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ func (s *InfrastructureServicesManager) Dependencies() []string {
}

func (s *InfrastructureServicesManager) Run(ctx context.Context, ready chan<- struct{}, stopped chan<- struct{}) error {
defer close(stopped)
defer close(ready)

if err := applyDefaultRBACs(ctx, s.cfg); err != nil {
Expand Down
1 change: 1 addition & 0 deletions pkg/controllers/kube-apiserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ func (s *KubeAPIServer) configure(cfg *config.Config) error {
},
"enable-admission-plugins": {},
"send-retry-after-while-not-ready-once": {"true"},
"shutdown-delay-duration": {"5s"},
},
GenericAPIServerConfig: configv1.GenericAPIServerConfig{
AdmissionConfig: configv1.AdmissionConfig{
Expand Down
1 change: 1 addition & 0 deletions pkg/controllers/openshift-default-scc-manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ func (s *OpenShiftDefaultSCCManager) Dependencies() []string {
}

func (s *OpenShiftDefaultSCCManager) Run(ctx context.Context, ready chan<- struct{}, stopped chan<- struct{}) error {
defer close(stopped)
defer close(ready)
// TO-DO add readiness check
if err := ApplyDefaultSCCs(ctx, s.cfg); err != nil {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ index 087b5f50b..092a1bdb5 100644

- stopCh := server.SetupSignalHandler()
- return Run(context.Background(), c.Complete(), stopCh)
+ return Run(context.Background(), c.Complete(), cmd.Context().Done())
+ return Run(cmd.Context(), c.Complete(), cmd.Context().Done())
},
Args: func(cmd *cobra.Command, args []string) error {
for _, arg := range args {

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.