From 7209ca154361f8debcfda62299fbb05d7c6bfb83 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Mon, 27 Oct 2014 17:54:33 -0700 Subject: [PATCH] Make redirect handle namespaces just like proxy (which is weird and needs to be fixed but at least this will be consistent). --- pkg/apiserver/redirect.go | 6 +++++- pkg/apiserver/redirect_test.go | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/apiserver/redirect.go b/pkg/apiserver/redirect.go index f8b499d4e73..a9832291f24 100644 --- a/pkg/apiserver/redirect.go +++ b/pkg/apiserver/redirect.go @@ -30,7 +30,11 @@ type RedirectHandler struct { } func (r *RedirectHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { - ctx := api.NewContext() + ctx := api.NewDefaultContext() + namespace := req.URL.Query().Get("namespace") + if len(namespace) > 0 { + ctx = api.WithNamespace(ctx, namespace) + } parts := splitPath(req.URL.Path) if len(parts) != 2 || req.Method != "GET" { notFound(w, req) diff --git a/pkg/apiserver/redirect_test.go b/pkg/apiserver/redirect_test.go index 072c388858c..a17a286a16f 100644 --- a/pkg/apiserver/redirect_test.go +++ b/pkg/apiserver/redirect_test.go @@ -27,6 +27,7 @@ import ( func TestRedirect(t *testing.T) { simpleStorage := &SimpleRESTStorage{ errors: map[string]error{}, + expectedResourceNamespace: "default", } handler := Handle(map[string]RESTStorage{ "foo": simpleStorage,