Merge pull request #61894 from atlassian/misc-cleanups

Automatic merge from submit-queue (batch tested with PRs 61894, 61369). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Use range in loops; misc fixes

**What this PR does / why we need it**:
It is cleaner to use `range` in for loops to iterate over channel until it is closed.

**Release note**:
```release-note
NONE
```
/kind cleanup

Kubernetes-commit: 7ce753aa73a42d8a8696659e345e173d15cce622
This commit is contained in:
Kubernetes Publisher
2018-03-30 21:16:01 -07:00
2 changed files with 581 additions and 585 deletions

164
Godeps/Godeps.json generated
View File

@@ -248,331 +248,331 @@
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/apps/v1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/events/v1beta1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/storage/v1alpha1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
"Rev": "7256b11ddc89ab4b3be85518884e17d1534eb93e"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "210bcde8e5a7715fe776460ca1df1a3f2738725e"
"Rev": "b1fd01e100ba294ab4a44353d193c0d199f4d3b9"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",

View File

@@ -225,11 +225,7 @@ func (eventBroadcaster *eventBroadcasterImpl) StartEventWatcher(eventHandler fun
watcher := eventBroadcaster.Watch()
go func() {
defer utilruntime.HandleCrash()
for {
watchEvent, open := <-watcher.ResultChan()
if !open {
return
}
for watchEvent := range watcher.ResultChan() {
event, ok := watchEvent.Object.(*v1.Event)
if !ok {
// This is all local, so there's no reason this should