catalog: handle change to single catalog binary

apiserver and controller-manager are now all built into the new
service-catalog binary. Each component is invoked via argument
similar to how hyperkube functions.

Author: Jeff Peeler

examples/service-catalog/service-catalog.yaml

@@ -254,8 +254,9 @@ objects:
         serviceAccountName: service-catalog-apiserver
         containers:
         - command: 
-          - apiserver
+          - service-catalog
           args:
+          - apiserver
           - --admission-control
           - KubernetesNamespaceLifecycle,DefaultServicePlan,ServiceBindingsLifecycle,ServicePlanChangeValidator,BrokerAuthSarCheck
           - --storage-type
@@ -352,8 +353,9 @@ objects:
         serviceAccountName: service-catalog-controller
         containers:
         - command: 
-          - controller-manager
+          - service-catalog
           args:
+          - controller-manager
           - -v
           - "5"
           - --leader-election-namespace

hack/build-local-images.py

@@ -141,8 +141,7 @@
         "directory": "service-catalog",
         "vendor_dir": "cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog",
         "binaries": {
-            "controller-manager": "/usr/bin/controller-manager",
-            "apiserver": "/usr/bin/apiserver",
+            "service-catalog": "/usr/bin/service-catalog",
         },
         "files": {},
         "enable_default": False,

images/service-catalog/Dockerfile

@@ -5,4 +5,4 @@ RUN INSTALL_PKGS="origin-service-catalog" && \
     rpm -V ${INSTALL_PKGS} && \
     yum clean all
 
-CMD [ "/usr/bin/controller-manager" ]
+CMD [ "/usr/bin/service-catalog" ]

origin.spec

@@ -304,8 +304,7 @@ install -p -m 755 cmd/cluster-capacity/go/src/github.com/kubernetes-incubator/cl
 ln -s hypercc %{buildroot}%{_bindir}/cluster-capacity
 
 # Install service-catalog
-install -p -m 755 cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/_output/local/bin/${PLATFORM}/apiserver %{buildroot}%{_bindir}/
-install -p -m 755 cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/_output/local/bin/${PLATFORM}/controller-manager %{buildroot}%{_bindir}/
+install -p -m 755 cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/_output/local/bin/${PLATFORM}/service-catalog %{buildroot}%{_bindir}/
 
 # Install pod
 install -p -m 755 _output/local/bin/${PLATFORM}/pod %{buildroot}%{_bindir}/
@@ -554,8 +553,7 @@ if [ -d %{kube_plugin_path} ]; then
 fi
 
 %files service-catalog
-%{_bindir}/apiserver
-%{_bindir}/controller-manager
+%{_bindir}/service-catalog
 
 %files -n tuned-profiles-%{name}-node
 %license LICENSE