Move deployer images into oc

Author: smarterclayton

Diff for: hack/import-restrictions.json

@@ -465,6 +465,8 @@
       "github.com/openshift/origin/pkg/bulk",
       "github.com/openshift/origin/pkg/client/config",
       "github.com/openshift/origin/pkg/cmd/flagtypes",
+      "github.com/openshift/origin/pkg/cmd/infra/builder",
+      "github.com/openshift/origin/pkg/cmd/infra/deployer",
       "github.com/openshift/origin/pkg/cmd/openshift-operators/generated/clientset/versioned",
       "github.com/openshift/origin/pkg/cmd/server/admin",
       "github.com/openshift/origin/pkg/cmd/server/apis/config",

Diff for: hack/lib/build/binaries.sh

@@ -412,6 +412,9 @@ function os::build::make_openshift_binary_symlinks() {
     done
   fi
   if [[ -f "${OS_OUTPUT_BINPATH}/${platform}/oc" ]]; then
+    for linkname in "${OC_BINARY_SYMLINKS[@]}"; do
+      ln -sf oc "${OS_OUTPUT_BINPATH}/${platform}/${linkname}"
+    done
     for linkname in "${OC_BINARY_COPY[@]}"; do
       ln -sf oc "${OS_OUTPUT_BINPATH}/${platform}/${linkname}"
     done

Diff for: hack/lib/constants.sh

@@ -66,14 +66,15 @@ readonly OS_GOVET_BLACKLIST=(
 #If you update this list, be sure to get the images/origin/Dockerfile
 readonly OPENSHIFT_BINARY_SYMLINKS=(
   openshift-router
-  openshift-deploy
   openshift-recycle
+)
+readonly OC_BINARY_SYMLINKS=(
+  openshift-deploy
   openshift-sti-build
   openshift-docker-build
   openshift-git-clone
   openshift-manage-dockerfile
   openshift-extract-image-content
-  origin
 )
 readonly OC_BINARY_COPY=(
   kubectl
@@ -381,18 +382,18 @@ function os::build::images() {
   for i in `jobs -p`; do wait $i; done
 
   # images that depend on "${tag_prefix}-cli"
-  ( os::build::image "${tag_prefix}-tests"         images/tests ) &
-  ( os::build::image "${tag_prefix}-control-plane" images/origin ) &
+  ( os::build::image "${tag_prefix}-tests"          images/tests ) &
+  ( os::build::image "${tag_prefix}-control-plane"  images/origin ) &
+  ( os::build::image "${tag_prefix}-deployer"       images/deployer ) &
+  ( os::build::image "${tag_prefix}-docker-builder" images/builder/docker/docker-builder ) &
 
   for i in `jobs -p`; do wait $i; done
 
   # images that depend on "${tag_prefix}-control-plane"
-  ( os::build::image "${tag_prefix}-haproxy-router"        images/router/haproxy ) &
-  ( os::build::image "${tag_prefix}-deployer"              images/deployer ) &
-  ( os::build::image "${tag_prefix}-recycler"              images/recycler ) &
-  ( os::build::image "${tag_prefix}-docker-builder"        images/builder/docker/docker-builder ) &
-  ( os::build::image "${tag_prefix}-f5-router"             images/router/f5 ) &
-  ( os::build::image "${tag_prefix}-node"                  images/node ) &
+  ( os::build::image "${tag_prefix}-haproxy-router" images/router/haproxy ) &
+  ( os::build::image "${tag_prefix}-recycler"       images/recycler ) &
+  ( os::build::image "${tag_prefix}-f5-router"      images/router/f5 ) &
+  ( os::build::image "${tag_prefix}-node"           images/node ) &
 
   for i in `jobs -p`; do wait $i; done
 }

Diff for: images/builder/docker/docker-builder/Dockerfile

@@ -10,7 +10,7 @@
 #
 # The standard name for this image is openshift/origin-docker-builder
 #
-FROM openshift/origin-control-plane
+FROM openshift/origin-cli
 
 RUN INSTALL_PKGS=" \
       which tar wget hostname sysvinit-tools util-linux \

Diff for: images/deployer/Dockerfile

@@ -10,7 +10,7 @@
 #
 # The standard name for this image is openshift/origin-deployer
 #
-FROM openshift/origin-control-plane
+FROM openshift/origin-cli
 
 LABEL io.k8s.display-name="OpenShift Origin Deployer" \
       io.k8s.description="This is a component of OpenShift Origin and executes the user deployment process to roll out new containers. It may be used as a base image for building your own custom deployer image." \

Diff for: origin.spec

@@ -298,15 +298,19 @@ for cmd in \
     openshift-git-clone \
     openshift-manage-dockerfile \
     openshift-extract-image-content \
+    kubectl
+do
+    ln -s oc %{buildroot}%{_bindir}/$cmd
+done
+
+for cmd in \
     openshift-f5-router \
     openshift-recycle \
     openshift-router
 do
     ln -s openshift %{buildroot}%{_bindir}/$cmd
 done
 
-ln -s oc %{buildroot}%{_bindir}/kubectl
-
 install -d -m 0755 %{buildroot}%{_sysconfdir}/origin/{master,node}
 
 # different service for origin vs aos
@@ -364,15 +368,9 @@ chmod 0744 $RPM_BUILD_ROOT/usr/sbin/%{name}-docker-excluder
 %doc README.md
 %license LICENSE
 %{_bindir}/openshift
-%{_bindir}/openshift-deploy
 %{_bindir}/openshift-f5-router
 %{_bindir}/openshift-recycle
 %{_bindir}/openshift-router
-%{_bindir}/openshift-docker-build
-%{_bindir}/openshift-sti-build
-%{_bindir}/openshift-git-clone
-%{_bindir}/openshift-extract-image-content
-%{_bindir}/openshift-manage-dockerfile
 %{_sharedstatedir}/origin
 %{_sysconfdir}/bash_completion.d/openshift
 %defattr(-,root,root,0700)
@@ -420,6 +418,12 @@ chmod 0744 $RPM_BUILD_ROOT/usr/sbin/%{name}-docker-excluder
 %{_bindir}/oc
 %{_bindir}/kubectl
 %{_bindir}/oadm
+%{_bindir}/openshift-deploy
+%{_bindir}/openshift-docker-build
+%{_bindir}/openshift-sti-build
+%{_bindir}/openshift-git-clone
+%{_bindir}/openshift-extract-image-content
+%{_bindir}/openshift-manage-dockerfile
 %{_sysconfdir}/bash_completion.d/oc
 %{_mandir}/man1/oc*
 

Diff for: pkg/cmd/openshift/openshift.go

@@ -16,8 +16,6 @@ import (
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
 	"github.com/openshift/origin/pkg/cmd/flagtypes"
-	"github.com/openshift/origin/pkg/cmd/infra/builder"
-	"github.com/openshift/origin/pkg/cmd/infra/deployer"
 	irouter "github.com/openshift/origin/pkg/cmd/infra/router"
 	"github.com/openshift/origin/pkg/cmd/recycle"
 	"github.com/openshift/origin/pkg/cmd/server/start"
@@ -55,20 +53,8 @@ func CommandFor(basename string, stopCh <-chan struct{}) *cobra.Command {
 		cmd = irouter.NewCommandTemplateRouter(basename)
 	case "openshift-f5-router":
 		cmd = irouter.NewCommandF5Router(basename)
-	case "openshift-deploy":
-		cmd = deployer.NewCommandDeployer(basename)
 	case "openshift-recycle":
 		cmd = recycle.NewCommandRecycle(basename, out)
-	case "openshift-sti-build":
-		cmd = builder.NewCommandS2IBuilder(basename)
-	case "openshift-docker-build":
-		cmd = builder.NewCommandDockerBuilder(basename)
-	case "openshift-git-clone":
-		cmd = builder.NewCommandGitClone(basename)
-	case "openshift-manage-dockerfile":
-		cmd = builder.NewCommandManageDockerfile(basename)
-	case "openshift-extract-image-content":
-		cmd = builder.NewCommandExtractImageContent(basename)
 	case "origin":
 		cmd = NewCommandOpenShift(basename, stopCh)
 	default:

Diff for: pkg/oc/cli/cli.go

@@ -16,6 +16,8 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/resource"
 
 	"github.com/openshift/origin/pkg/cmd/flagtypes"
+	"github.com/openshift/origin/pkg/cmd/infra/builder"
+	"github.com/openshift/origin/pkg/cmd/infra/deployer"
 	"github.com/openshift/origin/pkg/cmd/templates"
 	"github.com/openshift/origin/pkg/cmd/util/term"
 	"github.com/openshift/origin/pkg/oc/admin"
@@ -316,6 +318,18 @@ func CommandFor(basename string) *cobra.Command {
 	switch basename {
 	case "kubectl":
 		cmd = kubecmd.NewKubectlCommand(kcmdutil.NewFactory(nil), in, out, errout)
+	case "openshift-deploy":
+		cmd = deployer.NewCommandDeployer(basename)
+	case "openshift-sti-build":
+		cmd = builder.NewCommandS2IBuilder(basename)
+	case "openshift-docker-build":
+		cmd = builder.NewCommandDockerBuilder(basename)
+	case "openshift-git-clone":
+		cmd = builder.NewCommandGitClone(basename)
+	case "openshift-manage-dockerfile":
+		cmd = builder.NewCommandManageDockerfile(basename)
+	case "openshift-extract-image-content":
+		cmd = builder.NewCommandExtractImageContent(basename)
 	default:
 		// we only need this change for `oc`.  `kubectl` should behave as close to `kubectl` as we can
 		resource.OAPIToGroupified = legacygroupification.OAPIToGroupified