Merge pull request #20492 from erictune/labselunver

Move extensions.LabelSelector to unversioned
2016-02-04 23:17:40 -08:00
parent f932f3aea2 eba2c56566
commit d84ac764a9
32 changed files with 4424 additions and 4921 deletions
--- a/pkg/controller/node/nodecontroller_test.go
+++ b/pkg/controller/node/nodecontroller_test.go
@@ -267,7 +267,7 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) {
 						Namespace: "default",
 					},
 					Spec: extensions.DaemonSetSpec{
-						Selector: &extensions.LabelSelector{
+						Selector: &unversioned.LabelSelector{
 							MatchLabels: map[string]string{"daemon": "yes"},
 						},
 					},