Remove remaining cluster capacity links

Author: smarterclayton

hack/lib/constants.sh

@@ -59,7 +59,6 @@ readonly OS_GOVET_BLACKLIST=(
 	"pkg/.*/generated/internalclientset/fake/clientset_generated.go:[0-9]+: literal copies lock value from fakePtr: github.com/openshift/origin/vendor/k8s.io/client-go/testing.Fake"
 	"pkg/.*/generated/clientset/fake/clientset_generated.go:[0-9]+: literal copies lock value from fakePtr: github.com/openshift/origin/vendor/k8s.io/client-go/testing.Fake"
 	"pkg/build/vendor/github.com/docker/docker/client/hijack.go:[0-9]+: assignment copies lock value to c: crypto/tls.Config contains sync.Once contains sync.Mutex"
-	"cmd/cluster-capacity/.*"
 	"pkg/build/builder/vendor/.*"
 	"pkg/cmd/server/start/.*"
 )
@@ -170,7 +169,6 @@ function os::util::list_go_src_files() {
 		-o -wholename './openshift.local.*' \
 		-o -wholename './test/extended/testdata/bindata.go' \
 		-o -wholename '*/vendor/*' \
-		-o -wholename './cmd/cluster-capacity/*' \
 		-o -wholename './assets/bower_components/*' \
 		\) -prune \
 	\) -name '*.go' | sort -u
@@ -196,7 +194,6 @@ readonly -f os::util::list_go_src_dirs
 # os::util::list_go_deps outputs the list of dependencies for the project.
 function os::util::list_go_deps() {
   go list -f '{{.ImportPath}}{{.Imports}}' ./pkg/... ./cmd/... | tr '[]' '  ' |
-    grep -vE '^github.com/openshift/origin/cmd/(cluster-capacity)' |
     sed -e 's|github.com/openshift/origin/vendor/||g' |
     sed -e 's|github.com/openshift/origin/pkg/build/vendor/||g'
 }
@@ -324,7 +321,6 @@ readonly OS_ALL_IMAGES=(
   origin-egress-http-proxy
   origin-egress-dns-proxy
   origin-recycler
-  origin-cluster-capacity
   origin-template-service-broker
   hello-openshift
   openvswitch
@@ -351,12 +347,8 @@ function os::build::images() {
   tag_prefix="${OS_IMAGE_PREFIX:-"openshift/origin"}"
 
   # images that depend on "${tag_prefix}-source"
-  ( os::build::image "${tag_prefix}-pod"                   images/pod ) &
-  ( os::build::image "${tag_prefix}-cluster-capacity"      images/cluster-capacity ) &
-  ( os::build::image "${tag_prefix}-template-service-broker"  images/template-service-broker ) &
-
-
-  for i in `jobs -p`; do wait $i; done
+  ( os::build::image "${tag_prefix}-pod"                     images/pod ) &
+  ( 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 ) &

images/cluster-capacity/.cccp.yml

@@ -196,12 +196,6 @@ Summary: Template Service Broker
 %description template-service-broker
 %{summary}
 
-%package cluster-capacity
-Summary:        %{product_name} Cluster Capacity Analysis Tool
-
-%description cluster-capacity
-%{summary}
-
 %package excluder
 Summary:   Exclude openshift packages from updates
 BuildArch: noarch
@@ -235,7 +229,6 @@ of docker.  Exclude those versions of docker.
 # Create Binaries for all supported arches
 %{os_git_vars} OS_BUILD_RELEASE_ARCHIVES=n make build-cross
 %{os_git_vars} hack/build-go.sh vendor/github.com/onsi/ginkgo/ginkgo
-%{os_git_vars} unset GOPATH; cmd/cluster-capacity/go/src/github.com/kubernetes-incubator/cluster-capacity/hack/build-cross.sh
 %else
 # Create Binaries only for building arch
 %ifarch x86_64
@@ -255,7 +248,6 @@ of docker.  Exclude those versions of docker.
 %endif
 OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} OS_BUILD_RELEASE_ARCHIVES=n make build-cross
 OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} hack/build-go.sh vendor/github.com/onsi/ginkgo/ginkgo
-OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} unset GOPATH; cmd/cluster-capacity/go/src/github.com/kubernetes-incubator/cluster-capacity/hack/build-cross.sh
 %endif
 
 # Generate man pages
@@ -294,10 +286,6 @@ install -p -m 755 _output/local/bin/windows/amd64/oadm.exe %{buildroot}/%{_datad
 # Install federation services
 install -p -m 755 _output/local/bin/${PLATFORM}/hyperkube %{buildroot}%{_bindir}/
 
-# Install cluster capacity
-install -p -m 755 cmd/cluster-capacity/go/src/github.com/kubernetes-incubator/cluster-capacity/_output/local/bin/${PLATFORM}/hypercc %{buildroot}%{_bindir}/
-ln -s hypercc %{buildroot}%{_bindir}/cluster-capacity
-
 # Install pod
 install -p -m 755 _output/local/bin/${PLATFORM}/pod %{buildroot}%{_bindir}/
 
@@ -564,14 +552,9 @@ fi
 %files docker-excluder
 /usr/sbin/%{name}-docker-excluder
 
-%files cluster-capacity
-%{_bindir}/hypercc
-%{_bindir}/cluster-capacity
-
 %files template-service-broker
 %{_bindir}/template-service-broker
 
-
 %pretrans docker-excluder
 # we always want to clear this out using the last
 #   versions script.  Otherwise excludes might get left in