From 7ac0cf903464e7dcb1a0689dec662c90f301c447 Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Wed, 25 Apr 2018 11:02:43 -0400
Subject: [PATCH] Create a new origin-cli image and reparent control-plane

---
 hack/lib/constants.sh            |  4 +++-
 images/cli/.cccp.yml             |  1 +
 images/cli/Dockerfile            | 16 ++++++++++++++++
 images/cli/OWNERS                |  8 ++++++++
 images/cli/bin/.gitignore        |  2 ++
 images/origin/Dockerfile         |  8 ++++----
 images/origin/Dockerfile.centos7 | 25 -------------------------
 7 files changed, 34 insertions(+), 30 deletions(-)
 create mode 100644 images/cli/.cccp.yml
 create mode 100644 images/cli/Dockerfile
 create mode 100644 images/cli/OWNERS
 create mode 100644 images/cli/bin/.gitignore
 delete mode 100644 images/origin/Dockerfile.centos7

diff --git a/hack/lib/constants.sh b/hack/lib/constants.sh
index 69f1803118dc..daa0a5d17f1b 100755
--- a/hack/lib/constants.sh
+++ b/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 ) &
diff --git a/images/cli/.cccp.yml b/images/cli/.cccp.yml
new file mode 100644
index 000000000000..e64764f3c7b0
--- /dev/null
+++ b/images/cli/.cccp.yml
@@ -0,0 +1 @@
+job-id: origin-cli
diff --git a/images/cli/Dockerfile b/images/cli/Dockerfile
new file mode 100644
index 000000000000..24e4a86bc959
--- /dev/null
+++ b/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"
diff --git a/images/cli/OWNERS b/images/cli/OWNERS
new file mode 100644
index 000000000000..ef253fe96db0
--- /dev/null
+++ b/images/cli/OWNERS
@@ -0,0 +1,8 @@
+reviewers:
+  - smarterclayton
+  - stevekuznetsov
+  - sdodson
+approvers:
+  - smarterclayton
+  - kargakis
+  - stevekuznetsov
diff --git a/images/cli/bin/.gitignore b/images/cli/bin/.gitignore
new file mode 100644
index 000000000000..d6b7ef32c847
--- /dev/null
+++ b/images/cli/bin/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/images/origin/Dockerfile b/images/origin/Dockerfile
index 1dd70d7c1c99..61690100aa05 100644
--- a/images/origin/Dockerfile
+++ b/images/origin/Dockerfile
@@ -1,10 +1,10 @@
 #
-# 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} && \
@@ -12,8 +12,8 @@ RUN INSTALL_PKGS="origin" && \
     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 \
diff --git a/images/origin/Dockerfile.centos7 b/images/origin/Dockerfile.centos7
deleted file mode 100644
index 1dd70d7c1c99..000000000000
--- a/images/origin/Dockerfile.centos7
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# This is the official OpenShift Origin 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
-
-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." \
-      io.openshift.tags="openshift,core"
-
-ENV HOME=/root \
-    KUBECONFIG=/var/lib/origin/openshift.local.config/master/admin.kubeconfig
-
-WORKDIR /var/lib/origin
-EXPOSE 8443 53
-
-ENTRYPOINT ["/usr/bin/openshift"]