Merge pull request #17822 from wojtek-t/remove_api_list_options

pkg/api/conversion.go

@@ -31,9 +31,9 @@ var Codec = runtime.CodecFor(Scheme, "")
 
 func init() {
 	Scheme.AddDefaultingFuncs(
-		func(obj *ListOptions) {
-			obj.LabelSelector = labels.Everything()
-			obj.FieldSelector = fields.Everything()
+		func(obj *unversioned.ListOptions) {
+			obj.LabelSelector = unversioned.LabelSelector{labels.Everything()}
+			obj.FieldSelector = unversioned.FieldSelector{fields.Everything()}
 		},
 		// TODO: see about moving this into v1/defaults.go
 		func(obj *PodExecOptions) {

pkg/api/register.go

@@ -118,7 +118,6 @@ func (*PersistentVolumeList) IsAnAPIObject()      {}
 func (*PersistentVolumeClaim) IsAnAPIObject()     {}
 func (*PersistentVolumeClaimList) IsAnAPIObject() {}
 func (*DeleteOptions) IsAnAPIObject()             {}
-func (*ListOptions) IsAnAPIObject()               {}
 func (*PodAttachOptions) IsAnAPIObject()          {}
 func (*PodLogOptions) IsAnAPIObject()             {}
 func (*PodExecOptions) IsAnAPIObject()            {}

pkg/api/types.go

@@ -19,8 +19,6 @@ package api
 import (
 	"k8s.io/kubernetes/pkg/api/resource"
 	"k8s.io/kubernetes/pkg/api/unversioned"
-	"k8s.io/kubernetes/pkg/fields"
-	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/types"
 	"k8s.io/kubernetes/pkg/util/intstr"
@@ -1642,23 +1640,6 @@ type DeleteOptions struct {
 	GracePeriodSeconds *int64 `json:"gracePeriodSeconds"`
 }
 
-// ListOptions is the query options to a standard REST list call, and has future support for
-// watch calls.
-type ListOptions struct {
-	unversioned.TypeMeta `json:",inline"`
-
-	// A selector based on labels
-	LabelSelector labels.Selector
-	// A selector based on fields
-	FieldSelector fields.Selector
-	// If true, watch for changes to this list
-	Watch bool
-	// The resource version to watch (no effect on list yet)
-	ResourceVersion string
-	// Timeout for the list/watch call.
-	TimeoutSeconds *int64
-}
-
 // PodLogOptions is the query options for a Pod's logs REST call
 type PodLogOptions struct {
 	unversioned.TypeMeta