diff --git a/controllers/gce/controller/controller.go b/controllers/gce/controller/controller.go index 62ace16d1..0bcea2e81 100644 --- a/controllers/gce/controller/controller.go +++ b/controllers/gce/controller/controller.go @@ -464,7 +464,7 @@ func (lbc *LoadBalancerController) getReadyNodeNames() ([]string, error) { if err != nil { return nodeNames, err } - for _, n := range nodes.Items { + for _, n := range nodes { if n.Spec.Unschedulable { continue } diff --git a/controllers/gce/controller/controller_test.go b/controllers/gce/controller/controller_test.go index 8fa636dcc..051c0c841 100644 --- a/controllers/gce/controller/controller_test.go +++ b/controllers/gce/controller/controller_test.go @@ -31,9 +31,9 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/restclient" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/pkg/util/sets" + "k8s.io/kubernetes/pkg/util/uuid" ) const testClusterName = "testcluster" @@ -94,7 +94,7 @@ func toIngressRules(hostRules map[string]utils.FakeIngressRuleValueMap) []extens func newIngress(hostRules map[string]utils.FakeIngressRuleValueMap) *extensions.Ingress { return &extensions.Ingress{ ObjectMeta: api.ObjectMeta{ - Name: fmt.Sprintf("%v", util.NewUUID()), + Name: fmt.Sprintf("%v", uuid.NewUUID()), Namespace: api.NamespaceNone, }, Spec: extensions.IngressSpec{ diff --git a/controllers/gce/controller/utils.go b/controllers/gce/controller/utils.go index 24dc97137..aff5040be 100644 --- a/controllers/gce/controller/utils.go +++ b/controllers/gce/controller/utils.go @@ -358,7 +358,7 @@ func (t *GCETranslator) toNodePorts(ings *extensions.IngressList) []int64 { return knownPorts } -func getZone(n api.Node) string { +func getZone(n *api.Node) string { zone, ok := n.Labels[zoneKey] if !ok { return defaultZone @@ -372,7 +372,7 @@ func (t *GCETranslator) GetZoneForNode(name string) (string, error) { if err != nil { return "", err } - for _, n := range nodes.Items { + for _, n := range nodes { if n.Name == name { // TODO: Make this more resilient to label changes by listing // cloud nodes and figuring out zone. @@ -389,7 +389,7 @@ func (t *GCETranslator) ListZones() ([]string, error) { if err != nil { return zones.List(), err } - for _, n := range readyNodes.Items { + for _, n := range readyNodes { zones.Insert(getZone(n)) } return zones.List(), nil