Skip to content

Commit ee37719

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #17820 from liggitt/cluster-scoped-owners-3.9
Automatic merge from submit-queue (batch tested with PRs 17699, 17820). UPSTREAM: 57211: Process cluster-scoped owners correctly
2 parents ceb0625 + 945fda7 commit ee37719

File tree

4 files changed

+157
-8
lines changed

4 files changed

+157
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
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/operations.go

Lines changed: 6 additions & 6 deletions
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/cluster_scoped_owner_test.go

Lines changed: 147 additions & 0 deletions
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

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)