github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 18:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17822 from wojtek-t/remove_api_list_options

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-11-30 20:48:38 -08:00
commit f4ea77bede
4 changed files with 5872 additions and 6396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/conversion.go
View File

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

1
pkg/api/register.go
View File

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

12238
pkg/api/types.generated.go
View File

File diff suppressed because it is too large Load Diff

19
pkg/api/types.go
View File

@ -19,8 +19,6 @@ package api
import ( import (
"k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/unversioned" "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/runtime"
"k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/types"
"k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/pkg/util/intstr"
@ -1642,23 +1640,6 @@ type DeleteOptions struct {
GracePeriodSeconds *int64 `json:"gracePeriodSeconds"` 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 // PodLogOptions is the query options for a Pod's logs REST call
type PodLogOptions struct { type PodLogOptions struct {
unversioned.TypeMeta unversioned.TypeMeta