github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 16:06:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #46112 from sttts/sttts-unversioned-to-meta

Browse Source 
Automatic merge from submit-queue

apimachinery: move unversioned registration to metav1

Follow-up from the discussions in https://github.com/kubernetes/kubernetes/pull/43027:

We need `Status` as unversioned type which is hardcoded to `GroupVersion{Group: "", Version: "v1"}`. If the core group is not in the scheme, we miss `Status`.

Fixing https://github.com/kubernetes/kubernetes/issues/47030.
This commit is contained in:
Kubernetes Submit Queue
2017-06-06 03:13:01 -07:00
committed by GitHub
parent f091722c38 e3b92a11f1
commit 8da89aeb00
7 changed files with 65 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/garbagecollector/metaonly/metaonly.go
View File

@@ -52,14 +52,14 @@ func NewMetadataCodecFactory() serializer.CodecFactory {
if kind.Version == runtime.APIVersionInternal {
continue
}
if kind == api.Unversioned.WithKind("Status") {
if kind == metav1.Unversioned.WithKind("Status") {
// this is added below as unversioned
continue
}
metaOnlyObject := gvkToMetadataOnlyObject(kind)
scheme.AddKnownTypeWithName(kind, metaOnlyObject)
}
scheme.AddUnversionedTypes(api.Unversioned, &metav1.Status{})
scheme.AddUnversionedTypes(metav1.Unversioned, &metav1.Status{})
return serializer.NewCodecFactory(scheme)
}