Merge pull request #63744 from krmayankk/changelog

Automatic merge from submit-queue (batch tested with PRs 63580, 63744, 64541, 64502, 64100). 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>.

remove redundant getKey functions from controller tests

```release-note
None
```
This commit is contained in:
Kubernetes Submit Queue
2018-06-20 01:27:32 -07:00
committed by GitHub
9 changed files with 81 additions and 77 deletions

View File

@@ -84,15 +84,6 @@ var (
}}
)
func getKey(ds *apps.DaemonSet, t *testing.T) string {
key, err := controller.KeyFunc(ds)
if err != nil {
t.Errorf("Unexpected error getting key for ds %v: %v", ds.Name, err)
}
return key
}
func newDaemonSet(name string) *apps.DaemonSet {
two := int32(2)
return &apps.DaemonSet{