Rename base origin images and remove unused content

We drop openvswitch, rename node to origin-node, and remove system container support for anything except node.
openshift · Apr 7, 2018 · 1193bf7 · 1193bf7
1 parent dc7d90d
commit 1193bf7
Show file tree

Hide file tree

Showing 39 changed files with 42 additions and 874 deletions.
diff --git a/examples/atomic-registry/allinone/Dockerfile b/examples/atomic-registry/allinone/Dockerfile
@@ -1,4 +1,4 @@
-FROM openshift/origin
+FROM openshift/origin-control-plane
 MAINTAINER Aaron Weitekamp <[email protected]>
 
 ADD install.sh run.sh uninstall.sh /container/bin/

diff --git a/examples/atomic-registry/systemd/Dockerfile b/examples/atomic-registry/systemd/Dockerfile
@@ -1,5 +1,5 @@
 #FROM registry.access.redhat.com/openshift3/ose
-FROM openshift/origin
+FROM openshift/origin-control-plane
 
 LABEL name="projectatomic/atomic-registry-install" \
       vendor="Project Atomic" \

diff --git a/examples/gitserver/Dockerfile b/examples/gitserver/Dockerfile
@@ -3,7 +3,7 @@
 #
 # The standard name for this image is openshift/origin-gitserver
 #
-FROM openshift/origin
+FROM openshift/origin-control-plane
 
 COPY bin/gitserver /usr/bin/gitserver
 COPY hooks/ /var/lib/git-hooks/

diff --git a/hack/build-local-images.py b/hack/build-local-images.py
@@ -135,13 +135,6 @@
         },
         "files": {}
     },
-    "openvswitch": {
-        "directory": "openvswitch",
-        "binaries": {
-            "openshift": "/usr/bin/openshift"
-        },
-        "files": {}
-    },
     "template-service-broker": {
         "directory": "template-service-broker",
         "binaries": {

diff --git a/hack/lib/constants.sh b/hack/lib/constants.sh
@@ -306,9 +306,10 @@ readonly -f os::build::clean_windows_versioninfo
 
 # OS_ALL_IMAGES is the list of images built by os::build::images.
 readonly OS_ALL_IMAGES=(
-  origin
-  origin-base
   origin-pod
+  origin-base
+  origin-control-plane
+  origin-node
   origin-deployer
   origin-docker-builder
   origin-keepalived-ipfailover
@@ -320,9 +321,6 @@ readonly OS_ALL_IMAGES=(
   origin-egress-dns-proxy
   origin-recycler
   origin-template-service-broker
-  hello-openshift
-  openvswitch
-  node
 )
 
 # os::build::images builds all images in this repo.
@@ -349,30 +347,22 @@ function os::build::images() {
   ( os::build::image "${tag_prefix}-template-service-broker" images/template-service-broker ) &
 
   # images that depend on "${tag_prefix}-base"
-  ( os::build::image "${tag_prefix}"                    images/origin ) &
+  ( 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 ) &
   ( os::build::image "${tag_prefix}-egress-dns-proxy"   images/egress/dns-proxy ) &
 
   for i in `jobs -p`; do wait $i; done
 
-  # images that depend on "${tag_prefix}
+  # images that depend on "${tag_prefix}-control-plane
   ( os::build::image "${tag_prefix}-haproxy-router"        images/router/haproxy ) &
   ( os::build::image "${tag_prefix}-keepalived-ipfailover" images/ipfailover/keepalived ) &
   ( 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}-sti-builder"           images/builder/docker/sti-builder ) &
   ( os::build::image "${tag_prefix}-f5-router"             images/router/f5 ) &
-  ( os::build::image "openshift/node"                      images/node ) &
-
-  for i in `jobs -p`; do wait $i; done
-
-  # images that depend on "openshift/node"
-  ( os::build::image "openshift/openvswitch"               images/openvswitch ) &
-
-  # extra images (not part of infrastructure)
-  ( os::build::image "openshift/hello-openshift"           examples/hello-openshift ) &
+  ( os::build::image "${tag_prefix}-node"                  images/node ) &
 
   for i in `jobs -p`; do wait $i; done
 }

diff --git a/hack/push-release.sh b/hack/push-release.sh
@@ -70,6 +70,11 @@ if [[ "${OS_PUSH_BASE_REGISTRY-}" != "" || "${tag}" != "" ]]; then
       docker tag "openshift/${image}:${source_tag}" "${OS_PUSH_BASE_REGISTRY-}${OS_PUSH_BASE_REPO}${image}${tag}"
     done
   done
+  # TODO: remove in 3.11
+  for tag in "${tags[@]}"; do
+    docker tag "openshift/origin-control-plane:${source_tag}" "${OS_PUSH_BASE_REGISTRY-}${OS_PUSH_BASE_REPO}origin${tag}"
+    docker tag "openshift/origin-node:${source_tag}" "${OS_PUSH_BASE_REGISTRY-}${OS_PUSH_BASE_REPO}node${tag}"
+  done
 fi
 
 for image in "${images[@]}"; do
@@ -78,5 +83,14 @@ for image in "${images[@]}"; do
     docker push ${PUSH_OPTS} "${OS_PUSH_BASE_REGISTRY-}${OS_PUSH_BASE_REPO}${image}${tag}"
   done
 done
+# TODO: remove in 3.11
+for tag in "${tags[@]}"; do
+  os::log::info "Pushing ${OS_PUSH_BASE_REGISTRY-}${OS_PUSH_BASE_REPO}origin${tag}..."
+  docker push ${PUSH_OPTS} "${OS_PUSH_BASE_REGISTRY-}${OS_PUSH_BASE_REPO}origin${tag}"
+done
+for tag in "${tags[@]}"; do
+  os::log::info "Pushing ${OS_PUSH_BASE_REGISTRY-}${OS_PUSH_BASE_REPO}node${tag}..."
+  docker push ${PUSH_OPTS} "${OS_PUSH_BASE_REGISTRY-}${OS_PUSH_BASE_REPO}node${tag}"
+done
 
 ret=$?; ENDTIME=$(date +%s); echo "$0 took $(($ENDTIME - $STARTTIME)) seconds"; exit "$ret"
diff --git a/images/builder/docker/docker-builder/Dockerfile b/images/builder/docker/docker-builder/Dockerfile
@@ -10,7 +10,7 @@
 #
 # The standard name for this image is openshift/origin-docker-builder
 #
-FROM openshift/origin
+FROM openshift/origin-control-plane
 
 LABEL io.k8s.display-name="OpenShift Origin Docker Builder" \
       io.k8s.description="This is a component of OpenShift Origin and is responsible for executing Docker image builds." \

diff --git a/images/builder/docker/sti-builder/Dockerfile b/images/builder/docker/sti-builder/Dockerfile
@@ -10,7 +10,7 @@
 #
 # The standard name for this image is openshift/origin-sti-builder
 #
-FROM openshift/origin
+FROM openshift/origin-control-plane
 
 LABEL io.k8s.display-name="OpenShift Origin S2I Builder" \
       io.k8s.description="This is a component of OpenShift Origin and is responsible for executing source-to-image (s2i) image builds." \

diff --git a/images/deployer/Dockerfile b/images/deployer/Dockerfile
@@ -10,7 +10,7 @@
 #
 # The standard name for this image is openshift/origin-deployer
 #
-FROM openshift/origin
+FROM openshift/origin-control-plane
 
 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 --git a/images/ipfailover/keepalived/Dockerfile b/images/ipfailover/keepalived/Dockerfile
@@ -3,7 +3,7 @@
 #
 # ImageName: openshift/origin-keepalived-ipfailover
 #
-FROM openshift/origin
+FROM openshift/origin-control-plane
 
 RUN INSTALL_PKGS="kmod keepalived iproute psmisc nmap-ncat net-tools" && \
     yum install -y $INSTALL_PKGS && \

diff --git a/images/node/Dockerfile b/images/node/Dockerfile
@@ -1,36 +1,30 @@
 #
-# This is an OpenShift Origin node image with integrated OpenvSwitch SDN
-# If you do not require OVS SDN use the openshift/origin image instead.
+# This is an OpenShift Origin node image with integrated OpenvSwitch SDN.
 #
 # This image expects to have a volume mounted at /etc/origin/node that contains
 # a KUBECONFIG file giving the node permission to talk to the master and a
 # node configuration file.
 #
-# The standard name for this image is openshift/node
+# The standard name for this image is openshift/origin-node
 #
-FROM openshift/origin
+FROM openshift/origin-control-plane
 
 COPY scripts/* /usr/local/bin/
 COPY system-container/system-container-wrapper.sh /usr/local/bin/
 COPY system-container/manifest.json system-container/config.json.template system-container/service.template system-container/tmpfiles.template /exports/
 
-RUN INSTALL_PKGS="origin-sdn-ovs libmnl libnetfilter_conntrack conntrack-tools openvswitch \
+RUN INSTALL_PKGS="origin-sdn-ovs libmnl libnetfilter_conntrack conntrack-tools \
       libnfnetlink iptables iproute bridge-utils procps-ng ethtool socat openssl \
       binutils xz kmod-libs kmod sysvinit-tools device-mapper-libs dbus \
       iscsi-initiator-utils bind-utils" && \
     yum --enablerepo=origin-local-release install -y $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
-    yum clean all && \
-    mkdir -p /usr/lib/systemd/system/origin-node.service.d /usr/lib/systemd/system/docker.service.d
-
-# Copy the cni plugins to the host file system when they are present, so that they can be shared with cri-o
-RUN if test -e /opt/cni/bin; then mkdir -p /exports/hostfs/opt/cni/bin/ && cp -r /opt/cni/bin/* /exports/hostfs/opt/cni/bin/; fi
+    yum clean all
 
 LABEL io.k8s.display-name="OpenShift Origin Node" \
       io.k8s.description="This is a component of OpenShift Origin and contains the software for individual nodes when using SDN." \
       io.openshift.tags="openshift,node"
 
-VOLUME /etc/origin/node
 ENV KUBECONFIG=/etc/origin/node/node.kubeconfig
 
 ENTRYPOINT [ "/usr/local/bin/origin-node-run.sh" ]
diff --git a/images/node/Dockerfile.centos7 b/images/node/Dockerfile.centos7
@@ -1,36 +1,26 @@
 #
 # This is an OpenShift Origin node image with integrated OpenvSwitch SDN
-# If you do not require OVS SDN use the openshift/origin image instead.
 #
-# This image expects to have a volume mounted at /etc/origin/node that contains
-# a KUBECONFIG file giving the node permission to talk to the master and a
-# node configuration file.
+# The standard name for this image is openshift/origin-node
 #
-# The standard name for this image is openshift/node
-#
-FROM openshift/origin
+FROM openshift/origin-control-plane
 
 COPY scripts/* /usr/local/bin/
 COPY system-container/system-container-wrapper.sh /usr/local/bin/
 COPY system-container/manifest.json system-container/config.json.template system-container/service.template system-container/tmpfiles.template /exports/
 
-RUN INSTALL_PKGS="origin-sdn-ovs libmnl libnetfilter_conntrack conntrack-tools openvswitch \
+RUN INSTALL_PKGS="origin-sdn-ovs libmnl libnetfilter_conntrack conntrack-tools \
       libnfnetlink iptables iproute bridge-utils procps-ng ethtool socat openssl \
       binutils xz kmod-libs kmod sysvinit-tools device-mapper-libs dbus \
       iscsi-initiator-utils bind-utils" && \
     yum --enablerepo=origin-local-release install -y $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
-    yum clean all && \
-    mkdir -p /usr/lib/systemd/system/origin-node.service.d /usr/lib/systemd/system/docker.service.d
-
-# Copy the cni plugins to the host file system when they are present, so that they can be shared with cri-o
-RUN if test -e /opt/cni/bin; then mkdir -p /exports/hostfs/opt/cni/bin/ && cp -r /opt/cni/bin/* /exports/hostfs/opt/cni/bin/; fi
+    yum clean all
 
 LABEL io.k8s.display-name="OpenShift Origin Node" \
       io.k8s.description="This is a component of OpenShift Origin and contains the software for individual nodes when using SDN." \
       io.openshift.tags="openshift,node"
 
-VOLUME /etc/origin/node
 ENV KUBECONFIG=/etc/origin/node/node.kubeconfig
 
 ENTRYPOINT [ "/usr/local/bin/origin-node-run.sh" ]
diff --git a/images/observe/Dockerfile b/images/observe/Dockerfile
diff --git a/images/observe/OWNERS b/images/observe/OWNERS
diff --git a/images/openvswitch/.cccp.yml b/images/openvswitch/.cccp.yml
diff --git a/images/openvswitch/Dockerfile b/images/openvswitch/Dockerfile
diff --git a/images/openvswitch/OWNERS b/images/openvswitch/OWNERS
diff --git a/images/openvswitch/scripts/ovs-run.sh b/images/openvswitch/scripts/ovs-run.sh