Skip to content

Commit fec4e8a

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #16617 from deads2k/controller-14-gcwait
Automatic merge from submit-queue (batch tested with PRs 16617, 16719). UPSTREAM: 51633: update GC controller to wait until controllers have … …been initialized fixes #16573 @ironcladlou it did not pick cleanly.
2 parents 62d9640 + 7aa1f2a commit fec4e8a

File tree

6 files changed

+26
-3
lines changed

6 files changed

+26
-3
lines changed

‎vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/core.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/garbagecollector.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/garbagecollector_test.go

+10-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/graph_builder.go

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/test/integration/garbagecollector/garbage_collector_test.go

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)