From 5f66d33880d2bf5e3d4e73627f255e1fc5c48de2 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Tue, 17 Jun 2014 10:50:42 -0700 Subject: [PATCH] Add load balancing support to services. --- hack/config-go.sh | 20 +------------------- pkg/registry/service_registry.go | 2 +- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/hack/config-go.sh b/hack/config-go.sh index d35fe654929..de3b43e7c09 100755 --- a/hack/config-go.sh +++ b/hack/config-go.sh @@ -40,23 +40,5 @@ KUBE_GO_PACKAGE_DIR="${GOPATH}/src/${KUBE_GO_PACKAGE}" rm "${KUBE_GO_PACKAGE_DIR}" >/dev/null 2>&1 || true ln -s "${KUBE_REPO_ROOT}" "${KUBE_GO_PACKAGE_DIR}" - - # Link in each of the third party packages - THIRD_PARTY_BASE="${KUBE_REPO_ROOT}/third_party" - source "${THIRD_PARTY_BASE}/deps.sh" - for p in ${PACKAGES}; do - PACKAGE_DIR="${GOPATH}/src/${p}" - PACKAGE_BASE=$(dirname "${PACKAGE_DIR}") - - if [ ! -d "${PACKAGE_BASE}" ]; then - mkdir -p "${PACKAGE_BASE}" - fi - - rm "${PACKAGE_DIR}" >/dev/null 2>&1 || true - ln -s "${THIRD_PARTY_BASE}/src/${p}" "${PACKAGE_DIR}" - done - - for p in ${PACKAGES}; do - go install $p - done ) +export GOPATH="${KUBE_TARGET}:${KUBE_REPO_ROOT}/third_party" diff --git a/pkg/registry/service_registry.go b/pkg/registry/service_registry.go index 43762a3170b..b69d8c14a0e 100644 --- a/pkg/registry/service_registry.go +++ b/pkg/registry/service_registry.go @@ -88,7 +88,7 @@ func (sr *ServiceRegistryStorage) Delete(id string) error { if err != nil { return err } - if svc.(api.Service).CreateExternalLoadBalancer { + if svc.(*api.Service).CreateExternalLoadBalancer { var balancer cloudprovider.TCPLoadBalancer if sr.cloud != nil { balancer, err = sr.cloud.TCPLoadBalancer()