github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-11 04:52:08 +00:00
Code Issues Projects Releases Wiki Activity

remove hard coding Namespace

Browse Source
This commit is contained in:
hzxuzhonghu 2018-01-04 11:57:40 +08:00
parent 17ffacc37f
commit 9669acc38e
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
staging/src/k8s.io/apiserver/pkg/endpoints/request/context.go
View File

@ -21,6 +21,7 @@ import (
"time" "time"
"golang.org/x/net/context" "golang.org/x/net/context"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/apiserver/pkg/apis/audit" "k8s.io/apiserver/pkg/apis/audit"
"k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authentication/user"
@ -66,8 +67,6 @@ const (
// auditKey is the context key for the audit event. // auditKey is the context key for the audit event.
auditKey auditKey
namespaceDefault = "default" // TODO(sttts): solve import cycle when using metav1.NamespaceDefault
) )
// NewContext instantiates a base context object for request flows. // NewContext instantiates a base context object for request flows.
@ -77,7 +76,7 @@ func NewContext() Context {
// NewDefaultContext instantiates a base context object for request flows in the default namespace // NewDefaultContext instantiates a base context object for request flows in the default namespace
func NewDefaultContext() Context { func NewDefaultContext() Context {
return WithNamespace(NewContext(), namespaceDefault) return WithNamespace(NewContext(), metav1.NamespaceDefault)
} }
// WithValue returns a copy of parent in which the value associated with key is val. // WithValue returns a copy of parent in which the value associated with key is val.
@ -110,7 +109,7 @@ func NamespaceValue(ctx Context) string {
func WithNamespaceDefaultIfNone(parent Context) Context { func WithNamespaceDefaultIfNone(parent Context) Context {
namespace, ok := NamespaceFrom(parent) namespace, ok := NamespaceFrom(parent)
if !ok || len(namespace) == 0 { if !ok || len(namespace) == 0 {
return WithNamespace(parent, namespaceDefault) return WithNamespace(parent, metav1.NamespaceDefault)
} }
return parent return parent
} }

3
staging/src/k8s.io/apiserver/pkg/endpoints/request/requestinfo.go
View File

@ -21,6 +21,7 @@ import (
"net/http" "net/http"
"strings" "strings"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
) )
@ -178,7 +179,7 @@ func (r *RequestInfoFactory) NewRequestInfo(req *http.Request) (*RequestInfo, er
} }
} }
} else { } else {
requestInfo.Namespace = "" // TODO(sttts): solve import cycle when using metav1.NamespaceNone requestInfo.Namespace = metav1.NamespaceNone
} }
// parsing successful, so we now know the proper value for .Parts // parsing successful, so we now know the proper value for .Parts

3
staging/src/k8s.io/apiserver/pkg/endpoints/request/requestinfo_test.go
View File

@ -21,6 +21,7 @@ import (
"reflect" "reflect"
"testing" "testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
) )
@ -31,7 +32,7 @@ func (f fakeRL) TryAccept() bool { return bool(f) }
func (f fakeRL) Accept() {} func (f fakeRL) Accept() {}
func TestGetAPIRequestInfo(t *testing.T) { func TestGetAPIRequestInfo(t *testing.T) {
namespaceAll := "" // TODO(sttts): solve import cycle when using metav1.NamespaceAll namespaceAll := metav1.NamespaceAll
successCases := []struct { successCases := []struct {
method string method string
url string url string