UPSTREAM: <carry>: add flag for running bare kube-controller-manager

openshift · Jan 12, 2018 · 508734e · 508734e
1 parent 33febce
commit 508734e
Show file tree

Hide file tree

Showing 6 changed files with 600 additions and 4 deletions.
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/imagetemplate.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/imagetemplate.go