github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #149 from brendandburns/lb

Browse Source 
Fix a couple of problems with the lb merge.
This commit is contained in:
brendandburns 2014-06-17 21:35:39 -07:00
commit f57ae2f4bf
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hack/config-go.sh
View File

@ -40,23 +40,5 @@ KUBE_GO_PACKAGE_DIR="${GOPATH}/src/${KUBE_GO_PACKAGE}"
rm "${KUBE_GO_PACKAGE_DIR}" >/dev/null 2>&1 || true rm "${KUBE_GO_PACKAGE_DIR}" >/dev/null 2>&1 || true
ln -s "${KUBE_REPO_ROOT}" "${KUBE_GO_PACKAGE_DIR}" 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"

2
pkg/registry/service_registry.go
View File

@ -88,7 +88,7 @@ func (sr *ServiceRegistryStorage) Delete(id string) error {
if err != nil { if err != nil {
return err return err
} }
if svc.(api.Service).CreateExternalLoadBalancer { if svc.(*api.Service).CreateExternalLoadBalancer {
var balancer cloudprovider.TCPLoadBalancer var balancer cloudprovider.TCPLoadBalancer
if sr.cloud != nil { if sr.cloud != nil {
balancer, err = sr.cloud.TCPLoadBalancer() balancer, err = sr.cloud.TCPLoadBalancer()