From f623a8c90858d95bd75803010dae94d77202fa55 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Thu, 19 Jan 2017 16:39:50 -0500 Subject: [PATCH] Make all groups use metav1.AddToGroupVersion for ListOptions --- .../apis/apiregistration/v1alpha1/register.go | 1 - cmd/kubeadm/app/apis/kubeadm/register.go | 1 - .../app/apis/kubeadm/v1alpha1/register.go | 2 +- .../test_apis/testgroup/register.go | 4 +- .../test_apis/testgroup/v1/register.go | 1 - federation/apis/core/register.go | 1 - federation/apis/core/v1/register.go | 1 - federation/apis/federation/register.go | 1 - .../apis/federation/v1beta1/register.go | 1 - pkg/apis/apps/register.go | 1 - pkg/apis/apps/v1beta1/register.go | 1 - pkg/apis/authentication/register.go | 1 - pkg/apis/authentication/v1beta1/register.go | 2 +- pkg/apis/authorization/register.go | 1 - pkg/apis/authorization/v1beta1/register.go | 1 - pkg/apis/autoscaling/register.go | 1 - pkg/apis/autoscaling/v1/register.go | 1 - pkg/apis/batch/register.go | 1 - pkg/apis/batch/v1/register.go | 1 - pkg/apis/batch/v2alpha1/register.go | 1 - pkg/apis/certificates/register.go | 1 - pkg/apis/certificates/v1beta1/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 | 2 +- pkg/apis/policy/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/rbac/v1beta1/register.go | 1 - pkg/apis/storage/register.go | 1 - pkg/apis/storage/v1beta1/register.go | 1 - .../client-go/pkg/apis/apps/register.go | 1 - .../pkg/apis/apps/v1beta1/register.go | 1 - .../pkg/apis/authentication/register.go | 1 - .../apis/authentication/v1beta1/register.go | 2 +- .../pkg/apis/authorization/register.go | 1 - .../apis/authorization/v1beta1/register.go | 1 - .../pkg/apis/autoscaling/register.go | 1 - .../pkg/apis/autoscaling/v1/register.go | 1 - .../client-go/pkg/apis/batch/register.go | 1 - .../client-go/pkg/apis/batch/v1/register.go | 1 - .../pkg/apis/batch/v2alpha1/register.go | 1 - .../pkg/apis/certificates/register.go | 1 - .../pkg/apis/certificates/v1beta1/register.go | 1 - .../client-go/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 - .../client-go/pkg/apis/policy/register.go | 1 - .../pkg/apis/policy/v1alpha1/register.go | 55 +++++++++++++++++++ .../client-go/pkg/apis/rbac/register.go | 1 - .../pkg/apis/rbac/v1alpha1/register.go | 1 - .../pkg/apis/rbac/v1beta1/register.go | 1 - .../client-go/pkg/apis/storage/register.go | 1 - .../pkg/apis/storage/v1beta1/register.go | 1 - 58 files changed, 60 insertions(+), 59 deletions(-) create mode 100644 staging/src/k8s.io/client-go/pkg/apis/policy/v1alpha1/register.go diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/register.go b/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/register.go index 6e3d7118556..c27ec268d9e 100644 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/register.go +++ b/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1/register.go @@ -39,7 +39,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &APIService{}, &APIServiceList{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.GetOptions{}, ) diff --git a/cmd/kubeadm/app/apis/kubeadm/register.go b/cmd/kubeadm/app/apis/kubeadm/register.go index 40f71023aed..f9e2b094b29 100644 --- a/cmd/kubeadm/app/apis/kubeadm/register.go +++ b/cmd/kubeadm/app/apis/kubeadm/register.go @@ -49,7 +49,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &MasterConfiguration{}, &NodeConfiguration{}, &ClusterInfo{}, - &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, ) diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go index 95ebf6d6120..f308501d3d4 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go @@ -49,10 +49,10 @@ func addKnownTypes(scheme *runtime.Scheme) error { &MasterConfiguration{}, &NodeConfiguration{}, &ClusterInfo{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, ) + metav1.AddToGroupVersion(scheme, SchemeGroupVersion) return nil } diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/register.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/register.go index bf9d93285be..589a44b8080 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/register.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/register.go @@ -36,9 +36,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &TestTypeList{}, ) - scheme.AddKnownTypes(SchemeGroupVersion, - &api.ListOptions{}, - ) + scheme.AddKnownTypes(SchemeGroupVersion) return nil } diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go index 65230b6c805..664157276f4 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go @@ -38,7 +38,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { ) scheme.AddKnownTypes(SchemeGroupVersion, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.Status{}, &metav1.ExportOptions{}, diff --git a/federation/apis/core/register.go b/federation/apis/core/register.go index 211ad6c39a5..49f8f3c1824 100644 --- a/federation/apis/core/register.go +++ b/federation/apis/core/register.go @@ -67,7 +67,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &api.Service{}, &api.Namespace{}, &api.NamespaceList{}, - &api.ListOptions{}, &api.DeleteOptions{}, &api.Secret{}, &api.SecretList{}, diff --git a/federation/apis/core/v1/register.go b/federation/apis/core/v1/register.go index 60ffe080804..47845d03fc4 100644 --- a/federation/apis/core/v1/register.go +++ b/federation/apis/core/v1/register.go @@ -41,7 +41,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.Namespace{}, &v1.NamespaceList{}, &v1.ServiceList{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &v1.Secret{}, &v1.SecretList{}, diff --git a/federation/apis/federation/register.go b/federation/apis/federation/register.go index a99744cefc2..bb65fb625ff 100644 --- a/federation/apis/federation/register.go +++ b/federation/apis/federation/register.go @@ -47,7 +47,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &Cluster{}, &ClusterList{}, - &api.ListOptions{}, &api.DeleteOptions{}, ) return nil diff --git a/federation/apis/federation/v1beta1/register.go b/federation/apis/federation/v1beta1/register.go index b1c9eda5330..785dd5ecd7c 100644 --- a/federation/apis/federation/v1beta1/register.go +++ b/federation/apis/federation/v1beta1/register.go @@ -38,7 +38,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &Cluster{}, &ClusterList{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/pkg/apis/apps/register.go b/pkg/apis/apps/register.go index 109b10b140d..19558e99d79 100644 --- a/pkg/apis/apps/register.go +++ b/pkg/apis/apps/register.go @@ -49,7 +49,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &StatefulSet{}, &StatefulSetList{}, - &api.ListOptions{}, &api.DeleteOptions{}, ) return nil diff --git a/pkg/apis/apps/v1beta1/register.go b/pkg/apis/apps/v1beta1/register.go index 726c63a5a73..24ef544de76 100644 --- a/pkg/apis/apps/v1beta1/register.go +++ b/pkg/apis/apps/v1beta1/register.go @@ -44,7 +44,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &StatefulSet{}, &StatefulSetList{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/pkg/apis/authentication/register.go b/pkg/apis/authentication/register.go index d6c8b89b72c..2cc56eed6c3 100644 --- a/pkg/apis/authentication/register.go +++ b/pkg/apis/authentication/register.go @@ -46,7 +46,6 @@ var ( func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, - &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/pkg/apis/authentication/v1beta1/register.go b/pkg/apis/authentication/v1beta1/register.go index f29dae3ccf4..a0ff1c2cd20 100644 --- a/pkg/apis/authentication/v1beta1/register.go +++ b/pkg/apis/authentication/v1beta1/register.go @@ -42,12 +42,12 @@ var ( // Adds the list of known types to api.Scheme. func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, &TokenReview{}, ) + metav1.AddToGroupVersion(scheme, SchemeGroupVersion) return nil } diff --git a/pkg/apis/authorization/register.go b/pkg/apis/authorization/register.go index 55c6020b563..ff8c9fa482a 100644 --- a/pkg/apis/authorization/register.go +++ b/pkg/apis/authorization/register.go @@ -46,7 +46,6 @@ var ( func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, - &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/pkg/apis/authorization/v1beta1/register.go b/pkg/apis/authorization/v1beta1/register.go index ed6a234ad8f..7fb5ea8f9cd 100644 --- a/pkg/apis/authorization/v1beta1/register.go +++ b/pkg/apis/authorization/v1beta1/register.go @@ -42,7 +42,6 @@ var ( // Adds the list of known types to api.Scheme. func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/pkg/apis/autoscaling/register.go b/pkg/apis/autoscaling/register.go index 1526188f741..069b7c96cfb 100644 --- a/pkg/apis/autoscaling/register.go +++ b/pkg/apis/autoscaling/register.go @@ -49,7 +49,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &Scale{}, &HorizontalPodAutoscaler{}, &HorizontalPodAutoscalerList{}, - &api.ListOptions{}, &api.DeleteOptions{}, ) return nil diff --git a/pkg/apis/autoscaling/v1/register.go b/pkg/apis/autoscaling/v1/register.go index 8f57373b916..7b885b32e41 100644 --- a/pkg/apis/autoscaling/v1/register.go +++ b/pkg/apis/autoscaling/v1/register.go @@ -45,7 +45,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &HorizontalPodAutoscaler{}, &HorizontalPodAutoscalerList{}, &Scale{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/pkg/apis/batch/register.go b/pkg/apis/batch/register.go index b28019e4a8d..563809f517e 100644 --- a/pkg/apis/batch/register.go +++ b/pkg/apis/batch/register.go @@ -51,7 +51,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &JobTemplate{}, &CronJob{}, &CronJobList{}, - &api.ListOptions{}, &api.DeleteOptions{}, ) scheme.AddKnownTypeWithName(SchemeGroupVersion.WithKind("ScheduledJob"), &CronJob{}) diff --git a/pkg/apis/batch/v1/register.go b/pkg/apis/batch/v1/register.go index d47aaf8956b..3177c146ac3 100644 --- a/pkg/apis/batch/v1/register.go +++ b/pkg/apis/batch/v1/register.go @@ -44,7 +44,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &Job{}, &JobList{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/pkg/apis/batch/v2alpha1/register.go b/pkg/apis/batch/v2alpha1/register.go index 83c16856276..281050a9cf1 100644 --- a/pkg/apis/batch/v2alpha1/register.go +++ b/pkg/apis/batch/v2alpha1/register.go @@ -47,7 +47,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &JobTemplate{}, &CronJob{}, &CronJobList{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/pkg/apis/certificates/register.go b/pkg/apis/certificates/register.go index fe7dcd4e2ba..c0e8d4a14b4 100644 --- a/pkg/apis/certificates/register.go +++ b/pkg/apis/certificates/register.go @@ -48,7 +48,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &CertificateSigningRequest{}, &CertificateSigningRequestList{}, - &api.ListOptions{}, &api.DeleteOptions{}, ) return nil diff --git a/pkg/apis/certificates/v1beta1/register.go b/pkg/apis/certificates/v1beta1/register.go index c60915dd192..fee09fae21d 100644 --- a/pkg/apis/certificates/v1beta1/register.go +++ b/pkg/apis/certificates/v1beta1/register.go @@ -49,7 +49,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &CertificateSigningRequest{}, &CertificateSigningRequestList{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/pkg/apis/extensions/register.go b/pkg/apis/extensions/register.go index c7fbf67ff4e..2009257c5bb 100644 --- a/pkg/apis/extensions/register.go +++ b/pkg/apis/extensions/register.go @@ -64,7 +64,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ThirdPartyResourceDataList{}, &Ingress{}, &IngressList{}, - &api.ListOptions{}, &api.DeleteOptions{}, &ReplicaSet{}, &ReplicaSetList{}, diff --git a/pkg/apis/extensions/v1beta1/register.go b/pkg/apis/extensions/v1beta1/register.go index d0761bc8990..9a0be6c246a 100644 --- a/pkg/apis/extensions/v1beta1/register.go +++ b/pkg/apis/extensions/v1beta1/register.go @@ -57,7 +57,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ThirdPartyResourceDataList{}, &Ingress{}, &IngressList{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/pkg/apis/imagepolicy/register.go b/pkg/apis/imagepolicy/register.go index 93efea73f1a..62a10e7444b 100644 --- a/pkg/apis/imagepolicy/register.go +++ b/pkg/apis/imagepolicy/register.go @@ -46,7 +46,6 @@ var ( func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, - &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/pkg/apis/imagepolicy/v1alpha1/register.go b/pkg/apis/imagepolicy/v1alpha1/register.go index 1f3c708c418..afe3e140046 100644 --- a/pkg/apis/imagepolicy/v1alpha1/register.go +++ b/pkg/apis/imagepolicy/v1alpha1/register.go @@ -42,12 +42,12 @@ var ( // Adds the list of known types to api.Scheme. func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, &ImageReview{}, ) + metav1.AddToGroupVersion(scheme, SchemeGroupVersion) return nil } diff --git a/pkg/apis/policy/register.go b/pkg/apis/policy/register.go index a3a1a35afb1..4dfe64242e4 100644 --- a/pkg/apis/policy/register.go +++ b/pkg/apis/policy/register.go @@ -48,7 +48,6 @@ var ( func addKnownTypes(scheme *runtime.Scheme) error { // TODO this gets cleaned up when the types are fixed scheme.AddKnownTypes(SchemeGroupVersion, - &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/pkg/apis/policy/v1alpha1/register.go b/pkg/apis/policy/v1alpha1/register.go index 4d2c767a1cd..18ad5eb3a14 100644 --- a/pkg/apis/policy/v1alpha1/register.go +++ b/pkg/apis/policy/v1alpha1/register.go @@ -45,7 +45,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &PodDisruptionBudget{}, &PodDisruptionBudgetList{}, &Eviction{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/pkg/apis/policy/v1beta1/register.go b/pkg/apis/policy/v1beta1/register.go index 4c16e4a3bf5..17f6bfd8e9f 100644 --- a/pkg/apis/policy/v1beta1/register.go +++ b/pkg/apis/policy/v1beta1/register.go @@ -45,7 +45,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &PodDisruptionBudget{}, &PodDisruptionBudgetList{}, &Eviction{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/pkg/apis/rbac/register.go b/pkg/apis/rbac/register.go index 25305221ec6..f1b2102870b 100644 --- a/pkg/apis/rbac/register.go +++ b/pkg/apis/rbac/register.go @@ -56,7 +56,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ClusterRoleBindingList{}, &ClusterRoleList{}, - &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/pkg/apis/rbac/v1alpha1/register.go b/pkg/apis/rbac/v1alpha1/register.go index e7f1024699b..7c462510206 100644 --- a/pkg/apis/rbac/v1alpha1/register.go +++ b/pkg/apis/rbac/v1alpha1/register.go @@ -51,7 +51,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ClusterRoleBindingList{}, &ClusterRoleList{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/pkg/apis/rbac/v1beta1/register.go b/pkg/apis/rbac/v1beta1/register.go index 2009c3de5bb..314e661227d 100644 --- a/pkg/apis/rbac/v1beta1/register.go +++ b/pkg/apis/rbac/v1beta1/register.go @@ -51,7 +51,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ClusterRoleBindingList{}, &ClusterRoleList{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/pkg/apis/storage/register.go b/pkg/apis/storage/register.go index 1e2a5ef6ccb..a35f4e262d8 100644 --- a/pkg/apis/storage/register.go +++ b/pkg/apis/storage/register.go @@ -46,7 +46,6 @@ var ( func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, - &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/pkg/apis/storage/v1beta1/register.go b/pkg/apis/storage/v1beta1/register.go index aa056f16219..759ab44600a 100644 --- a/pkg/apis/storage/v1beta1/register.go +++ b/pkg/apis/storage/v1beta1/register.go @@ -42,7 +42,6 @@ var ( // Adds the list of known types to api.Scheme. func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/register.go b/staging/src/k8s.io/client-go/pkg/apis/apps/register.go index a5e4e7ca8f9..fc1ea934882 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/register.go @@ -49,7 +49,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &StatefulSet{}, &StatefulSetList{}, - &api.ListOptions{}, &api.DeleteOptions{}, ) return nil diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/register.go b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/register.go index bdef65d8519..bf5ae0c73cb 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/register.go @@ -44,7 +44,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &StatefulSet{}, &StatefulSetList{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/register.go b/staging/src/k8s.io/client-go/pkg/apis/authentication/register.go index 73c214d5d1b..9233bf95b82 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authentication/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/register.go @@ -46,7 +46,6 @@ var ( func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, - &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/register.go b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/register.go index fa5216acc7c..91f7cb09956 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/register.go @@ -42,12 +42,12 @@ var ( // Adds the list of known types to api.Scheme. func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, &TokenReview{}, ) + metav1.AddToGroupVersion(scheme, SchemeGroupVersion) return nil } diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/register.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/register.go index 4a369e9b437..11da9c78a67 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authorization/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/register.go @@ -46,7 +46,6 @@ var ( func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, - &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/register.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/register.go index 5e60571db08..fba266f5923 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/register.go @@ -42,7 +42,6 @@ var ( // Adds the list of known types to api.Scheme. func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/register.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/register.go index b2f7398d182..814c076b1c7 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/register.go @@ -49,7 +49,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &Scale{}, &HorizontalPodAutoscaler{}, &HorizontalPodAutoscalerList{}, - &api.ListOptions{}, &api.DeleteOptions{}, ) return nil diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/register.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/register.go index c1ef0f85688..2dbc47339de 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/register.go @@ -45,7 +45,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &HorizontalPodAutoscaler{}, &HorizontalPodAutoscalerList{}, &Scale{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/register.go b/staging/src/k8s.io/client-go/pkg/apis/batch/register.go index ba2190a5f02..a505582646e 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/register.go @@ -51,7 +51,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &JobTemplate{}, &CronJob{}, &CronJobList{}, - &api.ListOptions{}, &api.DeleteOptions{}, ) scheme.AddKnownTypeWithName(SchemeGroupVersion.WithKind("ScheduledJob"), &CronJob{}) diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/register.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/register.go index 61d924eecb5..6463b62f7bb 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/register.go @@ -44,7 +44,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &Job{}, &JobList{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/register.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/register.go index b462cca49c2..92318111708 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/register.go @@ -47,7 +47,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &JobTemplate{}, &CronJob{}, &CronJobList{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/register.go b/staging/src/k8s.io/client-go/pkg/apis/certificates/register.go index 73584e8a7f6..8eadfec3a1c 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/certificates/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/register.go @@ -48,7 +48,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &CertificateSigningRequest{}, &CertificateSigningRequestList{}, - &api.ListOptions{}, &api.DeleteOptions{}, ) return nil diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1beta1/register.go b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1beta1/register.go index c99127b800d..ecdcdfeaf36 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1beta1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1beta1/register.go @@ -49,7 +49,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &CertificateSigningRequest{}, &CertificateSigningRequestList{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/register.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/register.go index 97741e4d308..ff51b4bccc7 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/register.go @@ -64,7 +64,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ThirdPartyResourceDataList{}, &Ingress{}, &IngressList{}, - &api.ListOptions{}, &api.DeleteOptions{}, &ReplicaSet{}, &ReplicaSetList{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/register.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/register.go index d27bba62698..769f4737689 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/register.go @@ -57,7 +57,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ThirdPartyResourceDataList{}, &Ingress{}, &IngressList{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/register.go b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/register.go index 0978171b7de..4f1f6e0dab4 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/register.go @@ -46,7 +46,6 @@ var ( func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, - &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/register.go b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/register.go index be5112f5da7..f0e42352df2 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/register.go @@ -42,7 +42,6 @@ var ( // Adds the list of known types to api.Scheme. func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/register.go b/staging/src/k8s.io/client-go/pkg/apis/policy/register.go index 9e867a804e0..1e3c7d30fd2 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/register.go @@ -48,7 +48,6 @@ var ( func addKnownTypes(scheme *runtime.Scheme) error { // TODO this gets cleaned up when the types are fixed scheme.AddKnownTypes(SchemeGroupVersion, - &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1alpha1/register.go b/staging/src/k8s.io/client-go/pkg/apis/policy/v1alpha1/register.go new file mode 100644 index 00000000000..6dd8648ba35 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/v1alpha1/register.go @@ -0,0 +1,55 @@ +/* +Copyright 2015 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1alpha1 + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/client-go/pkg/api/v1" +) + +// GroupName is the group name use in this package +const GroupName = "policy" + +// SchemeGroupVersion is group version used to register these objects +var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} + +// Resource takes an unqualified resource and returns a Group qualified GroupResource +func Resource(resource string) schema.GroupResource { + return SchemeGroupVersion.WithResource(resource).GroupResource() +} + +var ( + SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) + AddToScheme = SchemeBuilder.AddToScheme +) + +// Adds the list of known types to api.Scheme. +func addKnownTypes(scheme *runtime.Scheme) error { + scheme.AddKnownTypes(SchemeGroupVersion, + &PodDisruptionBudget{}, + &PodDisruptionBudgetList{}, + &Eviction{}, + &v1.DeleteOptions{}, + &metav1.ExportOptions{}, + &metav1.GetOptions{}, + ) + // Add the watch version that applies + metav1.AddToGroupVersion(scheme, SchemeGroupVersion) + return nil +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/register.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/register.go index c9b6907289e..8642b9d7cc0 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/register.go @@ -56,7 +56,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ClusterRoleBindingList{}, &ClusterRoleList{}, - &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/register.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/register.go index 98c084dc0d5..1395592f830 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/register.go @@ -51,7 +51,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ClusterRoleBindingList{}, &ClusterRoleList{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1beta1/register.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1beta1/register.go index ab6bd04336f..bc3a694c644 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1beta1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1beta1/register.go @@ -51,7 +51,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ClusterRoleBindingList{}, &ClusterRoleList{}, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/register.go b/staging/src/k8s.io/client-go/pkg/apis/storage/register.go index 003f3f8c868..65171364b8e 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/register.go @@ -46,7 +46,6 @@ var ( func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, - &api.ListOptions{}, &api.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/register.go b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/register.go index 122fc92ae9c..6e87105c30b 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/register.go @@ -42,7 +42,6 @@ var ( // Adds the list of known types to api.Scheme. func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, - &v1.ListOptions{}, &v1.DeleteOptions{}, &metav1.ExportOptions{}, &metav1.GetOptions{},