Merge remote-tracking branch 'origin/master' into release-1.11

Kubernetes-commit: 6c7f566c355620c8f664adb8123586a8a92b4500
This commit is contained in:
Kubernetes Publisher
2018-05-23 01:35:44 -04:00
190 changed files with 14719 additions and 1534 deletions
@@ -60,7 +60,7 @@ func (c *FakeClusterTestTypes) List(opts v1.ListOptions) (result *example_v1.Clu
if label == nil {
label = labels.Everything()
}
list := &example_v1.ClusterTestTypeList{}
list := &example_v1.ClusterTestTypeList{ListMeta: obj.(*example_v1.ClusterTestTypeList).ListMeta}
for _, item := range obj.(*example_v1.ClusterTestTypeList).Items {
if label.Matches(labels.Set(item.Labels)) {
list.Items = append(list.Items, item)
@@ -62,7 +62,7 @@ func (c *FakeTestTypes) List(opts v1.ListOptions) (result *example_v1.TestTypeLi
if label == nil {
label = labels.Everything()
}
list := &example_v1.TestTypeList{}
list := &example_v1.TestTypeList{ListMeta: obj.(*example_v1.TestTypeList).ListMeta}
for _, item := range obj.(*example_v1.TestTypeList).Items {
if label.Matches(labels.Set(item.Labels)) {
list.Items = append(list.Items, item)
@@ -62,7 +62,7 @@ func (c *FakeTestTypes) List(opts v1.ListOptions) (result *example2_v1.TestTypeL
if label == nil {
label = labels.Everything()
}
list := &example2_v1.TestTypeList{}
list := &example2_v1.TestTypeList{ListMeta: obj.(*example2_v1.TestTypeList).ListMeta}
for _, item := range obj.(*example2_v1.TestTypeList).Items {
if label.Matches(labels.Set(item.Labels)) {
list.Items = append(list.Items, item)