Add initial version of service list and service details pages (#726)

Author: Sebastian Florek

src/app/backend/resource/replicationcontroller/replicationcontrollerdetail.go

@@ -203,14 +203,11 @@ func UpdateReplicasCount(client k8sClient.Interface, namespace, name string,
 // Returns detailed information about service from given service
 func getService(service api.Service, replicationController api.ReplicationController,
 	pods []api.Pod, nodes []api.Node) resourceService.Service {
-	return resourceService.Service{
-		ObjectMeta: common.CreateObjectMeta(service.ObjectMeta),
-		TypeMeta:   common.CreateTypeMeta(service.TypeMeta),
-		InternalEndpoint: common.GetInternalEndpoint(service.Name, service.Namespace,
-			service.Spec.Ports),
-		ExternalEndpoints: getExternalEndpoints(replicationController, pods, service, nodes),
-		Selector:          service.Spec.Selector,
-	}
+
+	result := resourceService.GetServiceDetails(&service);
+	result.ExternalEndpoints = getExternalEndpoints(replicationController, pods, service, nodes)
+
+	return result;
 }
 
 // Returns array of external endpoints for a replication controller.

src/app/backend/resource/service/services.go

@@ -37,6 +37,13 @@ type Service struct {
 
 	// Label selector of the service.
 	Selector map[string]string `json:"selector"`
+
+	// Type determines how the service will be exposed.  Valid options: ClusterIP, NodePort, LoadBalancer
+	Type api.ServiceType `json:"type"`
+
+	// ClusterIP is usually assigned by the master. Valid values are None, empty string (""), or
+	// a valid IP address. None can be specified for headless services when proxying is not required
+	ClusterIP string `json:"clusterIP"`
 }
 
 // ServiceList contains a list of services in the cluster.
@@ -55,7 +62,7 @@ func GetService(client client.Interface, namespace, name string) (*Service, erro
 		return nil, err
 	}
 
-	service := getServices(serviceData)
+	service := GetServiceDetails(serviceData)
 	return &service, nil
 }
 
@@ -74,18 +81,21 @@ func GetServiceList(client client.Interface) (*ServiceList, error) {
 
 	serviceList := &ServiceList{Services: make([]Service, 0)}
 	for _, service := range services.Items {
-		serviceList.Services = append(serviceList.Services, getServices(&service))
+		serviceList.Services = append(serviceList.Services, GetServiceDetails(&service))
 	}
 
 	return serviceList, nil
 }
 
-func getServices(service *api.Service) Service {
+// GetServiceDetails returns api service object based on kubernetes service object
+func GetServiceDetails(service *api.Service) Service {
 	return Service{
 		ObjectMeta:       common.CreateObjectMeta(service.ObjectMeta),
 		TypeMeta:         common.CreateTypeMeta(service.TypeMeta),
 		InternalEndpoint: common.GetInternalEndpoint(service.Name, service.Namespace, service.Spec.Ports),
 		// TODO(maciaszczykm): Fill ExternalEndpoints with data.
-		Selector: service.Spec.Selector,
+		Selector:  service.Spec.Selector,
+		ClusterIP: service.Spec.ClusterIP,
+		Type:      service.Spec.Type,
 	}
 }

src/app/externs/backendapi.js

@@ -214,7 +214,7 @@ backendApi.TypeMeta;
  *   containerImages: !Array<string>,
  *   podInfo: !backendApi.PodInfo,
  *   pods: !backendApi.PodList,
- *   services: !Array<!backendApi.Service>,
+ *   services: !Array<!backendApi.ServiceDetail>,
  *   hasMetrics: boolean
  * }}
  */
@@ -253,10 +253,20 @@ backendApi.Pod;
  *  typeMeta: !backendApi.TypeMeta,
  *  internalEndpoint: !backendApi.Endpoint,
  *  externalEndpoints: !Array<!backendApi.Endpoint>,
- *  selector: !Object<string, string>
+ *  selector: !Object<string, string>,
+ *  labels: !Object<string, string>,
+ *  clusterIP: string,
+ *  type: string
  * }}
  */
-backendApi.Service;
+backendApi.ServiceDetail;
+
+/**
+ * @typedef {{
+ *  services: !Array<backendApi.ServiceDetail>
+ * }}
+ */
+backendApi.ServiceList;
 
 /**
  * @typedef {{

src/app/frontend/index_module.js

@@ -18,14 +18,16 @@
  */
 import chromeModule from './chrome/chrome_module';
 import deployModule from './deploy/deploy_module';
+import deprecatedReplicationControllerListModule from './replicationcontrollerlistdeprecated/replicationcontrollerlist_module';
 import errorModule from './error/error_module';
 import indexConfig from './index_config';
-import routeConfig from './index_route';
 import logsModule from './logs/logs_module';
+import replicaSetListModule from './replicasetlist/replicasetlist_module';
 import replicationControllerDetailModule from './replicationcontrollerdetail/replicationcontrollerdetail_module';
 import replicationControllerListModule from './replicationcontrollerlist/replicationcontrollerlist_module';
-import deprecatedReplicationControllerListModule from './replicationcontrollerlistdeprecated/replicationcontrollerlist_module';
-import replicaSetListModule from './replicasetlist/replicasetlist_module';
+import routeConfig from './index_route';
+import serviceDetailModule from './servicedetail/servicedetail_module';
+import serviceListModule from './servicelist/servicelist_module';
 import workloadsModule from './workloads/workloads_module';
 
 export default angular
@@ -48,6 +50,8 @@ export default angular
           deprecatedReplicationControllerListModule.name,
           replicaSetListModule.name,
           workloadsModule.name,
+          serviceDetailModule.name,
+          serviceListModule.name,
         ])
     .config(indexConfig)
     .config(routeConfig);

src/app/frontend/podlist/podcardlist.html

@@ -14,7 +14,8 @@
 limitations under the License.
 -->
 
-<kd-resource-card-list selectable="false" with-statuses="false" ng-if="::$ctrl.podList.pods">
+<kd-resource-card-list selectable="::$ctrl.selectable" with-statuses="::$ctrl.withStatuses"
+                       ng-if="::$ctrl.podList.pods">
   <kd-resource-card-header-columns>
     <kd-resource-card-header-column size="medium" grow="4">Name</kd-resource-card-header-column>
     <kd-resource-card-header-column>Status</kd-resource-card-header-column>

src/app/frontend/podlist/podcardlist_component.js

@@ -54,5 +54,9 @@ export const podCardListComponent = {
     'podList': '<',
     /** {!function({pod: !backendApi.Pod}): string} */
     'logsHrefFn': '&',
+    /** {boolean} */
+    'selectable': '<',
+    /** {boolean} */
+    'withStatuses': '<',
   },
 };

src/app/frontend/podlist/podlist_module.js

@@ -16,7 +16,9 @@ import stateConfig from './podlist_stateconfig';
 import {podCardListComponent} from './podcardlist_component';
 
 /**
- * Module containing endpoint components.
+ * Angular module for the Pods list view.
+ *
+ * The view shows Pods running in the cluster and allows to manage them.
  */
 export default angular
     .module(

src/app/frontend/replicasetlist/replicasetlist_module.js

@@ -20,9 +20,9 @@ import {replicaSetCardListComponent} from './replicasetcardlist_component';
 import replicaSetDetailModule from 'replicasetdetail/replicasetdetail_module';
 
 /**
- * Angular module for the Replication Controller list view.
+ * Angular module for the Replica Set list view.
  *
- * The view shows Replication Controllers running in the cluster and allows to manage them.
+ * The view shows Replica Set running in the cluster and allows to manage them.
  */
 export default angular
     .module(

src/app/frontend/replicationcontrollerdetail/replicationcontrollerdetail.html

@@ -18,19 +18,22 @@
   <md-content>
     <md-tabs md-border-bottom md-dynamic-height>
       <md-tab label="Overview">
-        <kd-replication-controller-info details="::ctrl.replicationControllerDetail">
+        <kd-replication-controller-info replication-controller="::ctrl.replicationControllerDetail">
         </kd-replication-controller-info>
 
-        <kd-replication-controller-services services="::ctrl.replicationControllerDetail.services">
-        </kd-replication-controller-services>
+        <kd-content-card ng-if="::ctrl.replicationControllerDetail.services">
+          <kd-title>Services</kd-title>
+          <kd-content>
+            <kd-service-card-list services="::ctrl.replicationControllerDetail.services">
+            </kd-service-card-list>
+          </kd-content>
+        </kd-content-card>
 
         <kd-content-card>
-          <kd-title>
-            Pods
-          </kd-title>
+          <kd-title>Pods</kd-title>
           <kd-content>
             <kd-pod-card-list pod-list="::ctrl.replicationControllerDetail.pods"
-                logs-href-fn="::ctrl.getPodLogsHref(pod)">
+                              logs-href-fn="::ctrl.getPodLogsHref(pod)">
             </kd-pod-card-list>
           </kd-content>
         </kd-content-card>

src/app/frontend/replicationcontrollerdetail/replicationcontrollerdetail_module.js

@@ -16,11 +16,11 @@ import componentsModule from './../common/components/components_module';
 import filtersModule from 'common/filters/filters_module';
 import logsModule from 'logs/logs_module';
 import podListModule from 'podlist/podlist_module';
+import serviceListModule from 'servicelist/servicelist_module';
 import stateConfig from './replicationcontrollerdetail_stateconfig';
 import {replicationControllerEventsComponent} from './replicationcontrollerevents_component';
 import {replicationControllerInfoComponent} from './replicationcontrollerinfo_component';
 import {ReplicationControllerService} from './replicationcontroller_service';
-import {replicationControllerServicesComponent} from './replicationcontrollerservices_component';
 
 /**
  * Angular module for the Replication Controller details view.
@@ -38,9 +38,9 @@ export default angular
           filtersModule.name,
           logsModule.name,
           podListModule.name,
+          serviceListModule.name,
         ])
     .config(stateConfig)
     .component('kdReplicationControllerInfo', replicationControllerInfoComponent)
-    .component('kdReplicationControllerServices', replicationControllerServicesComponent)
     .component('kdReplicationControllerEvents', replicationControllerEventsComponent)
     .service('kdReplicationControllerService', ReplicationControllerService);