github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-09 21:21:14 +00:00
Code Issues Projects Releases Wiki Activity

Remove client from attributes, remove admission control interface, fix-up error codes

Browse Source
This commit is contained in:
derekwaynecarr
2015-01-07 14:33:21 -05:00
parent 2820c2c601
commit a56087cdf8
18 changed files with 84 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/integration/auth_test.go
View File

@@ -32,7 +32,6 @@ import (
"os"
"testing"
"github.com/GoogleCloudPlatform/kubernetes/pkg/admission"
"github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver"
"github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator"
"github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator/bearertoken"
@@ -41,6 +40,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/master"
"github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/admit"
"github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/auth/authenticator/token/tokentest"
)
@@ -307,7 +307,7 @@ func TestAuthModeAlwaysAllow(t *testing.T) {
EnableUISupport: false,
APIPrefix: "/api",
Authorizer: apiserver.NewAlwaysAllowAuthorizer(),
AdmissionControl: admission.NewAlwaysAdmitController(),
AdmissionControl: admit.NewAlwaysAdmit(),
})
transport := http.DefaultTransport
@@ -358,7 +358,7 @@ func TestAuthModeAlwaysDeny(t *testing.T) {
EnableUISupport: false,
APIPrefix: "/api",
Authorizer: apiserver.NewAlwaysDenyAuthorizer(),
AdmissionControl: admission.NewAlwaysAdmitController(),
AdmissionControl: admit.NewAlwaysAdmit(),
})
transport := http.DefaultTransport
@@ -424,7 +424,7 @@ func TestAliceNotForbiddenOrUnauthorized(t *testing.T) {
APIPrefix: "/api",
Authenticator: getTestTokenAuth(),
Authorizer: allowAliceAuthorizer{},
AdmissionControl: admission.NewAlwaysAdmitController(),
AdmissionControl: admit.NewAlwaysAdmit(),
})
transport := http.DefaultTransport
@@ -484,7 +484,7 @@ func TestBobIsForbidden(t *testing.T) {
APIPrefix: "/api",
Authenticator: getTestTokenAuth(),
Authorizer: allowAliceAuthorizer{},
AdmissionControl: admission.NewAlwaysAdmitController(),
AdmissionControl: admit.NewAlwaysAdmit(),
})
transport := http.DefaultTransport
@@ -544,7 +544,7 @@ func TestUnknownUserIsUnauthorized(t *testing.T) {
APIPrefix: "/api",
Authenticator: getTestTokenAuth(),
Authorizer: allowAliceAuthorizer{},
AdmissionControl: admission.NewAlwaysAdmitController(),
AdmissionControl: admit.NewAlwaysAdmit(),
})
transport := http.DefaultTransport
@@ -623,7 +623,7 @@ func TestNamespaceAuthorization(t *testing.T) {
APIPrefix: "/api",
Authenticator: getTestTokenAuth(),
Authorizer: a,
AdmissionControl: admission.NewAlwaysAdmitController(),
AdmissionControl: admit.NewAlwaysAdmit(),
})
transport := http.DefaultTransport
@@ -707,7 +707,7 @@ func TestKindAuthorization(t *testing.T) {
APIPrefix: "/api",
Authenticator: getTestTokenAuth(),
Authorizer: a,
AdmissionControl: admission.NewAlwaysAdmitController(),
AdmissionControl: admit.NewAlwaysAdmit(),
})
transport := http.DefaultTransport
@@ -785,7 +785,7 @@ func TestReadOnlyAuthorization(t *testing.T) {
APIPrefix: "/api",
Authenticator: getTestTokenAuth(),
Authorizer: a,
AdmissionControl: admission.NewAlwaysAdmitController(),
AdmissionControl: admit.NewAlwaysAdmit(),
})
transport := http.DefaultTransport

4
test/integration/client_test.go
View File

@@ -24,13 +24,13 @@ import (
"reflect"
"testing"
"github.com/GoogleCloudPlatform/kubernetes/pkg/admission"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
"github.com/GoogleCloudPlatform/kubernetes/pkg/master"
"github.com/GoogleCloudPlatform/kubernetes/pkg/version"
"github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/admit"
)
func init() {
@@ -57,7 +57,7 @@ func TestClient(t *testing.T) {
EnableUISupport: false,
APIPrefix: "/api",
Authorizer: apiserver.NewAlwaysAllowAuthorizer(),
AdmissionControl: admission.NewAlwaysAdmitController(),
AdmissionControl: admit.NewAlwaysAdmit(),
})
testCases := []string{