Commit f54abfd

openshift-merge-robot

authored

Merge pull request #20954 from gnufied/cherry-pick-recyler

UPSTREAM: <carry>: simplify kube-controller-manager patches

2 parents a3024f8 + 817d286 commit f54abfdCopy full SHA for f54abfd

2 files changed

+2

-112

lines changed

vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app
- patch.go
- patch_recycler.go

2 files changed

+2

-112

lines changed

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

+2-8

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/patch_recycler.go`

-104

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

Comments

(0)