Merge pull request #14090 from yujuhong/node_status

pkg/kubelet/fake_node_manager.go

+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kubelet
+
+import (
+	"net"
+
+	"k8s.io/kubernetes/pkg/api"
+)
+
+type fakeNodeManager struct {
+	podCIDR string
+	node    *api.Node
+	IP      net.IP
+}
+
+var _ nodeManager = &fakeNodeManager{}
+
+func (f *fakeNodeManager) Start() {
+}
+
+func (f *fakeNodeManager) GetNode() (*api.Node, error) {
+	return f.node, nil
+}
+
+func (f *fakeNodeManager) GetHostIP() (net.IP, error) {
+	return f.IP, nil
+}
+
+func (f *fakeNodeManager) GetPodCIDR() string {
+	return f.podCIDR
+}

pkg/kubelet/runonce_test.go

@@ -83,11 +83,11 @@ func TestRunOnce(t *testing.T) {
 		rootDirectory:       "/tmp/kubelet",
 		recorder:            &record.FakeRecorder{},
 		cadvisor:            cadvisor,
-		nodeLister:          testNodeLister{},
 		statusManager:       status.NewManager(nil),
 		containerRefManager: kubecontainer.NewRefManager(),
 		readinessManager:    kubecontainer.NewReadinessManager(),
 		podManager:          podManager,
+		nodeManager:         &fakeNodeManager{},
 		os:                  kubecontainer.FakeOS{},
 		volumeManager:       newVolumeManager(),
 		diskSpaceManager:    diskSpaceManager,

pkg/kubelet/server.go

@@ -95,7 +95,7 @@ type HostInterface interface {
 	GetContainerInfo(podFullName string, uid types.UID, containerName string, req *cadvisorApi.ContainerInfoRequest) (*cadvisorApi.ContainerInfo, error)
 	GetContainerRuntimeVersion() (kubecontainer.Version, error)
 	GetRawContainerInfo(containerName string, req *cadvisorApi.ContainerInfoRequest, subcontainers bool) (map[string]*cadvisorApi.ContainerInfo, error)
-	GetCachedMachineInfo() (*cadvisorApi.MachineInfo, error)
+	GetMachineInfo() (*cadvisorApi.MachineInfo, error)
 	GetPods() []*api.Pod
 	GetRunningPods() ([]*api.Pod, error)
 	GetPodByName(namespace, name string) (*api.Pod, bool)
@@ -407,7 +407,7 @@ func (s *Server) getLogs(request *restful.Request, response *restful.Response) {
 
 // getSpec handles spec requests against the Kubelet.
 func (s *Server) getSpec(request *restful.Request, response *restful.Response) {
-	info, err := s.host.GetCachedMachineInfo()
+	info, err := s.host.GetMachineInfo()
 	if err != nil {
 		response.WriteError(http.StatusInternalServerError, err)
 		return

pkg/kubelet/server_test.go

@@ -85,7 +85,7 @@ func (fk *fakeKubelet) GetContainerRuntimeVersion() (kubecontainer.Version, erro
 	return fk.containerVersionFunc()
 }
 
-func (fk *fakeKubelet) GetCachedMachineInfo() (*cadvisorApi.MachineInfo, error) {
+func (fk *fakeKubelet) GetMachineInfo() (*cadvisorApi.MachineInfo, error) {
 	return fk.machineInfoFunc()
 }