Add frontend and backend for pet set list view (#791)

Author: Sebastian Florek

i18n/messages-en.xtb

@@ -111,6 +111,7 @@
 	<translation id="5605659611398511623" key="MSG_WORKLOADS_DEPLOYMENTS_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label &quot;Deployments&quot;, which appears above the deployments list on the workloads page.">Deployments</translation>
 	<translation id="3282083729093413912" key="MSG_WORKLOADS_REPLICA_SETS_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label &quot;Replica sets&quot;, which appears above the replica sets list on the workloads page.">Replica sets</translation>
 	<translation id="4853525775301386469" key="MSG_WORKLOADS_REPLICATION_CONTROLLERS_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label &quot;Replication controllers&quot;, which appears above the replication controllers list on the workloads page.">Replication controllers</translation>
+	<translation id="8569806629013746854" key="MSG_WORKLOADS_PET_SETS_LABEL" source="/home/floreks/Projects/dashboard/.tmp/serve/app-dev.js" desc="Label &quot;Pet Sets&quot;, which appears above the replica set list on the workloads page.">Pet Sets</translation>
 	<translation id="494424795601874379" key="MSG_WORKLOADS_PODS_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label &quot;Pods&quot;, which appears above the pods list on the workloads page.">Pods</translation>
 	<translation id="8249554138996646295" key="MSG_WORKLOADS_ACTION_BAR_DEPLOY_TOOLTIP" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="This tooltip appears when the user hovers over the &quot;+&quot; (Deploy) button on the workloads page.">Deploy a containerized app</translation>
 	<translation id="4581297925702163661" key="MSG_SERVICE_LIST_NAME_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label 'Name' which appears as a column label in the table of services (service list view).">Name</translation>
@@ -130,4 +131,11 @@
 	<translation id="6864041232530892176" key="MSG_SERVICE_DETAIL_CLUSTER_IP_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label 'Cluster IP' for the service IP in the cluster, appears in the connectivity part (right) of the service details view.">Cluster IP</translation>
 	<translation id="807395060665311082" key="MSG_SERVICE_DETAIL_INTERNAL_ENDPOINTS_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label 'Internal endpoints' for the internal endpoints of the service, appears in the connectivity part (right) of the service details view.">Internal endpoints</translation>
 	<translation id="6468266868985457861" key="MSG_SERVICE_DETAIL_EXTERNAL_ENDPOINTS_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label 'External endpoints' for the external endpoints of the service, appears in the connectivity part (right) of the service details view.">External endpoints</translation>
+	<translation id="1157514904008403171" key="MSG_PET_SET_CARD_TOOLTIP_ERROR" source="/home/floreks/Projects/dashboard/.tmp/serve/app-dev.js" desc="Tooltip text which appears on error icon hover.">One or more pods have errors</translation>
+	<translation id="5677265435825016706" key="MSG_PET_SET_CARD_TOOLTIP_PENDING" source="/home/floreks/Projects/dashboard/.tmp/serve/app-dev.js" desc="Tooltip text which appears on pending icon hover.">One or more pods are in pending state</translation>
+	<translation id="3899323843932532450" key="MSG_PET_SET_LIST_HEADER_NAME" source="/home/floreks/Projects/dashboard/.tmp/serve/app-dev.js" desc="Pet set list header: name.">Name</translation>
+	<translation id="8003529818786986419" key="MSG_PET_SET_LIST_HEADER_LABELS" source="/home/floreks/Projects/dashboard/.tmp/serve/app-dev.js" desc="Pet set list header: labels.">Labels</translation>
+	<translation id="2586490478144382446" key="MSG_PET_SET_LIST_HEADER_PODS" source="/home/floreks/Projects/dashboard/.tmp/serve/app-dev.js" desc="Pet set list header: pods.">Pods</translation>
+	<translation id="1017086337822469058" key="MSG_PET_SET_LIST_HEADER_AGE" source="/home/floreks/Projects/dashboard/.tmp/serve/app-dev.js" desc="Pet set list header: age.">Age</translation>
+	<translation id="5744665687208066898" key="MSG_PET_SET_LIST_HEADER_IMAGES" source="/home/floreks/Projects/dashboard/.tmp/serve/app-dev.js" desc="Pet set list header: images.">Images</translation>
 </translationbundle>

i18n/messages-ja.xtb

@@ -111,6 +111,7 @@
 	<translation id="5605659611398511623" key="MSG_WORKLOADS_DEPLOYMENTS_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label &quot;Deployments&quot;, which appears above the deployments list on the workloads page.">Deployments</translation>
 	<translation id="3282083729093413912" key="MSG_WORKLOADS_REPLICA_SETS_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label &quot;Replica sets&quot;, which appears above the replica sets list on the workloads page.">Replica sets</translation>
 	<translation id="4853525775301386469" key="MSG_WORKLOADS_REPLICATION_CONTROLLERS_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label &quot;Replication controllers&quot;, which appears above the replication controllers list on the workloads page.">Replication controllers</translation>
+	<translation id="8569806629013746854" key="MSG_WORKLOADS_PET_SETS_LABEL" source="/home/floreks/Projects/dashboard/.tmp/serve/app-dev.js" desc="Label &quot;Pet Sets&quot;, which appears above the replica set list on the workloads page.">Pet Sets</translation>
 	<translation id="494424795601874379" key="MSG_WORKLOADS_PODS_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label &quot;Pods&quot;, which appears above the pods list on the workloads page.">Pods</translation>
 	<translation id="8249554138996646295" key="MSG_WORKLOADS_ACTION_BAR_DEPLOY_TOOLTIP" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="This tooltip appears when the user hovers over the &quot;+&quot; (Deploy) button on the workloads page.">Deploy a containerized app</translation>
 	<translation id="4581297925702163661" key="MSG_SERVICE_LIST_NAME_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label 'Name' which appears as a column label in the table of services (service list view).">Name</translation>
@@ -130,4 +131,11 @@
 	<translation id="6864041232530892176" key="MSG_SERVICE_DETAIL_CLUSTER_IP_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label 'Cluster IP' for the service IP in the cluster, appears in the connectivity part (right) of the service details view.">Cluster IP</translation>
 	<translation id="807395060665311082" key="MSG_SERVICE_DETAIL_INTERNAL_ENDPOINTS_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label 'Internal endpoints' for the internal endpoints of the service, appears in the connectivity part (right) of the service details view.">Internal endpoints</translation>
 	<translation id="6468266868985457861" key="MSG_SERVICE_DETAIL_EXTERNAL_ENDPOINTS_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label 'External endpoints' for the external endpoints of the service, appears in the connectivity part (right) of the service details view.">External endpoints</translation>
+	<translation id="1157514904008403171" key="MSG_PET_SET_CARD_TOOLTIP_ERROR" source="/home/floreks/Projects/dashboard/.tmp/serve/app-dev.js" desc="Tooltip text which appears on error icon hover.">One or more pods have errors</translation>
+	<translation id="5677265435825016706" key="MSG_PET_SET_CARD_TOOLTIP_PENDING" source="/home/floreks/Projects/dashboard/.tmp/serve/app-dev.js" desc="Tooltip text which appears on pending icon hover.">One or more pods are in pending state</translation>
+	<translation id="3899323843932532450" key="MSG_PET_SET_LIST_HEADER_NAME" source="/home/floreks/Projects/dashboard/.tmp/serve/app-dev.js" desc="Pet set list header: name.">Name</translation>
+	<translation id="8003529818786986419" key="MSG_PET_SET_LIST_HEADER_LABELS" source="/home/floreks/Projects/dashboard/.tmp/serve/app-dev.js" desc="Pet set list header: labels.">Labels</translation>
+	<translation id="2586490478144382446" key="MSG_PET_SET_LIST_HEADER_PODS" source="/home/floreks/Projects/dashboard/.tmp/serve/app-dev.js" desc="Pet set list header: pods.">Pods</translation>
+	<translation id="1017086337822469058" key="MSG_PET_SET_LIST_HEADER_AGE" source="/home/floreks/Projects/dashboard/.tmp/serve/app-dev.js" desc="Pet set list header: age.">Age</translation>
+	<translation id="5744665687208066898" key="MSG_PET_SET_LIST_HEADER_IMAGES" source="/home/floreks/Projects/dashboard/.tmp/serve/app-dev.js" desc="Pet set list header: images.">Images</translation>
 </translationbundle>

src/app/backend/handler/apihandler.go

@@ -29,6 +29,7 @@ import (
 	"github.com/kubernetes/dashboard/resource/daemonset"
 	"github.com/kubernetes/dashboard/resource/deployment"
 	. "github.com/kubernetes/dashboard/resource/namespace"
+	"github.com/kubernetes/dashboard/resource/petset"
 	"github.com/kubernetes/dashboard/resource/pod"
 	"github.com/kubernetes/dashboard/resource/replicaset"
 	. "github.com/kubernetes/dashboard/resource/replicationcontroller"
@@ -86,7 +87,8 @@ func FormatResponseLog(resp *restful.Response, req *restful.Request) string {
 func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient,
 	clientConfig clientcmd.ClientConfig) http.Handler {
 
-	verber := common.NewResourceVerber(client.RESTClient, client.ExtensionsClient.RESTClient)
+	verber := common.NewResourceVerber(client.RESTClient, client.ExtensionsClient.RESTClient,
+		client.AppsClient.RESTClient)
 	apiHandler := ApiHandler{client, heapsterClient, clientConfig, verber}
 	wsContainer := restful.NewContainer()
 
@@ -263,13 +265,35 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient,
 			To(apiHandler.handleGetServiceDetail).
 			Writes(resourceService.ServiceDetail{}))
 
+	apiV1Ws.Route(
+		apiV1Ws.GET("/petset").
+			To(apiHandler.handleGetPetSetList).
+			Writes(resourceService.ServiceList{}))
+	apiV1Ws.Route(
+		apiV1Ws.GET("/petset/{namespace}").
+			To(apiHandler.handleGetPetSetList).
+			Writes(resourceService.ServiceList{}))
+
 	apiV1Ws.Route(
 		apiV1Ws.DELETE("/{kind}/namespace/{namespace}/name/{name}").
 			To(apiHandler.handleDeleteResource))
 
 	return wsContainer
 }
 
+// Handles get pet set list API call.
+func (apiHandler *ApiHandler) handleGetPetSetList(request *restful.Request,
+	response *restful.Response) {
+	namespace := parseNamespacePathParameter(request)
+	result, err := petset.GetPetSetList(apiHandler.client, namespace)
+	if err != nil {
+		handleInternalError(response, err)
+		return
+	}
+
+	response.WriteHeaderAndEntity(http.StatusCreated, result)
+}
+
 // Handles get service list API call.
 func (apiHandler *ApiHandler) handleGetServiceList(request *restful.Request, response *restful.Response) {
 	namespace := parseNamespacePathParameter(request)

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

@@ -58,6 +58,9 @@ type ResourceChannels struct {
 
 	// List and error channels to Nodes.
 	NodeList NodeListChannel
+
+	// List and error channels to PetSets.
+	PetSetList PetSetListChannel
 }
 
 // ServiceListChannel is a list and error channels to Services.
@@ -297,6 +300,7 @@ func GetReplicaSetListChannel(client client.ReplicaSetsNamespacer,
 				filteredItems = append(filteredItems, item)
 			}
 		}
+		list.Items = filteredItems
 		for i := 0; i < numReads; i++ {
 			channel.List <- list
 			channel.Error <- err
@@ -329,6 +333,7 @@ func GetDaemonSetListChannel(client client.DaemonSetsNamespacer,
 				filteredItems = append(filteredItems, item)
 			}
 		}
+		list.Items = filteredItems;
 		for i := 0; i < numReads; i++ {
 			channel.List <- list
 			channel.Error <- err
@@ -346,14 +351,23 @@ type PetSetListChannel struct {
 
 // GetPetSetListChannel returns a pair of channels to a PetSet list and errors that
 // both must be read numReads times.
-func GetPetSetListChannel(client client.PetSetNamespacer, numReads int) PetSetListChannel {
+func GetPetSetListChannel(client client.PetSetNamespacer,
+	nsQuery *NamespaceQuery, numReads int) PetSetListChannel {
 	channel := PetSetListChannel{
 		List:  make(chan *apps.PetSetList, numReads),
 		Error: make(chan error, numReads),
 	}
 
 	go func() {
-		petSets, err := client.PetSets(api.NamespaceAll).List(listEverything)
+		petSets, err := client.PetSets(nsQuery.ToRequestParam()).List(listEverything)
+		var filteredItems []apps.PetSet
+		for _, item := range petSets.Items {
+			if nsQuery.Matches(item.ObjectMeta.Namespace) {
+				filteredItems = append(filteredItems, item)
+			}
+		}
+
+		petSets.Items = filteredItems;
 		for i := 0; i < numReads; i++ {
 			channel.List <- petSets
 			channel.Error <- err

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

@@ -95,6 +95,19 @@ const (
 	ResourceKindEvent                 = "event"
 	ResourceKindReplicationController = "replicationcontroller"
 	ResourceKindDaemonSet             = "daemonset"
+	ResourceKindPetSet                = "petset"
+)
+
+// ClientType represents type of client that is used to perform generic operations on resources.
+// Different resources belong to different client, i.e. Deployments belongs to extension client
+// and PetSets to apps client.
+type ClientType string
+
+// List of client types supported by the UI.
+const (
+	ClientTypeDefault = "restclient"
+	ClientTypeExtensionClient = "extensionclient"
+	ClientTypeAppsClient = "appsclient"
 )
 
 // Mapping from resource kind to K8s apiserver API path. This is mostly pluralization, because
@@ -103,16 +116,18 @@ const (
 var kindToAPIMapping = map[string]struct {
 	// K8s resource name
 	Resource string
-	// Whether extensions client should be used. True for extensions client, false for normal.
-	Extension bool
+	// Client type used by given resource, i.e. deployments are using extension client and pet
+	// sets apps client.
+	ClientType ClientType
 }{
-	ResourceKindService:               {"services", false},
-	ResourceKindPod:                   {"pods", false},
-	ResourceKindEvent:                 {"events", false},
-	ResourceKindReplicationController: {"replicationcontrollers", false},
-	ResourceKindDeployment:            {"deployments", true},
-	ResourceKindReplicaSet:            {"replicasets", true},
-	ResourceKindDaemonSet:             {"daemonsets", false},
+	ResourceKindService:               {"services", ClientTypeDefault},
+	ResourceKindPod:                   {"pods", ClientTypeDefault},
+	ResourceKindEvent:                 {"events", ClientTypeDefault},
+	ResourceKindReplicationController: {"replicationcontrollers", ClientTypeDefault},
+	ResourceKindDeployment:            {"deployments", ClientTypeExtensionClient},
+	ResourceKindReplicaSet:            {"replicasets", ClientTypeExtensionClient},
+	ResourceKindDaemonSet:             {"daemonsets", ClientTypeDefault},
+	ResourceKindPetSet:                {"petsets", ClientTypeAppsClient},
 }
 
 // IsSelectorMatching returns true when an object with the given

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

@@ -25,6 +25,7 @@ import (
 type ResourceVerber struct {
 	client           RESTClient
 	extensionsClient RESTClient
+	appsClient       RESTClient
 }
 
 // RESTClient is an interface for REST operations used in this file.
@@ -34,8 +35,8 @@ type RESTClient interface {
 
 // NewResourceVerber creates a new resource verber that uses the given client for performing
 // operations.
-func NewResourceVerber(client RESTClient, extensionsClient RESTClient) ResourceVerber {
-	return ResourceVerber{client, extensionsClient}
+func NewResourceVerber(client, extensionsClient, appsClient RESTClient) ResourceVerber {
+	return ResourceVerber{client, extensionsClient, appsClient}
 }
 
 // Delete deletes the resource of the given kind in the given namespace with the given name.
@@ -45,12 +46,7 @@ func (verber *ResourceVerber) Delete(kind string, namespace string, name string)
 		return fmt.Errorf("Unknown resource kind: %s", kind)
 	}
 
-	var client RESTClient
-	if resourceSpec.Extension {
-		client = verber.extensionsClient
-	} else {
-		client = verber.client
-	}
+	client := verber.getRESTClientByType(resourceSpec.ClientType)
 
 	return client.Delete().
 		Namespace(namespace).
@@ -59,3 +55,14 @@ func (verber *ResourceVerber) Delete(kind string, namespace string, name string)
 		Do().
 		Error()
 }
+
+func (verber *ResourceVerber) getRESTClientByType(clientType ClientType) RESTClient {
+	switch clientType {
+	case ClientTypeExtensionClient:
+		return verber.extensionsClient
+	case ClientTypeAppsClient:
+		return verber.appsClient
+	default:
+		return verber.client
+	}
+}

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

@@ -18,6 +18,7 @@ import (
 	"log"
 
 	"github.com/kubernetes/dashboard/resource/common"
+	"github.com/kubernetes/dashboard/resource/event"
 
 	"k8s.io/kubernetes/pkg/api"
 	k8serrors "k8s.io/kubernetes/pkg/api/errors"
@@ -116,6 +117,7 @@ func getDeploymentList(deployments []extensions.Deployment,
 		matchingPods := common.FilterNamespacedPodsBySelector(pods, deployment.ObjectMeta.Namespace,
 			deployment.Spec.Selector.MatchLabels)
 		podInfo := getPodInfo(&deployment, matchingPods)
+		podInfo.Warnings = event.GetPodsEventWarnings(events, matchingPods)
 
 		deploymentList.Deployments = append(deploymentList.Deployments,
 			Deployment{