Add node resource backend (#860)

Author: maciaszczykm

src/app/backend/handler/apihandler.go

@@ -30,6 +30,7 @@ import (
 	"github.com/kubernetes/dashboard/resource/deployment"
 	"github.com/kubernetes/dashboard/resource/job"
 	. "github.com/kubernetes/dashboard/resource/namespace"
+	"github.com/kubernetes/dashboard/resource/node"
 	"github.com/kubernetes/dashboard/resource/petset"
 	"github.com/kubernetes/dashboard/resource/pod"
 	"github.com/kubernetes/dashboard/resource/replicaset"
@@ -293,6 +294,15 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient,
 			To(apiHandler.handleGetPetSetDetail).
 			Writes(petset.PetSetDetail{}))
 
+	apiV1Ws.Route(
+		apiV1Ws.GET("/node").
+			To(apiHandler.handleGetNodeList).
+			Writes(node.NodeList{}))
+	apiV1Ws.Route(
+		apiV1Ws.GET("/node/{name}").
+			To(apiHandler.handleGetNodeDetail).
+			Writes(node.NodeDetail{}))
+
 	apiV1Ws.Route(
 		apiV1Ws.DELETE("/{kind}/namespace/{namespace}/name/{name}").
 			To(apiHandler.handleDeleteResource))
@@ -357,6 +367,28 @@ func (apiHandler *ApiHandler) handleGetServiceDetail(request *restful.Request, r
 	response.WriteHeaderAndEntity(http.StatusCreated, result)
 }
 
+// Handles get node list API call.
+func (apiHandler *ApiHandler) handleGetNodeList(request *restful.Request, response *restful.Response) {
+	result, err := node.GetNodeList(apiHandler.client)
+	if err != nil {
+		handleInternalError(response, err)
+		return
+	}
+
+	response.WriteHeaderAndEntity(http.StatusCreated, result)
+}
+
+// Handles get node detail API call.
+func (apiHandler *ApiHandler) handleGetNodeDetail(request *restful.Request, response *restful.Response) {
+	name := request.PathParameter("name")
+	result, err := node.GetNodeDetail(apiHandler.client, apiHandler.heapsterClient, name)
+	if err != nil {
+		handleInternalError(response, err)
+		return
+	}
+	response.WriteHeaderAndEntity(http.StatusCreated, result)
+}
+
 // Handles deploy API call.
 func (apiHandler *ApiHandler) handleDeploy(request *restful.Request, response *restful.Response) {
 	appDeploymentSpec := new(AppDeploymentSpec)

src/app/backend/resource/common/endpoint.go

@@ -18,8 +18,6 @@ import (
 	"bytes"
 
 	"k8s.io/kubernetes/pkg/api"
-
-	"github.com/kubernetes/dashboard/resource/node"
 )
 
 // Endpoint describes an endpoint that is host and a list of available ports for that host.
@@ -85,7 +83,7 @@ func getNodePortEndpoints(pods []api.Pod, service api.Service, nodes []api.Node)
 	var addresses []api.NodeAddress
 
 	for _, pod := range pods {
-		node := node.GetNodeByName(nodes, pod.Spec.NodeName)
+		node := GetNodeByName(nodes, pod.Spec.NodeName)
 		if node == nil {
 			continue
 		}
@@ -157,3 +155,14 @@ func getUniqueExternalAddresses(addresses []api.NodeAddress) []api.NodeAddress {
 
 	return result
 }
+
+// GetNodeByName returns the node with the given name from the list
+func GetNodeByName(nodes []api.Node, nodeName string) *api.Node {
+	for _, node := range nodes {
+		if node.ObjectMeta.Name == nodeName {
+			return &node
+		}
+	}
+
+	return nil
+}

src/app/backend/resource/common/resourcechannels.go

@@ -108,22 +108,14 @@ type NodeListChannel struct {
 
 // GetNodeListChannel returns a pair of channels to a Node list and errors that both must be read
 // numReads times.
-func GetNodeListChannel(client client.NodesInterface,
-	nsQuery *NamespaceQuery, numReads int) NodeListChannel {
+func GetNodeListChannel(client client.NodesInterface, numReads int) NodeListChannel {
 	channel := NodeListChannel{
 		List:  make(chan *api.NodeList, numReads),
 		Error: make(chan error, numReads),
 	}
 
 	go func() {
 		list, err := client.Nodes().List(listEverything)
-		var filteredItems []api.Node
-		for _, item := range list.Items {
-			if nsQuery.Matches(item.ObjectMeta.Namespace) {
-				filteredItems = append(filteredItems, item)
-			}
-		}
-		list.Items = filteredItems
 		for i := 0; i < numReads; i++ {
 			channel.List <- list
 			channel.Error <- err

src/app/backend/resource/common/types.go

@@ -97,6 +97,7 @@ const (
 	ResourceKindDaemonSet             = "daemonset"
 	ResourceKindJob                   = "job"
 	ResourceKindPetSet                = "petset"
+	ResourceKindNode                  = "node"
 )
 
 // ClientType represents type of client that is used to perform generic operations on resources.
@@ -131,6 +132,7 @@ var kindToAPIMapping = map[string]struct {
 	ResourceKindDaemonSet:             {"daemonsets", ClientTypeDefault},
 	ResourceKindPetSet:                {"petsets", ClientTypeAppsClient},
 	ResourceKindJob:                   {"jobs", ClientTypeBatchClient},
+	ResourceKindNode:                  {"nodes", ClientTypeDefault},
 }
 
 // IsSelectorMatching returns true when an object with the given

src/app/backend/resource/daemonset/daemonsetlist.go

@@ -57,7 +57,7 @@ func GetDaemonSetList(client *client.Client, nsQuery *common.NamespaceQuery) (*D
 		ServiceList:   common.GetServiceListChannel(client, nsQuery, 1),
 		PodList:       common.GetPodListChannel(client, nsQuery, 1),
 		EventList:     common.GetEventListChannel(client, nsQuery, 1),
-		NodeList:      common.GetNodeListChannel(client, nsQuery, 1),
+		NodeList:      common.GetNodeListChannel(client, 1),
 	}
 
 	return GetDaemonSetListFromChannels(channels)

src/app/backend/resource/deployment/deploymentlist.go

@@ -55,7 +55,7 @@ func GetDeploymentList(client client.Interface, nsQuery *common.NamespaceQuery)
 		ServiceList:    common.GetServiceListChannel(client, nsQuery, 1),
 		PodList:        common.GetPodListChannel(client, nsQuery, 1),
 		EventList:      common.GetEventListChannel(client, nsQuery, 1),
-		NodeList:       common.GetNodeListChannel(client, nsQuery, 1),
+		NodeList:       common.GetNodeListChannel(client, 1),
 	}
 
 	return GetDeploymentListFromChannels(channels)

src/app/backend/resource/job/joblist.go

@@ -52,7 +52,7 @@ func GetJobList(client client.Interface, nsQuery *common.NamespaceQuery) (*JobLi
 		ServiceList: common.GetServiceListChannel(client, nsQuery, 1),
 		PodList:     common.GetPodListChannel(client, nsQuery, 1),
 		EventList:   common.GetEventListChannel(client, nsQuery, 1),
-		NodeList:    common.GetNodeListChannel(client, nsQuery, 1),
+		NodeList:    common.GetNodeListChannel(client, 1),
 	}
 
 	return GetJobListFromChannels(channels)

src/app/backend/resource/node/nodecommon.go

@@ -18,13 +18,13 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 )
 
-// GetNodeByName returns the node with the given name from the list
-func GetNodeByName(nodes []api.Node, nodeName string) *api.Node {
-	for _, node := range nodes {
-		if node.ObjectMeta.Name == nodeName {
-			return &node
+//getContainerImages returns container image strings from the given node.
+func getContainerImages(node api.Node) []string {
+	var containerImages []string
+	for _, image := range node.Status.Images {
+		for _, name := range image.Names {
+			containerImages = append(containerImages, name)
 		}
 	}
-
-	return nil
+	return containerImages
 }

src/app/backend/resource/node/nodedetail.go

@@ -0,0 +1,87 @@
+// Copyright 2015 Google Inc. 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 node
+
+import (
+	"log"
+
+	"github.com/kubernetes/dashboard/client"
+	"github.com/kubernetes/dashboard/resource/common"
+	"k8s.io/kubernetes/pkg/api"
+	k8sClient "k8s.io/kubernetes/pkg/client/unversioned"
+)
+
+// NodeDetail is a presentation layer view of Kubernetes Node resource. This means it is Node plus
+// additional augmented data we can get from other sources.
+type NodeDetail struct {
+	ObjectMeta common.ObjectMeta `json:"objectMeta"`
+	TypeMeta   common.TypeMeta   `json:"typeMeta"`
+
+	// Container images of the Node.
+	ContainerImages []string `json:"containerImages"`
+
+	// External ID of the node assigned by some machine database (e.g. a cloud provider).
+	ExternalID string `json:"externalID"`
+
+	// PodCIDR represents the pod IP range assigned to the node.
+	PodCIDR string `json:"podCIDR"`
+
+	// ID of the node assigned by the cloud provider.
+	ProviderID string `json:"providerID"`
+
+	// Unschedulable controls node schedulability of new pods. By default node is schedulable.
+	Unschedulable bool `json:"unschedulable"`
+
+	// Set of ids/uuids to uniquely identify the node.
+	NodeInfo api.NodeSystemInfo `json:"nodeInfo"`
+
+	// CPU limit specified (core number).
+	CPUCapacity int64 `json:"cpuCapacity"`
+
+	// Memory limit specified (bytes).
+	MemoryCapacity int64 `json:"memoryCapacity"`
+}
+
+// GetNodeDetail gets node details.
+func GetNodeDetail(client k8sClient.Interface, heapsterClient client.HeapsterClient, name string) (
+	*NodeDetail, error) {
+	log.Printf("Getting details of %s node", name)
+
+	node, err := client.Nodes().Get(name)
+	if err != nil {
+		return nil, err
+	}
+
+	nodeDetails := toNodeDetail(*node)
+	return &nodeDetails, nil
+}
+
+func toNodeDetail(node api.Node) NodeDetail {
+	cpuCapacity, _ := node.Status.Capacity.Cpu().AsInt64()
+	memoryCapacity, _ := node.Status.Capacity.Memory().AsInt64()
+
+	return NodeDetail{
+		ObjectMeta:      common.NewObjectMeta(node.ObjectMeta),
+		TypeMeta:        common.NewTypeMeta(common.ResourceKindNode),
+		ContainerImages: getContainerImages(node),
+		ExternalID:      node.Spec.ExternalID,
+		ProviderID:      node.Spec.ProviderID,
+		PodCIDR:         node.Spec.PodCIDR,
+		Unschedulable:   node.Spec.Unschedulable,
+		NodeInfo:        node.Status.NodeInfo,
+		CPUCapacity:     cpuCapacity,
+		MemoryCapacity:  memoryCapacity,
+	}
+}

src/app/backend/resource/node/nodelist.go

@@ -0,0 +1,93 @@
+// Copyright 2015 Google Inc. 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 node
+
+import (
+	"log"
+
+	"github.com/kubernetes/dashboard/resource/common"
+	"k8s.io/kubernetes/pkg/api"
+	client "k8s.io/kubernetes/pkg/client/unversioned"
+	"k8s.io/kubernetes/pkg/fields"
+	"k8s.io/kubernetes/pkg/labels"
+)
+
+// NodeList contains a list of nodes in the cluster.
+type NodeList struct {
+	// Unordered list of Nodes.
+	Nodes []Node `json:"nodes"`
+}
+
+// Node is a presentation layer view of Kubernetes nodes. This means it is node plus additional
+// augumented data we can get from other sources.
+type Node struct {
+	ObjectMeta common.ObjectMeta `json:"objectMeta"`
+	TypeMeta   common.TypeMeta   `json:"typeMeta"`
+
+	// Container images of the node.
+	ContainerImages []string `json:"containerImages"`
+
+	// External ID of the node assigned by some machine database (e.g. a cloud provider).
+	ExternalID string `json:"externalID"`
+
+	// PodCIDR represents the pod IP range assigned to the node.
+	PodCIDR string `json:"podCIDR"`
+
+	// ID of the node assigned by the cloud provider.
+	ProviderID string `json:"providerID"`
+
+	// Unschedulable controls node schedulability of new pods. By default node is schedulable.
+	Unschedulable bool `json:"unschedulable"`
+}
+
+// GetNodeList returns a list of all Nodes in the cluster.
+func GetNodeList(client client.Interface) (*NodeList, error) {
+	log.Printf("Getting list of all nodes in the cluster")
+
+	nodes, err := client.Nodes().List(api.ListOptions{
+		LabelSelector: labels.Everything(),
+		FieldSelector: fields.Everything(),
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	return toNodeList(nodes.Items), nil
+}
+
+func toNodeList(nodes []api.Node) *NodeList {
+	nodeList := &NodeList{
+		Nodes: make([]Node, 0),
+	}
+
+	for _, node := range nodes {
+		nodeList.Nodes = append(nodeList.Nodes, toNode(node))
+	}
+
+	return nodeList
+}
+
+func toNode(node api.Node) Node {
+	return Node{
+		ObjectMeta:      common.NewObjectMeta(node.ObjectMeta),
+		TypeMeta:        common.NewTypeMeta(common.ResourceKindNode),
+		ContainerImages: getContainerImages(node),
+		ExternalID:      node.Spec.ExternalID,
+		ProviderID:      node.Spec.ProviderID,
+		PodCIDR:         node.Spec.PodCIDR,
+		Unschedulable:   node.Spec.Unschedulable,
+	}
+}