kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50094 from sttts/sttts-no-importprefix 

Automatic merge from submit-queue (batch tested with PRs 50094, 48966, 49478, 50593, 49140)

apimachinery: remove pre-apigroups import path logic

Replacing #50093.

Kubernetes-commit: 9f902fef246851c11e4d17c9597853a6156688a4
This commit is contained in:
Kubernetes Publisher 2017-08-14 12:14:55 -07:00
parent 521652b00c 2384086d1e
commit e82277a8ca
5 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
Godeps/Godeps.json generated
View File

@ -808,235 +808,235 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/equality", "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/errors", "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/meta", "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/resource", "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/testing", "ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip", "ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/validation", "ImportPath": "k8s.io/apimachinery/pkg/api/validation",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/validation/path", "ImportPath": "k8s.io/apimachinery/pkg/api/validation/path",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery", "ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced", "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered", "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion", "ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured", "ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/fields", "ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/labels", "ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime", "ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/selection", "ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/types", "ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/cache", "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/clock", "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/diff", "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/errors", "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/framer", "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream", "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr", "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/json", "ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/net", "ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/proxy", "ImportPath": "k8s.io/apimachinery/pkg/util/proxy",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/rand", "ImportPath": "k8s.io/apimachinery/pkg/util/rand",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime", "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/sets", "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/uuid", "ImportPath": "k8s.io/apimachinery/pkg/util/uuid",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation", "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/wait", "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml", "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/version", "ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/watch", "ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "92044309870430a96dc310e4f49cf9234c4f66e4" "Rev": "ce3cdfeed84dbf2c73db8ae4aaefd0548749e623"
}, },
{ {
"ImportPath": "k8s.io/client-go/discovery", "ImportPath": "k8s.io/client-go/discovery",

1
pkg/apis/apiserver/install/install.go
View File

@ -32,7 +32,6 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r
GroupName: apiserver.GroupName, GroupName: apiserver.GroupName,
RootScopedKinds: sets.NewString("APIService"), RootScopedKinds: sets.NewString("APIService"),
VersionPreferenceOrder: []string{v1alpha1.SchemeGroupVersion.Version}, VersionPreferenceOrder: []string{v1alpha1.SchemeGroupVersion.Version},
ImportPrefix: "k8s.io/apiserver/pkg/apis/apiserver",
AddInternalObjectsToScheme: apiserver.AddToScheme, AddInternalObjectsToScheme: apiserver.AddToScheme,
}, },
announced.VersionToSchemeFunc{ announced.VersionToSchemeFunc{

1
pkg/apis/audit/install/install.go
View File

@ -33,7 +33,6 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r
&announced.GroupMetaFactoryArgs{ &announced.GroupMetaFactoryArgs{
GroupName: audit.GroupName, GroupName: audit.GroupName,
VersionPreferenceOrder: []string{v1alpha1.SchemeGroupVersion.Version}, VersionPreferenceOrder: []string{v1alpha1.SchemeGroupVersion.Version},
ImportPrefix: "k8s.io/apiserver/pkg/apis/audit",
// Any Kind that is not namespaced must be cluster scoped. // Any Kind that is not namespaced must be cluster scoped.
RootScopedKinds: sets.NewString("Event", "Policy"), RootScopedKinds: sets.NewString("Event", "Policy"),
AddInternalObjectsToScheme: audit.AddToScheme, AddInternalObjectsToScheme: audit.AddToScheme,

1
pkg/apis/example/install/install.go
View File

@ -32,7 +32,6 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r
&announced.GroupMetaFactoryArgs{ &announced.GroupMetaFactoryArgs{
GroupName: example.GroupName, GroupName: example.GroupName,
VersionPreferenceOrder: []string{examplev1.SchemeGroupVersion.Version}, VersionPreferenceOrder: []string{examplev1.SchemeGroupVersion.Version},
ImportPrefix: "k8s.io/apiserver/pkg/apis/example",
AddInternalObjectsToScheme: example.AddToScheme, AddInternalObjectsToScheme: example.AddToScheme,
}, },
announced.VersionToSchemeFunc{ announced.VersionToSchemeFunc{

5
pkg/server/genericapiserver_test.go
View File

@ -167,7 +167,10 @@ func TestInstallAPIGroups(t *testing.T) {
}, nil }, nil
} }
mapper := meta.NewDefaultRESTMapperFromScheme([]schema.GroupVersion{gv}, interfacesFor, "", sets.NewString(), sets.NewString(), scheme) mapper := meta.NewDefaultRESTMapper([]schema.GroupVersion{gv}, interfacesFor)
for kind := range scheme.KnownTypes(gv) {
mapper.Add(gv.WithKind(kind), meta.RESTScopeNamespace)
}
groupMeta := apimachinery.GroupMeta{ groupMeta := apimachinery.GroupMeta{
GroupVersion: gv, GroupVersion: gv,
GroupVersions: []schema.GroupVersion{gv}, GroupVersions: []schema.GroupVersion{gv},