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

openshift · Jan 16, 2018 · f829b1a · f829b1a
1 parent e543e30
commit f829b1a
Show file tree

Hide file tree

Showing 8 changed files with 721 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/options/options.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/options/options.go
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/patch.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/patch.go
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/patch_flags.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/patch_flags.go
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/patch_gc.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/patch_gc.go
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/patch_imagetemplate.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/patch_imagetemplate.go