Merge pull request #320 from maciaszczykm/external-links

External links handling

Author: bryk

src/app/backend/deploy.go

@@ -208,7 +208,7 @@ func DeployApp(spec *AppDeploymentSpec, client client.Interface) error {
 		if spec.IsExternal {
 			service.Spec.Type = api.ServiceTypeLoadBalancer
 		} else {
-			service.Spec.Type = api.ServiceTypeNodePort
+			service.Spec.Type = api.ServiceTypeClusterIP
 		}
 
 		for _, portMapping := range spec.PortMappings {

src/app/backend/replicationcontrollerdetail.go

@@ -158,12 +158,19 @@ func GetReplicationControllerDetail(client client.Interface, heapsterClient Heap
 
 	matchingServices := getMatchingServices(services.Items, replicationController)
 
+	// Anonymous callback function to get nodes by their names.
+	getNodeFn := func(nodeName string) (*api.Node, error) {
+		return client.Nodes().Get(nodeName)
+	}
+
 	for _, service := range matchingServices {
-		replicationControllerDetail.Services = append(replicationControllerDetail.Services, getServiceDetail(service))
+		replicationControllerDetail.Services = append(replicationControllerDetail.Services,
+			getServiceDetail(service, *replicationController, pods.Items, getNodeFn))
 	}
 
 	for _, container := range replicationController.Spec.Template.Spec.Containers {
-		replicationControllerDetail.ContainerImages = append(replicationControllerDetail.ContainerImages, container.Image)
+		replicationControllerDetail.ContainerImages = append(replicationControllerDetail.ContainerImages,
+			container.Image)
 	}
 
 	for _, pod := range pods.Items {
@@ -277,22 +284,15 @@ func UpdateReplicasCount(client client.Interface, namespace, name string,
 }
 
 // Returns detailed information about service from given service
-func getServiceDetail(service api.Service) ServiceDetail {
-	var externalEndpoints []Endpoint
-	for _, externalIp := range service.Status.LoadBalancer.Ingress {
-		externalEndpoints = append(externalEndpoints,
-			getExternalEndpoint(externalIp, service.Spec.Ports))
-	}
-
-	serviceDetail := ServiceDetail{
+func getServiceDetail(service api.Service, replicationController api.ReplicationController,
+	pods []api.Pod, getNodeFn GetNodeFunc) ServiceDetail {
+	return ServiceDetail{
 		Name: service.ObjectMeta.Name,
 		InternalEndpoint: getInternalEndpoint(service.Name, service.Namespace,
 			service.Spec.Ports),
-		ExternalEndpoints: externalEndpoints,
+		ExternalEndpoints: getExternalEndpoints(replicationController, pods, service, getNodeFn),
 		Selector:          service.Spec.Selector,
 	}
-
-	return serviceDetail
 }
 
 // Gets restart count of given pod (total number of its containers restarts).
@@ -322,6 +322,82 @@ func getInternalEndpoint(serviceName, namespace string, ports []api.ServicePort)
 	}
 }
 
+// Returns array of external endpoints for a replication controller.
+func getExternalEndpoints(replicationController api.ReplicationController, pods []api.Pod,
+	service api.Service, getNodeFn GetNodeFunc) []Endpoint {
+	var externalEndpoints []Endpoint
+	replicationControllerPods := filterReplicationControllerPods(replicationController, pods)
+
+	if service.Spec.Type == api.ServiceTypeNodePort {
+		externalEndpoints = getNodePortEndpoints(replicationControllerPods, service, getNodeFn)
+	}
+
+	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(replicationControllerPods, service, getNodeFn)
+		}
+	}
+
+	return externalEndpoints
+}
+
+// Returns pods that belong to specified replication controller.
+func filterReplicationControllerPods(replicationController api.ReplicationController,
+	allPods []api.Pod) []api.Pod {
+	var pods []api.Pod
+	for _, pod := range allPods {
+		if isLabelSelectorMatching(replicationController.Spec.Selector, pod.Labels) {
+			pods = append(pods, pod)
+		}
+	}
+	return pods
+}
+
+// Returns array of external endpoints for specified pods.
+func getNodePortEndpoints(pods []api.Pod, service api.Service, getNodeFn GetNodeFunc) []Endpoint {
+	var externalEndpoints []Endpoint
+	var externalIPs []string
+	for _, pod := range pods {
+		node, err := getNodeFn(pod.Spec.NodeName)
+		if err != nil {
+			continue
+		}
+		for _, adress := range node.Status.Addresses {
+			if adress.Type == api.NodeExternalIP && len(adress.Address) > 0 &&
+				isExternalIPUniqe(externalIPs, adress.Address) {
+				externalIPs = append(externalIPs, adress.Address)
+				for _, port := range service.Spec.Ports {
+					externalEndpoints = append(externalEndpoints, Endpoint{
+						Host: adress.Address,
+						Ports: []ServicePort{
+							{
+								Protocol: port.Protocol,
+								Port:     port.NodePort,
+							},
+						},
+					})
+				}
+			}
+		}
+	}
+	return externalEndpoints
+}
+
+// Returns true if given external IP is not part of given array.
+func isExternalIPUniqe(externalIPs []string, externalIP string) bool {
+	for _, h := range externalIPs {
+		if h == externalIP {
+			return false
+		}
+	}
+	return true
+}
+
 // Returns external endpoint name for the given service properties.
 func getExternalEndpoint(ingress api.LoadBalancerIngress, ports []api.ServicePort) Endpoint {
 	var host string

src/app/backend/replicationcontrollerlist.go

@@ -27,6 +27,9 @@ import (
 // Callback function in order to get the pod status errors
 type GetPodsEventWarningsFunc func(pods []api.Pod) ([]PodEvent, error)
 
+// Callback function in order to get node by name.
+type GetNodeFunc func(nodeName string) (*api.Node, error)
+
 // ReplicationControllerList contains a list of Replication Controllers in the cluster.
 type ReplicationControllerList struct {
 	// Unordered list of Replication Controllers.
@@ -104,7 +107,13 @@ func GetReplicationControllerList(client *client.Client) (*ReplicationController
 		return errors, nil
 	}
 
-	result, err := getReplicationControllerList(replicationControllers.Items, services.Items, pods.Items, getPodsEventWarningsFn)
+	// Anonymous callback function to get nodes by their names.
+	getNodeFn := func(nodeName string) (*api.Node, error) {
+		return client.Nodes().Get(nodeName)
+	}
+
+	result, err := getReplicationControllerList(replicationControllers.Items, services.Items,
+		pods.Items, getPodsEventWarningsFn, getNodeFn)
 
 	if err != nil {
 		return nil, err
@@ -117,8 +126,8 @@ func GetReplicationControllerList(client *client.Client) (*ReplicationController
 // Replication Controller and Service API objects.
 // The function processes all Replication Controllers API objects and finds matching Services for them.
 func getReplicationControllerList(replicationControllers []api.ReplicationController,
-	services []api.Service, pods []api.Pod, getPodsEventWarningsFn GetPodsEventWarningsFunc) (
-	*ReplicationControllerList, error) {
+	services []api.Service, pods []api.Pod, getPodsEventWarningsFn GetPodsEventWarningsFunc,
+	getNodeFn GetNodeFunc) (*ReplicationControllerList, error) {
 
 	replicationControllerList := &ReplicationControllerList{ReplicationControllers: make([]ReplicationController, 0)}
 
@@ -134,10 +143,8 @@ func getReplicationControllerList(replicationControllers []api.ReplicationContro
 		for _, service := range matchingServices {
 			internalEndpoints = append(internalEndpoints,
 				getInternalEndpoint(service.Name, service.Namespace, service.Spec.Ports))
-			for _, externalIP := range service.Status.LoadBalancer.Ingress {
-				externalEndpoints = append(externalEndpoints,
-					getExternalEndpoint(externalIP, service.Spec.Ports))
-			}
+			externalEndpoints = getExternalEndpoints(replicationController, pods, service,
+				getNodeFn)
 		}
 
 		matchingPods := make([]api.Pod, 0)
@@ -156,17 +163,18 @@ func getReplicationControllerList(replicationControllers []api.ReplicationContro
 
 		podInfo.Warnings = podErrors
 
-		replicationControllerList.ReplicationControllers = append(replicationControllerList.ReplicationControllers, ReplicationController{
-			Name:              replicationController.ObjectMeta.Name,
-			Namespace:         replicationController.ObjectMeta.Namespace,
-			Description:       replicationController.Annotations[DescriptionAnnotationKey],
-			Labels:            replicationController.ObjectMeta.Labels,
-			Pods:              podInfo,
-			ContainerImages:   containerImages,
-			CreationTime:      replicationController.ObjectMeta.CreationTimestamp,
-			InternalEndpoints: internalEndpoints,
-			ExternalEndpoints: externalEndpoints,
-		})
+		replicationControllerList.ReplicationControllers = append(replicationControllerList.ReplicationControllers,
+			ReplicationController{
+				Name:              replicationController.ObjectMeta.Name,
+				Namespace:         replicationController.ObjectMeta.Namespace,
+				Description:       replicationController.Annotations[DescriptionAnnotationKey],
+				Labels:            replicationController.ObjectMeta.Labels,
+				Pods:              podInfo,
+				ContainerImages:   containerImages,
+				CreationTime:      replicationController.ObjectMeta.CreationTimestamp,
+				InternalEndpoints: internalEndpoints,
+				ExternalEndpoints: externalEndpoints,
+			})
 	}
 
 	return replicationControllerList, nil