DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update gce node return types

Browse source
This commit is contained in:
Manuel de Brito Fontes 2016-08-10 15:00:16 -04:00
parent e91c23ff2d
commit d43021b3f1
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/gce/controller/controller.go
View file

@ -464,7 +464,7 @@ func (lbc *LoadBalancerController) getReadyNodeNames() ([]string, error) {
if err != nil { if err != nil {
return nodeNames, err return nodeNames, err
} }
for _, n := range nodes.Items { for _, n := range nodes {
if n.Spec.Unschedulable { if n.Spec.Unschedulable {
continue continue
} }

4
controllers/gce/controller/controller_test.go
View file

@ -31,9 +31,9 @@ import (
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient"
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/pkg/util/intstr"
"k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/sets"
"k8s.io/kubernetes/pkg/util/uuid"
) )
const testClusterName = "testcluster" const testClusterName = "testcluster"
@ -94,7 +94,7 @@ func toIngressRules(hostRules map[string]utils.FakeIngressRuleValueMap) []extens
func newIngress(hostRules map[string]utils.FakeIngressRuleValueMap) *extensions.Ingress { func newIngress(hostRules map[string]utils.FakeIngressRuleValueMap) *extensions.Ingress {
return &extensions.Ingress{ return &extensions.Ingress{
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Name: fmt.Sprintf("%v", util.NewUUID()), Name: fmt.Sprintf("%v", uuid.NewUUID()),
Namespace: api.NamespaceNone, Namespace: api.NamespaceNone,
}, },
Spec: extensions.IngressSpec{ Spec: extensions.IngressSpec{

6
controllers/gce/controller/utils.go
View file

@ -358,7 +358,7 @@ func (t *GCETranslator) toNodePorts(ings *extensions.IngressList) []int64 {
return knownPorts return knownPorts
} }
func getZone(n api.Node) string { func getZone(n *api.Node) string {
zone, ok := n.Labels[zoneKey] zone, ok := n.Labels[zoneKey]
if !ok { if !ok {
return defaultZone return defaultZone
@ -372,7 +372,7 @@ func (t *GCETranslator) GetZoneForNode(name string) (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
for _, n := range nodes.Items { for _, n := range nodes {
if n.Name == name { if n.Name == name {
// TODO: Make this more resilient to label changes by listing // TODO: Make this more resilient to label changes by listing
// cloud nodes and figuring out zone. // cloud nodes and figuring out zone.
@ -389,7 +389,7 @@ func (t *GCETranslator) ListZones() ([]string, error) {
if err != nil { if err != nil {
return zones.List(), err return zones.List(), err
} }
for _, n := range readyNodes.Items { for _, n := range readyNodes {
zones.Insert(getZone(n)) zones.Insert(getZone(n))
} }
return zones.List(), nil return zones.List(), nil