Remove endpoints from RCs and add them to services (#864)

Fixes #854, Fixes #836

This PR has also a nice benefit of speeding things up, as I removed
calls to Nodes and Services from most pages.

Author: bryk

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

@@ -29,31 +29,20 @@ type Endpoint struct {
 	Ports []ServicePort `json:"ports"`
 }
 
-// GetExternalEndpoints returns array of external endpoints for resources targeted by given
-// selector.
-func GetExternalEndpoints(resourceSelector map[string]string, allPods []api.Pod,
-	service api.Service, nodes []api.Node) []Endpoint {
-
+// GetExternalEndpoints returns endpoints that are externally reachable for a service.
+func GetExternalEndpoints(service *api.Service) []Endpoint {
 	var externalEndpoints []Endpoint
-	resourcePods := FilterPodsBySelector(allPods, resourceSelector)
-
-	if service.Spec.Type == api.ServiceTypeNodePort {
-		externalEndpoints = getNodePortEndpoints(resourcePods, service, nodes)
-	} else if service.Spec.Type == api.ServiceTypeLoadBalancer {
+	if service.Spec.Type == api.ServiceTypeLoadBalancer {
 		for _, ingress := range service.Status.LoadBalancer.Ingress {
-			externalEndpoints = append(externalEndpoints, getExternalEndpoint(
-				ingress, service.Spec.Ports))
-		}
-
-		if len(externalEndpoints) == 0 {
-			externalEndpoints = getNodePortEndpoints(resourcePods,
-				service, nodes)
+			externalEndpoints = append(externalEndpoints, getExternalEndpoint(ingress, service.Spec.Ports))
 		}
 	}
 
-	if len(externalEndpoints) == 0 && (service.Spec.Type == api.ServiceTypeNodePort ||
-		service.Spec.Type == api.ServiceTypeLoadBalancer) {
-		externalEndpoints = getLocalhostEndpoints(service)
+	for _, ip := range service.Spec.ExternalIPs {
+		externalEndpoints = append(externalEndpoints, Endpoint{
+			Host:  ip,
+			Ports: GetServicePorts(service.Spec.Ports),
+		})
 	}
 
 	return externalEndpoints
@@ -77,56 +66,6 @@ func GetInternalEndpoint(serviceName, namespace string, ports []api.ServicePort)
 	}
 }
 
-// Returns array of external endpoints for specified pods.
-func getNodePortEndpoints(pods []api.Pod, service api.Service, nodes []api.Node) []Endpoint {
-	var externalEndpoints []Endpoint
-	var addresses []api.NodeAddress
-
-	for _, pod := range pods {
-		node := GetNodeByName(nodes, pod.Spec.NodeName)
-		if node == nil {
-			continue
-		}
-
-		addresses = append(addresses, node.Status.Addresses...)
-	}
-
-	addresses = getUniqueExternalAddresses(addresses)
-
-	for _, address := range addresses {
-		for _, port := range service.Spec.Ports {
-			externalEndpoints = append(externalEndpoints, Endpoint{
-				Host: address.Address,
-				Ports: []ServicePort{
-					{
-						Protocol: port.Protocol,
-						Port:     port.NodePort,
-					},
-				},
-			})
-		}
-	}
-
-	return externalEndpoints
-}
-
-// Returns localhost endpoints for specified node port or load balancer service.
-func getLocalhostEndpoints(service api.Service) []Endpoint {
-	var externalEndpoints []Endpoint
-	for _, port := range service.Spec.Ports {
-		externalEndpoints = append(externalEndpoints, Endpoint{
-			Host: "localhost",
-			Ports: []ServicePort{
-				{
-					Protocol: port.Protocol,
-					Port:     port.NodePort,
-				},
-			},
-		})
-	}
-	return externalEndpoints
-}
-
 // Returns external endpoint name for the given service properties.
 func getExternalEndpoint(ingress api.LoadBalancerIngress, ports []api.ServicePort) Endpoint {
 	var host string
@@ -141,21 +80,6 @@ func getExternalEndpoint(ingress api.LoadBalancerIngress, ports []api.ServicePor
 	}
 }
 
-// Returns only unique external ip addresses.
-func getUniqueExternalAddresses(addresses []api.NodeAddress) []api.NodeAddress {
-	visited := make(map[string]bool, 0)
-	result := make([]api.NodeAddress, 0)
-
-	for _, elem := range addresses {
-		if !visited[elem.Address] && elem.Type == api.NodeExternalIP {
-			visited[elem.Address] = true
-			result = append(result, elem)
-		}
-	}
-
-	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 {

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

@@ -23,7 +23,6 @@ import (
 	resourceService "github.com/kubernetes/dashboard/resource/service"
 	"k8s.io/kubernetes/pkg/api"
 	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
-	"k8s.io/kubernetes/pkg/apis/extensions"
 	k8sClient "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
@@ -70,11 +69,6 @@ func GetDaemonSetDetail(client k8sClient.Interface, heapsterClient client.Heapst
 		FieldSelector: fields.Everything(),
 	})
 
-	nodes, err := client.Nodes().List(api.ListOptions{
-		LabelSelector: labels.Everything(),
-		FieldSelector: fields.Everything(),
-	})
-
 	if err != nil {
 		return nil, err
 	}
@@ -91,7 +85,7 @@ func GetDaemonSetDetail(client k8sClient.Interface, heapsterClient client.Heapst
 
 	for _, service := range matchingServices {
 		daemonSetDetail.ServiceList.Services = append(daemonSetDetail.ServiceList.Services,
-			getService(service, *daemonSet, pods.Items, nodes.Items))
+			resourceService.ToService(&service))
 	}
 
 	for _, container := range daemonSet.Spec.Template.Spec.Containers {
@@ -138,7 +132,7 @@ func DeleteDaemonSet(client k8sClient.Interface, namespace, name string,
 	return nil
 }
 
-// Deletes services related to daemon set with given name in given namespace.
+// DeleteDaemonSetServices deletes services related to daemon set with given name in given namespace.
 func DeleteDaemonSetServices(client k8sClient.Interface, namespace, name string) error {
 	log.Printf("Deleting services related to %s daemon set from %s namespace", name,
 		namespace)
@@ -169,14 +163,3 @@ func DeleteDaemonSetServices(client k8sClient.Interface, namespace, name string)
 
 	return nil
 }
-
-// Returns detailed information about service from given service
-func getService(service api.Service, daemonSet extensions.DaemonSet,
-	pods []api.Pod, nodes []api.Node) resourceService.Service {
-
-	result := resourceService.ToService(&service)
-	// TODO: This may be wrong as we dont use all attributes from selector
-	result.ExternalEndpoints = common.GetExternalEndpoints(daemonSet.Spec.Selector.MatchLabels, pods, service, nodes)
-
-	return result
-}

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

@@ -41,12 +41,6 @@ type DaemonSet struct {
 
 	// Container images of the Daemon Set.
 	ContainerImages []string `json:"containerImages"`
-
-	// Internal endpoints of all Kubernetes services have the same label selector as this Daemon Set.
-	InternalEndpoints []common.Endpoint `json:"internalEndpoints"`
-
-	// External endpoints of all Kubernetes services have the same label selector as this Daemon Set.
-	ExternalEndpoints []common.Endpoint `json:"externalEndpoints"`
 }
 
 // GetDaemonSetList returns a list of all Daemon Set in the cluster.
@@ -57,7 +51,6 @@ 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, 1),
 	}
 
 	return GetDaemonSetListFromChannels(channels)
@@ -73,11 +66,6 @@ func GetDaemonSetListFromChannels(channels *common.ResourceChannels) (
 		return nil, err
 	}
 
-	services := <-channels.ServiceList.List
-	if err := <-channels.ServiceList.Error; err != nil {
-		return nil, err
-	}
-
 	pods := <-channels.PodList.List
 	if err := <-channels.PodList.Error; err != nil {
 		return nil, err
@@ -88,38 +76,21 @@ func GetDaemonSetListFromChannels(channels *common.ResourceChannels) (
 		return nil, err
 	}
 
-	nodes := <-channels.NodeList.List
-	if err := <-channels.NodeList.Error; err != nil {
-		return nil, err
-	}
-
-	result := getDaemonSetList(daemonSets.Items, services.Items,
-		pods.Items, events.Items, nodes.Items)
+	result := getDaemonSetList(daemonSets.Items, pods.Items, events.Items)
 
 	return result, nil
 }
 
 // Returns a list of all Daemon Set model objects in the cluster, based on all Kubernetes
 // Daemon Set and Service API objects.
 // The function processes all Daemon Set API objects and finds matching Services for them.
-func getDaemonSetList(daemonSets []extensions.DaemonSet,
-	services []api.Service, pods []api.Pod, events []api.Event,
-	nodes []api.Node) *DaemonSetList {
+func getDaemonSetList(daemonSets []extensions.DaemonSet, pods []api.Pod,
+	events []api.Event) *DaemonSetList {
 
 	daemonSetList := &DaemonSetList{DaemonSets: make([]DaemonSet, 0)}
 
 	for _, daemonSet := range daemonSets {
 
-		matchingServices := getMatchingServicesforDS(services, &daemonSet)
-		var internalEndpoints []common.Endpoint
-		var externalEndpoints []common.Endpoint
-		for _, service := range matchingServices {
-			internalEndpoints = append(internalEndpoints,
-				common.GetInternalEndpoint(service.Name, service.Namespace, service.Spec.Ports))
-			// TODO: This may be wrong as we dont use all attributes from selector
-			externalEndpoints = common.GetExternalEndpoints(daemonSet.Spec.Selector.MatchLabels, pods, service, nodes)
-		}
-
 		matchingPods := make([]api.Pod, 0)
 		for _, pod := range pods {
 			if pod.ObjectMeta.Namespace == daemonSet.ObjectMeta.Namespace &&
@@ -134,12 +105,10 @@ func getDaemonSetList(daemonSets []extensions.DaemonSet,
 
 		daemonSetList.DaemonSets = append(daemonSetList.DaemonSets,
 			DaemonSet{
-				ObjectMeta:        common.NewObjectMeta(daemonSet.ObjectMeta),
-				TypeMeta:          common.NewTypeMeta(common.ResourceKindDaemonSet),
-				Pods:              podInfo,
-				ContainerImages:   common.GetContainerImages(&daemonSet.Spec.Template.Spec),
-				InternalEndpoints: internalEndpoints,
-				ExternalEndpoints: externalEndpoints,
+				ObjectMeta:      common.NewObjectMeta(daemonSet.ObjectMeta),
+				TypeMeta:        common.NewTypeMeta(common.ResourceKindDaemonSet),
+				Pods:            podInfo,
+				ContainerImages: common.GetContainerImages(&daemonSet.Spec.Template.Spec),
 			})
 	}
 

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

@@ -85,6 +85,8 @@ func GetDeploymentDetail(client client.Interface, namespace string,
 			common.NewSameNamespaceQuery(namespace), options, 1),
 		PodList: common.GetPodListChannelWithOptions(client,
 			common.NewSameNamespaceQuery(namespace), options, 1),
+		EventList: common.GetEventListChannelWithOptions(client,
+			common.NewSameNamespaceQuery(namespace), options, 1),
 	}
 
 	rsList := <-channels.ReplicaSetList.List
@@ -97,6 +99,11 @@ func GetDeploymentDetail(client client.Interface, namespace string,
 		return nil, err
 	}
 
+	eventList := <-channels.EventList.List
+	if err := <-channels.EventList.Error; err != nil {
+		return nil, err
+	}
+
 	oldReplicaSets, _, err := deploymentutil.FindOldReplicaSets(deployment, rsList.Items, podList)
 	if err != nil {
 		return nil, err
@@ -107,18 +114,18 @@ func GetDeploymentDetail(client client.Interface, namespace string,
 		return nil, err
 	}
 
-	events, err := GetDeploymentEvents(client, namespace, name)
+	events, err := GetDeploymentEvents(eventList.Items, namespace, name)
 	if err != nil {
 		return nil, err
 	}
 
 	return getDeploymentDetail(deployment, oldReplicaSets, newReplicaSet,
-		podList.Items, events), nil
+		podList.Items, events, eventList.Items), nil
 }
 
 func getDeploymentDetail(deployment *extensions.Deployment,
 	oldRs []*extensions.ReplicaSet, newRs *extensions.ReplicaSet,
-	pods []api.Pod, events *common.EventList) *DeploymentDetail {
+	pods []api.Pod, events *common.EventList, rawEvents []api.Event) *DeploymentDetail {
 	var newReplicaSet replicaset.ReplicaSet
 
 	if newRs != nil {
@@ -130,8 +137,7 @@ func getDeploymentDetail(deployment *extensions.Deployment,
 	for i, replicaSet := range oldRs {
 		oldReplicaSets[i] = *replicaSet
 	}
-	oldReplicaSetList := replicaset.ToReplicaSetList(oldReplicaSets,
-		[]api.Service{}, pods, []api.Event{}, []api.Node{})
+	oldReplicaSetList := replicaset.ToReplicaSetList(oldReplicaSets, pods, rawEvents)
 
 	return &DeploymentDetail{
 		ObjectMeta:      common.NewObjectMeta(deployment.ObjectMeta),

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

@@ -3,22 +3,20 @@ package deployment
 import (
 	"log"
 
+	"k8s.io/kubernetes/pkg/api"
+
 	"github.com/kubernetes/dashboard/resource/common"
 	"github.com/kubernetes/dashboard/resource/event"
-	client "k8s.io/kubernetes/pkg/client/unversioned"
 )
 
-func GetDeploymentEvents(client client.Interface, namespace string, deploymentName string) (*common.EventList, error) {
+// GetDeploymentEvents returns model events for a deployment with the given name in the given
+// namespace
+func GetDeploymentEvents(dpEvents []api.Event, namespace string,
+	deploymentName string) (*common.EventList, error) {
 
 	log.Printf("Getting events related to %s deployment in %s namespace", deploymentName,
 		namespace)
 
-	// Get events for deployment.
-	dpEvents, err := event.GetEvents(client, namespace, deploymentName)
-	if err != nil {
-		return nil, err
-	}
-
 	if !event.IsTypeFilled(dpEvents) {
 		dpEvents = event.FillEventsType(dpEvents)
 	}

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

@@ -52,10 +52,8 @@ func GetDeploymentList(client client.Interface, nsQuery *common.NamespaceQuery)
 
 	channels := &common.ResourceChannels{
 		DeploymentList: common.GetDeploymentListChannel(client.Extensions(), nsQuery, 1),
-		ServiceList:    common.GetServiceListChannel(client, nsQuery, 1),
 		PodList:        common.GetPodListChannel(client, nsQuery, 1),
 		EventList:      common.GetEventListChannel(client, nsQuery, 1),
-		NodeList:       common.GetNodeListChannel(client, 1),
 	}
 
 	return GetDeploymentListFromChannels(channels)
@@ -80,11 +78,6 @@ func GetDeploymentListFromChannels(channels *common.ResourceChannels) (
 		return nil, err
 	}
 
-	services := <-channels.ServiceList.List
-	if err := <-channels.ServiceList.Error; err != nil {
-		return nil, err
-	}
-
 	pods := <-channels.PodList.List
 	if err := <-channels.PodList.Error; err != nil {
 		return nil, err
@@ -95,18 +88,11 @@ func GetDeploymentListFromChannels(channels *common.ResourceChannels) (
 		return nil, err
 	}
 
-	nodes := <-channels.NodeList.List
-	if err := <-channels.NodeList.Error; err != nil {
-		return nil, err
-	}
-
-	return getDeploymentList(deployments.Items, services.Items, pods.Items, events.Items,
-		nodes.Items), nil
+	return getDeploymentList(deployments.Items, pods.Items, events.Items), nil
 }
 
-func getDeploymentList(deployments []extensions.Deployment,
-	services []api.Service, pods []api.Pod, events []api.Event,
-	nodes []api.Node) *DeploymentList {
+func getDeploymentList(deployments []extensions.Deployment, pods []api.Pod,
+	events []api.Event) *DeploymentList {
 
 	deploymentList := &DeploymentList{
 		Deployments: make([]Deployment, 0),