Merge pull request #8 from deads2k/remove-patches

Remove all kube patches

glide.yaml

@@ -2,71 +2,49 @@ package: github.com/openshift/openshift-controller-manager
 import:
 # kube first
 - package: k8s.io/api
-  repo:    https://github.com/openshift/kubernetes-api.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/apiextensions-apiserver
-  repo:    https://github.com/openshift/kubernetes-apiextensions-apiserver.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/apimachinery
-  repo:    https://github.com/openshift/kubernetes-apimachinery.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/apiserver
-  repo:    https://github.com/openshift/kubernetes-apiserver.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/client-go
-  repo:    https://github.com/openshift/kubernetes-client-go.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/cli-runtime
-  repo:    https://github.com/openshift/kubernetes-cli-runtime.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/cloud-provider
-  repo:    https://github.com/openshift/kubernetes-cloud-provider.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/cluster-bootstrap
-  repo:    https://github.com/openshift/kubernetes-cluster-bootstrap.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/code-generator
-  repo:    https://github.com/openshift/kubernetes-code-generator.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/component-base
-  repo:    https://github.com/openshift/kubernetes-component-base.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/csi-api
-  repo:    https://github.com/openshift/kubernetes-csi-api.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/csi-translation-lib
-  repo:    https://github.com/openshift/kubernetes-csi-translation-lib.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/kube-aggregator
-  repo:    https://github.com/openshift/kubernetes-kube-aggregator.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/kube-controller-manager
-  repo:    https://github.com/openshift/kubernetes-kube-controller-manager.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/kubelet
-  repo:    https://github.com/openshift/kubernetes-kubelet.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/kube-proxy
-  repo:    https://github.com/openshift/kubernetes-kube-proxy.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/kube-scheduler
-  repo:    https://github.com/openshift/kubernetes-kube-scheduler.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/metrics
-  repo:    https://github.com/openshift/kubernetes-metrics.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/sample-apiserver
-  repo:    https://github.com/openshift/kubernetes-sample-apiserver.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/sample-cli-plugin
-  repo:    https://github.com/openshift/kubernetes-sample-cli-plugin.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/sample-controller
-  repo:    https://github.com/openshift/kubernetes-sample-controller.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: kubernetes-1.14.0
 - package: k8s.io/kubernetes
-  repo:    https://github.com/openshift/kubernetes.git
-  version: origin-4.2-kubernetes-1.14.0
+  version: v1.14.0
  # this matches the 1.14 branch from kube
 - package: k8s.io/gengo
   version: 51747d6e00da1fc578d5a333a93bb2abcbce7a95

pkg/cmd/openshift-controller-manager/cmd.go

@@ -15,7 +15,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd/api"
 	"k8s.io/klog"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
@@ -45,7 +44,6 @@ func NewOpenShiftControllerManagerCommand(name string, out, errout io.Writer) *c
 		Short: "Start the OpenShift controllers",
 		Long:  longDescription,
 		Run: func(c *cobra.Command, args []string) {
-			rest.CommandNameOverride = name
 			kcmdutil.CheckErr(options.Validate())
 
 			serviceability.StartProfiler()