Merge pull request #768 from bryk/namespace-selector

Backend for namespace selection

Author: bryk

src/app/backend/handler/apihandler.go

@@ -19,6 +19,7 @@ import (
 	"log"
 	"net/http"
 	"strconv"
+	"strings"
 
 	restful "github.com/emicklei/go-restful"
 	// TODO(maciaszczykm): Avoid using dot-imports.
@@ -131,6 +132,10 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient,
 		apiV1Ws.GET("/replicationcontroller").
 			To(apiHandler.handleGetReplicationControllerList).
 			Writes(ReplicationControllerList{}))
+	apiV1Ws.Route(
+		apiV1Ws.GET("/replicationcontroller/{namespace}").
+			To(apiHandler.handleGetReplicationControllerList).
+			Writes(ReplicationControllerList{}))
 	apiV1Ws.Route(
 		apiV1Ws.GET("/replicationcontroller/{namespace}/{replicationController}").
 			To(apiHandler.handleGetReplicationControllerDetail).
@@ -151,11 +156,19 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient,
 		apiV1Ws.GET("/workload").
 			To(apiHandler.handleGetWorkloads).
 			Writes(workload.Workloads{}))
+	apiV1Ws.Route(
+		apiV1Ws.GET("/workload/{namespace}").
+			To(apiHandler.handleGetWorkloads).
+			Writes(workload.Workloads{}))
 
 	apiV1Ws.Route(
 		apiV1Ws.GET("/replicaset").
 			To(apiHandler.handleGetReplicaSets).
 			Writes(replicaset.ReplicaSetList{}))
+	apiV1Ws.Route(
+		apiV1Ws.GET("/replicaset/{namespace}").
+			To(apiHandler.handleGetReplicaSets).
+			Writes(replicaset.ReplicaSetList{}))
 	apiV1Ws.Route(
 		apiV1Ws.GET("/replicaset/{namespace}/{replicaSet}").
 			To(apiHandler.handleGetReplicaSetDetail).
@@ -165,6 +178,10 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient,
 		apiV1Ws.GET("/pod").
 			To(apiHandler.handleGetPods).
 			Writes(pod.PodList{}))
+	apiV1Ws.Route(
+		apiV1Ws.GET("/pod/{namespace}").
+			To(apiHandler.handleGetPods).
+			Writes(pod.PodList{}))
 	apiV1Ws.Route(
 		apiV1Ws.GET("/pod/{namespace}/{pod}").
 			To(apiHandler.handleGetPodDetail).
@@ -174,7 +191,10 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient,
 		apiV1Ws.GET("/deployment").
 			To(apiHandler.handleGetDeployments).
 			Writes(deployment.DeploymentList{}))
-
+	apiV1Ws.Route(
+		apiV1Ws.GET("/deployment/{namespace}").
+			To(apiHandler.handleGetDeployments).
+			Writes(deployment.DeploymentList{}))
 	apiV1Ws.Route(
 		apiV1Ws.GET("/deployment/{namespace}/{deployment}").
 			To(apiHandler.handleGetDeploymentDetail).
@@ -184,6 +204,10 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient,
 		apiV1Ws.GET("/daemonset").
 			To(apiHandler.handleGetDaemonSetList).
 			Writes(daemonset.DaemonSetList{}))
+	apiV1Ws.Route(
+		apiV1Ws.GET("/daemonset/{namespace}").
+			To(apiHandler.handleGetDaemonSetList).
+			Writes(daemonset.DaemonSetList{}))
 	apiV1Ws.Route(
 		apiV1Ws.GET("/daemonset/{namespace}/{daemonSet}").
 			To(apiHandler.handleGetDaemonSetDetail).
@@ -230,6 +254,10 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient,
 		apiV1Ws.GET("/service").
 			To(apiHandler.handleGetServiceList).
 			Writes(resourceService.ServiceList{}))
+	apiV1Ws.Route(
+		apiV1Ws.GET("/service/{namespace}").
+			To(apiHandler.handleGetServiceList).
+			Writes(resourceService.ServiceList{}))
 	apiV1Ws.Route(
 		apiV1Ws.GET("/service/{namespace}/{service}").
 			To(apiHandler.handleGetServiceDetail).
@@ -244,7 +272,8 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient,
 
 // Handles get service list API call.
 func (apiHandler *ApiHandler) handleGetServiceList(request *restful.Request, response *restful.Response) {
-	result, err := resourceService.GetServiceList(apiHandler.client)
+	namespace := parseNamespacePathParameter(request)
+	result, err := resourceService.GetServiceList(apiHandler.client, namespace)
 	if err != nil {
 		handleInternalError(response, err)
 		return
@@ -361,7 +390,8 @@ func (apiHandler *ApiHandler) handleGetAvailableProcotols(request *restful.Reque
 func (apiHandler *ApiHandler) handleGetReplicationControllerList(
 	request *restful.Request, response *restful.Response) {
 
-	result, err := GetReplicationControllerList(apiHandler.client)
+	namespace := parseNamespacePathParameter(request)
+	result, err := GetReplicationControllerList(apiHandler.client, namespace)
 	if err != nil {
 		handleInternalError(response, err)
 		return
@@ -374,7 +404,8 @@ func (apiHandler *ApiHandler) handleGetReplicationControllerList(
 func (apiHandler *ApiHandler) handleGetWorkloads(
 	request *restful.Request, response *restful.Response) {
 
-	result, err := workload.GetWorkloads(apiHandler.client, apiHandler.heapsterClient)
+	namespace := parseNamespacePathParameter(request)
+	result, err := workload.GetWorkloads(apiHandler.client, apiHandler.heapsterClient, namespace)
 	if err != nil {
 		handleInternalError(response, err)
 		return
@@ -387,7 +418,8 @@ func (apiHandler *ApiHandler) handleGetWorkloads(
 func (apiHandler *ApiHandler) handleGetReplicaSets(
 	request *restful.Request, response *restful.Response) {
 
-	result, err := replicaset.GetReplicaSetList(apiHandler.client)
+	namespace := parseNamespacePathParameter(request)
+	result, err := replicaset.GetReplicaSetList(apiHandler.client, namespace)
 	if err != nil {
 		handleInternalError(response, err)
 		return
@@ -416,7 +448,8 @@ func (apiHandler *ApiHandler) handleGetReplicaSetDetail(
 func (apiHandler *ApiHandler) handleGetDeployments(
 	request *restful.Request, response *restful.Response) {
 
-	result, err := deployment.GetDeploymentList(apiHandler.client)
+	namespace := parseNamespacePathParameter(request)
+	result, err := deployment.GetDeploymentList(apiHandler.client, namespace)
 	if err != nil {
 		handleInternalError(response, err)
 		return
@@ -445,7 +478,8 @@ func (apiHandler *ApiHandler) handleGetDeploymentDetail(
 func (apiHandler *ApiHandler) handleGetPods(
 	request *restful.Request, response *restful.Response) {
 
-	result, err := pod.GetPodList(apiHandler.client, apiHandler.heapsterClient)
+	namespace := parseNamespacePathParameter(request)
+	result, err := pod.GetPodList(apiHandler.client, apiHandler.heapsterClient, namespace)
 	if err != nil {
 		handleInternalError(response, err)
 		return
@@ -652,7 +686,7 @@ func handleInternalError(response *restful.Response, err error) {
 func (apiHandler *ApiHandler) handleGetDaemonSetList(
 	request *restful.Request, response *restful.Response) {
 
-	namespace := request.PathParameter("namespace")
+	namespace := parseNamespacePathParameter(request)
 	result, err := daemonset.GetDaemonSetList(apiHandler.client, namespace)
 	if err != nil {
 		handleInternalError(response, err)
@@ -697,3 +731,19 @@ func (apiHandler *ApiHandler) handleDeleteDaemonSet(
 
 	response.WriteHeader(http.StatusOK)
 }
+
+// parseNamespacePathParameter parses namespace selector for list pages in path paramater.
+// The namespace selector is a comma separated list of namespaces that are trimmed.
+// No namespaces means "view all user namespaces", i.e., everything except kube-system.
+func parseNamespacePathParameter(request *restful.Request) *common.NamespaceQuery {
+	namespace := request.PathParameter("namespace")
+	namespaces := strings.Split(namespace, ",")
+	var nonEmptyNamespaces []string
+	for _, n := range namespaces {
+		n = strings.Trim(n, " ")
+		if len(n) > 0 {
+			nonEmptyNamespaces = append(nonEmptyNamespaces, n)
+		}
+	}
+	return common.NewNamespaceQuery(nonEmptyNamespaces)
+}

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

@@ -0,0 +1,61 @@
+// 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 common
+
+import "k8s.io/kubernetes/pkg/api"
+
+// NamespaceQuery is a query for namespaces of a list of objects.
+// There's three cases:
+// 1. No namespace selected: this means "user namespaces" query, i.e., all except kube-system
+// 2. Single namespace selected: this allows for optimizations when querying backends
+// 3. More than one namespace selected: resources from all namespaces are queried and then
+//    filtered here.
+type NamespaceQuery struct {
+	namespaces []string
+}
+
+// NewSameNamespaceQuery creates new namespace query that queries single namespace.
+func NewSameNamespaceQuery(namespace string) *NamespaceQuery {
+	return &NamespaceQuery{[]string{namespace}}
+}
+
+// NewNamespaceQuery creates new query for given namespaces.
+func NewNamespaceQuery(namespaces []string) *NamespaceQuery {
+	return &NamespaceQuery{namespaces}
+}
+
+// ToRequestParam returns K8s API namespace query for list of objects from this namespaces.
+// This is an optimization to query for single namespace if one was selected and for all
+// namespaces otherwise.
+func (n *NamespaceQuery) ToRequestParam() string {
+	if len(n.namespaces) == 1 {
+		return n.namespaces[0]
+	}
+	return api.NamespaceAll
+}
+
+// Matches returns true when the given namespace matches this query.
+func (n *NamespaceQuery) Matches(namespace string) bool {
+	if len(n.namespaces) == 0 {
+		return namespace != api.NamespaceSystem
+	}
+
+	for _, queryNamespace := range n.namespaces {
+		if namespace == queryNamespace {
+			return true
+		}
+	}
+	return false
+}