Create a new origin-cli image and reparent control-plane

hack/lib/constants.sh

@@ -310,6 +310,7 @@ readonly -f os::build::clean_windows_versioninfo
 readonly OS_ALL_IMAGES=(
   origin-pod
   origin-base
+  origin-cli
   origin-control-plane
   origin-node
   origin-deployer
@@ -343,8 +344,9 @@ function os::build::images() {
   # images that depend on "${tag_prefix}-source"
   ( os::build::image "${tag_prefix}-pod"                     images/pod ) &
   ( os::build::image "${tag_prefix}-template-service-broker" images/template-service-broker ) &
+  ( os::build::image "${tag_prefix}-cli"                     images/cli ) &
 
-  # images that depend on "${tag_prefix}-base"
+  # images that depend on "${tag_prefix}-base" or "${tag_prefix}-cli"
   ( os::build::image "${tag_prefix}-control-plane"      images/origin ) &
   ( os::build::image "${tag_prefix}-egress-router"      images/egress/router ) &
   ( os::build::image "${tag_prefix}-egress-http-proxy"  images/egress/http-proxy ) &

images/cli/.cccp.yml

@@ -0,0 +1 @@
+job-id: origin-cli

images/cli/Dockerfile

@@ -0,0 +1,16 @@
+#
+# This is the official OpenShift CLI image. It can be used to get a CLI environment
+# for OpenShift.
+#
+# The standard name for this image is openshift/origin-cli
+#
+FROM openshift/origin-base
+
+RUN INSTALL_PKGS="origin-clients" && \
+    yum --enablerepo=origin-local-release install -y ${INSTALL_PKGS} && \
+    rpm -V ${INSTALL_PKGS} && \
+    yum clean all
+
+LABEL io.k8s.display-name="OpenShift Client" \
+      io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
+      io.openshift.tags="openshift,cli"

images/cli/OWNERS

@@ -0,0 +1,8 @@
+reviewers:
+  - smarterclayton
+  - stevekuznetsov
+  - sdodson
+approvers:
+  - smarterclayton
+  - kargakis
+  - stevekuznetsov

images/cli/bin/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

images/origin/Dockerfile

@@ -1,19 +1,19 @@
 #
-# This is the official OpenShift Origin image. It has as its entrypoint the OpenShift
+# This is the official OpenShift image. It has as its entrypoint the OpenShift
 # all-in-one binary.
 #
 # The standard name for this image is openshift/origin-control-plane
 #
-FROM openshift/origin-base
+FROM openshift/origin-cli
 
 RUN INSTALL_PKGS="origin" && \
     yum --enablerepo=origin-local-release install -y ${INSTALL_PKGS} && \
     rpm -V ${INSTALL_PKGS} && \
     yum clean all && \
     setcap 'cap_net_bind_service=ep' /usr/bin/openshift
 
-LABEL io.k8s.display-name="OpenShift Origin Application Platform" \
-      io.k8s.description="OpenShift Origin is a platform for developing, building, and deploying containerized applications." \
+LABEL io.k8s.display-name="OpenShift Application Platform" \
+      io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
       io.openshift.tags="openshift,core"
 
 ENV HOME=/root \