Switch to versioned ListOptions in client.

This commit is contained in:
Wojciech Tyczynski
2015-12-10 10:39:03 +01:00
parent 4ef062c22f
commit 960808bf08
167 changed files with 602 additions and 671 deletions

View File

@@ -429,7 +429,7 @@ func (config *KubeProxyTestConfig) setup() {
}
By("Getting node addresses")
nodeList, err := config.f.Client.Nodes().List(unversioned.ListOptions{})
nodeList, err := config.f.Client.Nodes().List(api.ListOptions{})
Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("Failed to get node list: %v", err))
config.externalAddrs = NodeAddresses(nodeList, api.NodeExternalIP)
if len(config.externalAddrs) < 2 {
@@ -457,7 +457,7 @@ func (config *KubeProxyTestConfig) setup() {
func (config *KubeProxyTestConfig) cleanup() {
nsClient := config.getNamespacesClient()
nsList, err := nsClient.List(unversioned.ListOptions{})
nsList, err := nsClient.List(api.ListOptions{})
if err == nil {
for _, ns := range nsList.Items {
if strings.Contains(ns.Name, config.f.BaseName) && ns.Name != config.f.Namespace.Name {
@@ -468,7 +468,7 @@ func (config *KubeProxyTestConfig) cleanup() {
}
func (config *KubeProxyTestConfig) createNetProxyPods(podName string, selector map[string]string) []*api.Pod {
nodes, err := config.f.Client.Nodes().List(unversioned.ListOptions{})
nodes, err := config.f.Client.Nodes().List(api.ListOptions{})
Expect(err).NotTo(HaveOccurred())
// create pods, one for each node