Remove federation from origin

Author: smarterclayton

hack/lib/constants.sh

@@ -106,8 +106,6 @@ readonly OS_BINARY_RELEASE_CLIENT_EXTRA=(
 function os::build::get_product_vars() {
   export OS_BUILD_LDFLAGS_IMAGE_PREFIX="${OS_IMAGE_PREFIX:-"openshift/origin"}"
   export OS_BUILD_LDFLAGS_DEFAULT_IMAGE_STREAMS="${OS_BUILD_LDFLAGS_DEFAULT_IMAGE_STREAMS:-"centos7"}"
-  export OS_BUILD_LDFLAGS_FEDERATION_SERVER_IMAGE_NAME="${OS_BUILD_LDFLAGS_FEDERATION_SERVER_IMAGE_NAME:-"${OS_BUILD_LDFLAGS_IMAGE_PREFIX}-federation"}"
-  export OS_BUILD_LDFLAGS_FEDERATION_ETCD_IMAGE="${OS_BUILD_LDFLAGS_FEDERATION_ETCD_IMAGE:-"quay.io/coreos/etcd:v3.1.7"}"
 }
 
 # os::build::ldflags calculates the -ldflags argument for building OpenShift
@@ -354,11 +352,10 @@ 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}-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 ) &
-  ( os::build::image "${tag_prefix}-federation"            images/federation ) &
+  ( os::build::image "${tag_prefix}"                    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/federation/Dockerfile

@@ -184,11 +184,6 @@ Obsoletes:        openshift-sdn-ovs < %{package_refector_version}
 %description sdn-ovs
 %{summary}
 
-%package federation-services
-Summary:        %{produce_name} Federation Services
-
-%description federation-services
-
 %package template-service-broker
 Summary: Template Service Broker
 %description template-service-broker
@@ -258,7 +253,7 @@ PLATFORM="$(go env GOHOSTOS)/$(go env GOHOSTARCH)"
 install -d %{buildroot}%{_bindir}
 
 # Install linux components
-for bin in oc oadm openshift hypershift template-service-broker
+for bin in oc oadm openshift hypershift hyperkube template-service-broker
 do
   echo "+++ INSTALLING ${bin}"
   install -p -m 755 _output/local/bin/${PLATFORM}/${bin} %{buildroot}%{_bindir}/${bin}
@@ -281,9 +276,6 @@ install -p -m 755 _output/local/bin/darwin/amd64/oadm %{buildroot}/%{_datadir}/%
 install -p -m 755 _output/local/bin/windows/amd64/oadm.exe %{buildroot}/%{_datadir}/%{name}/windows/oadm.exe
 %endif
 
-# Install federation services
-install -p -m 755 _output/local/bin/${PLATFORM}/hyperkube %{buildroot}%{_bindir}/
-
 # Install pod
 install -p -m 755 _output/local/bin/${PLATFORM}/pod %{buildroot}%{_bindir}/
 
@@ -300,8 +292,7 @@ for cmd in \
     openshift-extract-image-content \
     openshift-f5-router \
     openshift-recycle \
-    openshift-router \
-    origin
+    openshift-router
 do
     ln -s openshift %{buildroot}%{_bindir}/$cmd
 done
@@ -476,7 +467,4 @@ if [ "$1" -eq 0 ] ; then
   /usr/sbin/%{name}-docker-excluder unexclude
 fi
 
-%files federation-services
-%{_bindir}/hyperkube
-
 %changelog