diff --git a/hack/verify-gofmt.sh b/hack/verify-gofmt.sh index d73c0cc4426..82416baec42 100755 --- a/hack/verify-gofmt.sh +++ b/hack/verify-gofmt.sh @@ -24,7 +24,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. GO_VERSION=($(go version)) -if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.2|go1.3') ]]; then +if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.2|go1.3|go1.4') ]]; then echo "Unknown go version '${GO_VERSION}', skipping gofmt." exit 0 fi diff --git a/pkg/proxy/config/config.go b/pkg/proxy/config/config.go index fc275a08bc6..792644bc4b0 100644 --- a/pkg/proxy/config/config.go +++ b/pkg/proxy/config/config.go @@ -262,7 +262,8 @@ func (s *serviceStore) MergedState() interface{} { // watchForUpdates invokes bcaster.Notify() with the latest version of an object // when changes occur. func watchForUpdates(bcaster *config.Broadcaster, accessor config.Accessor, updates <-chan struct{}) { - for _ = range updates { + for true { + <-updates bcaster.Notify(accessor.MergedState()) } }