switch to hyperkube

Author: deads2k

hack/lib/constants.sh

@@ -45,6 +45,7 @@ readonly OS_CROSS_COMPILE_TARGETS=(
   cmd/oc
   cmd/kubefed
   cmd/template-service-broker
+  vendor/k8s.io/kubernetes/cmd/hyperkube
 )
 readonly OS_CROSS_COMPILE_BINARIES=("${OS_CROSS_COMPILE_TARGETS[@]##*/}")
 
@@ -75,20 +76,9 @@ readonly OPENSHIFT_BINARY_SYMLINKS=(
   oadm
   osadm
   kubectl
-  kubernetes
-  kubelet
-  kube-proxy
-  kube-apiserver
-  kube-controller-manager
-  kube-scheduler
 )
 readonly OPENSHIFT_BINARY_COPY=(
   oadm
-  kubelet
-  kube-proxy
-  kube-apiserver
-  kube-controller-manager
-  kube-scheduler
 )
 readonly OC_BINARY_COPY=(
   kubectl

origin.spec

@@ -321,12 +321,6 @@ install -d -m 0755 %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 
 for cmd in \
-    kube-apiserver \
-    kube-controller-manager \
-    kube-proxy \
-    kube-scheduler \
-    kubelet \
-    kubernetes \
     oadm \
     openshift-deploy \
     openshift-docker-build \
@@ -421,12 +415,7 @@ install -p -m 755 contrib/migration/* %{buildroot}%{_datadir}/%{name}/migration/
 %doc README.md
 %license LICENSE
 %{_bindir}/openshift
-%{_bindir}/kube-apiserver
-%{_bindir}/kube-controller-manager
-%{_bindir}/kube-proxy
-%{_bindir}/kube-scheduler
-%{_bindir}/kubelet
-%{_bindir}/kubernetes
+%{_bindir}/hyperkube
 %{_bindir}/oadm
 %{_bindir}/openshift-deploy
 %{_bindir}/openshift-f5-router

pkg/cmd/openshift/openshift.go

@@ -9,7 +9,6 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	proxyapp "k8s.io/kubernetes/cmd/kube-proxy/app"
 	ktemplates "k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
@@ -19,7 +18,6 @@ import (
 	irouter "github.com/openshift/origin/pkg/cmd/infra/router"
 	"github.com/openshift/origin/pkg/cmd/recycle"
 	"github.com/openshift/origin/pkg/cmd/server/start"
-	"github.com/openshift/origin/pkg/cmd/server/start/kubernetes"
 	"github.com/openshift/origin/pkg/cmd/templates"
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
@@ -83,18 +81,6 @@ func CommandFor(basename string) *cobra.Command {
 		cmd = admin.NewCommandAdmin(basename, basename, in, out, errout)
 	case "kubectl":
 		cmd = cli.NewCmdKubectl(basename, out)
-	case "kube-apiserver":
-		cmd = kubernetes.NewAPIServerCommand(basename, basename, out)
-	case "kube-controller-manager":
-		cmd = kubernetes.NewControllersCommand(basename, basename, out)
-	case "kubelet":
-		cmd = kubernetes.NewKubeletCommand(basename, basename, out)
-	case "kube-proxy":
-		cmd = proxyapp.NewProxyCommand()
-	case "kube-scheduler":
-		cmd = kubernetes.NewSchedulerCommand(basename, basename, out)
-	case "kubernetes":
-		cmd = kubernetes.NewCommand(basename, basename, out, errout)
 	case "origin":
 		cmd = NewCommandOpenShift(basename)
 	default:

pkg/cmd/server/start/kubernetes/apiserver.go

@@ -26,7 +26,6 @@ import (
 	"github.com/openshift/origin/pkg/cmd/server/admin"
 	configapi "github.com/openshift/origin/pkg/cmd/server/api"
 	"github.com/openshift/origin/pkg/cmd/server/crypto"
-	"github.com/openshift/origin/pkg/cmd/server/start/kubernetes"
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	tsbcmd "github.com/openshift/origin/pkg/templateservicebroker/cmd/server"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -133,9 +132,6 @@ func NewCommandStartAllInOne(basename string, out, errout io.Writer) (*cobra.Com
 	cmds.AddCommand(startEtcdServer)
 	cmds.AddCommand(startTSBServer)
 
-	startKube := kubernetes.NewCommand("kubernetes", basename, out, errout)
-	cmds.AddCommand(startKube)
-
 	// autocompletion hints
 	cmds.MarkFlagFilename("write-config")
 	cmds.MarkFlagFilename("master-config", "yaml", "yml")

pkg/cmd/server/start/kubernetes/controllers.go

@@ -13,10 +13,7 @@ os::cmd::expect_success 'openshift admin config'
 os::cmd::expect_success 'openshift cli config'
 os::cmd::expect_success 'openshift admin policy '
 os::cmd::expect_success 'openshift kubectl'
-os::cmd::expect_success 'openshift kube'
 os::cmd::expect_success 'openshift admin'
-os::cmd::expect_success 'openshift start kubernetes'
-os::cmd::expect_success 'kubernetes'
 os::cmd::expect_success 'kubectl'
 os::cmd::expect_success 'oc'
 os::cmd::expect_success 'osc'
@@ -41,7 +38,6 @@ os::cmd::expect_success_and_text 'openshift admin' 'Administrative Commands'
 os::cmd::expect_success_and_text 'oadm' 'Component Installation:'
 os::cmd::expect_success_and_text 'oadm' 'Security and Policy:'
 os::cmd::expect_success_and_text 'oc adm ca' 'Manage certificates'
-os::cmd::expect_success_and_text 'openshift start kubernetes' 'Kubernetes server components'
 os::cmd::expect_success_and_text 'oc exec --help' '\[options\] POD \[\-c CONTAINER\] \-\- COMMAND \[args\.\.\.\]$'
 os::cmd::expect_success_and_text 'oc rsh --help' '\[options\] POD \[COMMAND\]$'