github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

apiserver builds again

Browse Source
This commit is contained in:
Daniel Smith
2014-06-16 18:03:44 -07:00
parent 1c6342a794
commit 154ec0db1e
4 changed files with 51 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/apiserver/apiserver.go
View File

@@ -24,11 +24,13 @@ import (
"net/http"
"net/url"
"strings"
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
)
// RESTStorage is a generic interface for RESTful storage services
type RESTStorage interface {
List(LabelQuery) (interface{}, error)
List(labels.Query) (interface{}, error)
Get(id string) (interface{}, error)
Delete(id string) error
Extract(body string) (interface{}, error)
@@ -146,7 +148,7 @@ func (server *ApiServer) handleREST(parts []string, requestUrl *url.URL, req *ht
case "GET":
switch len(parts) {
case 1:
query, err := ParseLabelQuery(requestUrl.Query().Get("labels"))
query, err := labels.ParseQuery(requestUrl.Query().Get("labels"))
if err != nil {
server.error(err, w)
return