Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move global func into NodeController #5231

Merged
merged 1 commit into from
Mar 10, 2015
Merged

Move global func into NodeController #5231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 3 additions & 6 deletions pkg/cloudprovider/controller/nodecontroller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ var (
ErrCloudInstance = errors.New("cloud provider doesn't support instances.")
)

var (
// aliased to allow mocking in tests
lookupIP = net.LookupIP
)

type NodeController struct {
cloud cloudprovider.Interface
matchRE string
Expand All @@ -54,6 +49,7 @@ type NodeController struct {
kubeletClient client.KubeletHealthChecker
registerRetryCount int
podEvictionTimeout time.Duration
lookupIP func(host string) ([]net.IP, error)
}

// NewNodeController returns a new node controller to sync instances from cloudprovider.
Expand All @@ -77,6 +73,7 @@ func NewNodeController(
kubeletClient: kubeletClient,
registerRetryCount: registerRetryCount,
podEvictionTimeout: podEvictionTimeout,
lookupIP: net.LookupIP,
}
}

Expand Down Expand Up @@ -289,7 +286,7 @@ func (s *NodeController) PopulateAddresses(nodes *api.NodeList) (*api.NodeList,
address := api.NodeAddress{Type: api.NodeLegacyHostIP, Address: addr.String()}
api.AddToNodeAddresses(&node.Status.Addresses, address)
} else {
addrs, err := lookupIP(node.Name)
addrs, err := s.lookupIP(node.Name)
if err != nil {
glog.Errorf("Can't get ip address of node %s: %v", node.Name, err)
} else if len(addrs) == 0 {
Expand Down
12 changes: 6 additions & 6 deletions pkg/cloudprovider/controller/nodecontroller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,6 @@ type FakeNodeHandler struct {
RequestCount int
}

func init() {
lookupIP = func(host string) ([]net.IP, error) {
return nil, fmt.Errorf("lookup %v: no such host", host)
}
}

func (c *FakeNodeHandler) Nodes() client.NodeInterface {
return c
}
Expand Down Expand Up @@ -720,6 +714,9 @@ func TestSyncNodeStatusTransitionTime(t *testing.T) {

for _, item := range table {
nodeController := NewNodeController(nil, "", []string{"node0"}, nil, item.fakeNodeHandler, item.fakeKubeletClient, 10, time.Minute)
nodeController.lookupIP = func(host string) ([]net.IP, error) {
return nil, fmt.Errorf("lookup %v: no such host", host)
}
if err := nodeController.SyncNodeStatus(); err != nil {
t.Errorf("unexpected error: %v", err)
}
Expand Down Expand Up @@ -991,6 +988,9 @@ func TestSyncNodeStatusDeletePods(t *testing.T) {

for _, item := range table {
nodeController := NewNodeController(nil, "", []string{"node0"}, nil, item.fakeNodeHandler, item.fakeKubeletClient, 10, 5*time.Minute)
nodeController.lookupIP = func(host string) ([]net.IP, error) {
return nil, fmt.Errorf("lookup %v: no such host", host)
}
if err := nodeController.SyncNodeStatus(); err != nil {
t.Errorf("unexpected error: %v", err)
}
Expand Down