github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Authorization should be registered in testapi

Browse Source
This commit is contained in:
Clayton Coleman 2016-11-01 21:32:08 -04:00
parent 8987019931
commit 95116c776e
No known key found for this signature in database
GPG Key ID: 3D16906B4F1C5CB3
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/api/testapi/BUILD
View File

@ -27,6 +27,7 @@ go_library(
"//pkg/apis/apps:go_default_library", "//pkg/apis/apps:go_default_library",
"//pkg/apis/apps/install:go_default_library", "//pkg/apis/apps/install:go_default_library",
"//pkg/apis/authentication/install:go_default_library", "//pkg/apis/authentication/install:go_default_library",
"//pkg/apis/authorization:go_default_library",
"//pkg/apis/authorization/install:go_default_library", "//pkg/apis/authorization/install:go_default_library",
"//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling:go_default_library",
"//pkg/apis/autoscaling/install:go_default_library", "//pkg/apis/autoscaling/install:go_default_library",

36
pkg/api/testapi/testapi.go
View File

@ -37,6 +37,7 @@ import (
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apimachinery/registered"
"k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/apps"
"k8s.io/kubernetes/pkg/apis/authorization"
"k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling"
"k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/batch"
"k8s.io/kubernetes/pkg/apis/certificates" "k8s.io/kubernetes/pkg/apis/certificates"
@ -66,18 +67,19 @@ import (
) )
var ( var (
Groups = make(map[string]TestGroup) Groups = make(map[string]TestGroup)
Default TestGroup Default TestGroup
Autoscaling TestGroup Authorization TestGroup
Batch TestGroup Autoscaling TestGroup
Extensions TestGroup Batch TestGroup
Apps TestGroup Extensions TestGroup
Policy TestGroup Apps TestGroup
Federation TestGroup Policy TestGroup
Rbac TestGroup Federation TestGroup
Certificates TestGroup Rbac TestGroup
Storage TestGroup Certificates TestGroup
ImagePolicy TestGroup Storage TestGroup
ImagePolicy TestGroup
serializer runtime.SerializerInfo serializer runtime.SerializerInfo
storageSerializer runtime.SerializerInfo storageSerializer runtime.SerializerInfo
@ -258,6 +260,15 @@ func init() {
externalTypes: api.Scheme.KnownTypes(externalGroupVersion), externalTypes: api.Scheme.KnownTypes(externalGroupVersion),
} }
} }
if _, ok := Groups[authorization.GroupName]; !ok {
externalGroupVersion := unversioned.GroupVersion{Group: authorization.GroupName, Version: registered.GroupOrDie(authorization.GroupName).GroupVersion.Version}
Groups[authorization.GroupName] = TestGroup{
externalGroupVersion: externalGroupVersion,
internalGroupVersion: authorization.SchemeGroupVersion,
internalTypes: api.Scheme.KnownTypes(authorization.SchemeGroupVersion),
externalTypes: api.Scheme.KnownTypes(externalGroupVersion),
}
}
if _, ok := Groups[kubeadm.GroupName]; !ok { if _, ok := Groups[kubeadm.GroupName]; !ok {
externalGroupVersion := unversioned.GroupVersion{Group: kubeadm.GroupName, Version: registered.GroupOrDie(kubeadm.GroupName).GroupVersion.Version} externalGroupVersion := unversioned.GroupVersion{Group: kubeadm.GroupName, Version: registered.GroupOrDie(kubeadm.GroupName).GroupVersion.Version}
Groups[kubeadm.GroupName] = TestGroup{ Groups[kubeadm.GroupName] = TestGroup{
@ -279,6 +290,7 @@ func init() {
Rbac = Groups[rbac.GroupName] Rbac = Groups[rbac.GroupName]
Storage = Groups[storage.GroupName] Storage = Groups[storage.GroupName]
ImagePolicy = Groups[imagepolicy.GroupName] ImagePolicy = Groups[imagepolicy.GroupName]
Authorization = Groups[authorization.GroupName]
} }
func (g TestGroup) ContentConfig() (string, *unversioned.GroupVersion, runtime.Codec) { func (g TestGroup) ContentConfig() (string, *unversioned.GroupVersion, runtime.Codec) {