From 61d9fd6afc010d76ae9d86010897adf474295c50 Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Mon, 5 Dec 2016 14:15:52 +0100 Subject: [PATCH] Register GetOptions in all api groups --- pkg/api/serialization_test.go | 1 + pkg/api/v1/register.go | 1 + pkg/apis/apps/v1beta1/register.go | 1 + pkg/apis/authentication/register.go | 1 + pkg/apis/authentication/v1beta1/register.go | 1 + pkg/apis/authorization/v1beta1/register.go | 1 + pkg/apis/autoscaling/v1/register.go | 1 + pkg/apis/batch/v1/register.go | 1 + pkg/apis/certificates/v1alpha1/register.go | 1 + pkg/apis/extensions/register.go | 1 + pkg/apis/extensions/v1beta1/register.go | 1 + pkg/apis/imagepolicy/register.go | 1 + pkg/apis/imagepolicy/v1alpha1/register.go | 1 + pkg/apis/policy/v1alpha1/register.go | 1 + pkg/apis/policy/v1beta1/register.go | 1 + pkg/apis/rbac/register.go | 1 + pkg/apis/rbac/v1alpha1/register.go | 1 + pkg/apis/storage/register.go | 1 + pkg/apis/storage/v1beta1/register.go | 1 + 19 files changed, 19 insertions(+) diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go index 6f002645b73..5916e057783 100644 --- a/pkg/api/serialization_test.go +++ b/pkg/api/serialization_test.go @@ -238,6 +238,7 @@ func TestList(t *testing.T) { var nonRoundTrippableTypes = sets.NewString( "ExportOptions", + "GetOptions", // WatchEvent does not include kind and version and can only be deserialized // implicitly (if the caller expects the specific object). The watch call defines // the schema by content type, rather than via kind/version included in each diff --git a/pkg/api/v1/register.go b/pkg/api/v1/register.go index 73bf1371f47..15016d1283b 100644 --- a/pkg/api/v1/register.go +++ b/pkg/api/v1/register.go @@ -77,6 +77,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &PersistentVolumeClaimList{}, &DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, &ListOptions{}, &PodAttachOptions{}, &PodLogOptions{}, diff --git a/pkg/apis/apps/v1beta1/register.go b/pkg/apis/apps/v1beta1/register.go index 81b8a383288..484b12bfda3 100644 --- a/pkg/apis/apps/v1beta1/register.go +++ b/pkg/apis/apps/v1beta1/register.go @@ -48,6 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, ) versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/pkg/apis/authentication/register.go b/pkg/apis/authentication/register.go index de7949eb132..bd02b2c6d6c 100644 --- a/pkg/apis/authentication/register.go +++ b/pkg/apis/authentication/register.go @@ -49,6 +49,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, &TokenReview{}, ) diff --git a/pkg/apis/authentication/v1beta1/register.go b/pkg/apis/authentication/v1beta1/register.go index b61149dfea8..64b658042b9 100644 --- a/pkg/apis/authentication/v1beta1/register.go +++ b/pkg/apis/authentication/v1beta1/register.go @@ -45,6 +45,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, &TokenReview{}, ) diff --git a/pkg/apis/authorization/v1beta1/register.go b/pkg/apis/authorization/v1beta1/register.go index 33ac83c4f99..9b0df332008 100644 --- a/pkg/apis/authorization/v1beta1/register.go +++ b/pkg/apis/authorization/v1beta1/register.go @@ -46,6 +46,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, &SelfSubjectAccessReview{}, &SubjectAccessReview{}, diff --git a/pkg/apis/autoscaling/v1/register.go b/pkg/apis/autoscaling/v1/register.go index 1eee20f39cf..8e3f7b0dab6 100644 --- a/pkg/apis/autoscaling/v1/register.go +++ b/pkg/apis/autoscaling/v1/register.go @@ -49,6 +49,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, ) versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/pkg/apis/batch/v1/register.go b/pkg/apis/batch/v1/register.go index 5af162b46db..67472d83e9c 100644 --- a/pkg/apis/batch/v1/register.go +++ b/pkg/apis/batch/v1/register.go @@ -48,6 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, ) versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/pkg/apis/certificates/v1alpha1/register.go b/pkg/apis/certificates/v1alpha1/register.go index 04798dd6fb3..7d51e0a5eb7 100644 --- a/pkg/apis/certificates/v1alpha1/register.go +++ b/pkg/apis/certificates/v1alpha1/register.go @@ -53,6 +53,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, ) // Add the watch version that applies diff --git a/pkg/apis/extensions/register.go b/pkg/apis/extensions/register.go index e29ad885a50..f92937a4d29 100644 --- a/pkg/apis/extensions/register.go +++ b/pkg/apis/extensions/register.go @@ -73,6 +73,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ReplicaSet{}, &ReplicaSetList{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, &PodSecurityPolicy{}, &PodSecurityPolicyList{}, &NetworkPolicy{}, diff --git a/pkg/apis/extensions/v1beta1/register.go b/pkg/apis/extensions/v1beta1/register.go index 1f0886fbaf8..a9372a6e130 100644 --- a/pkg/apis/extensions/v1beta1/register.go +++ b/pkg/apis/extensions/v1beta1/register.go @@ -63,6 +63,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, &ReplicaSet{}, &ReplicaSetList{}, &PodSecurityPolicy{}, diff --git a/pkg/apis/imagepolicy/register.go b/pkg/apis/imagepolicy/register.go index aa469b913f5..6567e32cc63 100644 --- a/pkg/apis/imagepolicy/register.go +++ b/pkg/apis/imagepolicy/register.go @@ -49,6 +49,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, &ImageReview{}, ) diff --git a/pkg/apis/imagepolicy/v1alpha1/register.go b/pkg/apis/imagepolicy/v1alpha1/register.go index 817402ccb6d..9122ce5c409 100644 --- a/pkg/apis/imagepolicy/v1alpha1/register.go +++ b/pkg/apis/imagepolicy/v1alpha1/register.go @@ -45,6 +45,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, &ImageReview{}, ) diff --git a/pkg/apis/policy/v1alpha1/register.go b/pkg/apis/policy/v1alpha1/register.go index 25d1462bdb4..79a71437de2 100644 --- a/pkg/apis/policy/v1alpha1/register.go +++ b/pkg/apis/policy/v1alpha1/register.go @@ -49,6 +49,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, ) // Add the watch version that applies versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/pkg/apis/policy/v1beta1/register.go b/pkg/apis/policy/v1beta1/register.go index f36029170aa..48f20d938f6 100644 --- a/pkg/apis/policy/v1beta1/register.go +++ b/pkg/apis/policy/v1beta1/register.go @@ -49,6 +49,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, ) // Add the watch version that applies versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/pkg/apis/rbac/register.go b/pkg/apis/rbac/register.go index 8f962c9cda9..20fe77c8ecc 100644 --- a/pkg/apis/rbac/register.go +++ b/pkg/apis/rbac/register.go @@ -60,6 +60,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, ) versioned.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/pkg/apis/rbac/v1alpha1/register.go b/pkg/apis/rbac/v1alpha1/register.go index f2cd91d8c5d..c6b07a65afb 100644 --- a/pkg/apis/rbac/v1alpha1/register.go +++ b/pkg/apis/rbac/v1alpha1/register.go @@ -55,6 +55,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, ) versioned.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/pkg/apis/storage/register.go b/pkg/apis/storage/register.go index 6e5375d2faf..26207ec2d9f 100644 --- a/pkg/apis/storage/register.go +++ b/pkg/apis/storage/register.go @@ -49,6 +49,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, &StorageClass{}, &StorageClassList{}, diff --git a/pkg/apis/storage/v1beta1/register.go b/pkg/apis/storage/v1beta1/register.go index 59717557c5d..962394fa5fe 100644 --- a/pkg/apis/storage/v1beta1/register.go +++ b/pkg/apis/storage/v1beta1/register.go @@ -46,6 +46,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, + &metav1.GetOptions{}, &StorageClass{}, &StorageClassList{},