Switch to versioned ListOptions in client.

test/e2e/load.go

@@ -23,7 +23,7 @@ import (
 	"sync"
 	"time"
 
-	"k8s.io/kubernetes/pkg/api/unversioned"
+	"k8s.io/kubernetes/pkg/api"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/labels"
 
@@ -72,7 +72,7 @@ var _ = Describe("Load capacity [Skipped]", func() {
 	BeforeEach(func() {
 		c = framework.Client
 		ns = framework.Namespace.Name
-		nodes, err := c.Nodes().List(unversioned.ListOptions{})
+		nodes, err := c.Nodes().List(api.ListOptions{})
 		expectNoError(err)
 		nodeCount = len(nodes.Items)
 		Expect(nodeCount).NotTo(BeZero())
@@ -214,8 +214,8 @@ func scaleRC(wg *sync.WaitGroup, config *RCConfig) {
 	expectNoError(ScaleRC(config.Client, config.Namespace, config.Name, newSize, true),
 		fmt.Sprintf("scaling rc %s for the first time", config.Name))
 	selector := labels.SelectorFromSet(labels.Set(map[string]string{"name": config.Name}))
-	options := unversioned.ListOptions{
-		LabelSelector:   unversioned.LabelSelector{selector},
+	options := api.ListOptions{
+		LabelSelector:   selector,
 		ResourceVersion: "0",
 	}
 	_, err := config.Client.Pods(config.Namespace).List(options)