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

Remove duplicate ExportOptions objects

Browse Source 
There should only be a single type unversioned.ExportOptions that is
referenced from multiple group versions.
This commit is contained in:
Clayton Coleman 2016-11-27 18:53:00 -05:00
parent 545f749a0d
commit c43bdfbf0d
No known key found for this signature in database
GPG Key ID: 3D16906B4F1C5CB3
4 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/api/types.go
View File

@ -2786,15 +2786,6 @@ type DeleteOptions struct {
OrphanDependents *bool `json:"orphanDependents,omitempty"` OrphanDependents *bool `json:"orphanDependents,omitempty"`
} }
// ExportOptions is the query options to the standard REST get call.
type ExportOptions struct {
unversioned.TypeMeta `json:",inline"`
// Should this value be exported. Export strips fields that a user can not specify.
Export bool `json:"export"`
// Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace'
Exact bool `json:"exact"`
}
// ListOptions is the query options to a standard REST list call, and has future support for // ListOptions is the query options to a standard REST list call, and has future support for
// watch calls. // watch calls.
type ListOptions struct { type ListOptions struct {

4
pkg/api/unversioned/types.go
View File

@ -69,9 +69,9 @@ type ListMeta struct {
// ExportOptions is the query options to the standard REST get call. // ExportOptions is the query options to the standard REST get call.
type ExportOptions struct { type ExportOptions struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
// Should this value be exported. Export strips fields that a user can not specify.` // Should this value be exported. Export strips fields that a user can not specify.
Export bool `json:"export" protobuf:"varint,1,opt,name=export"` Export bool `json:"export" protobuf:"varint,1,opt,name=export"`
// Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace' // Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace'.
Exact bool `json:"exact" protobuf:"varint,2,opt,name=exact"` Exact bool `json:"exact" protobuf:"varint,2,opt,name=exact"`
} }

10
pkg/api/v1/types.go
View File

@ -3215,16 +3215,6 @@ type DeleteOptions struct {
OrphanDependents *bool `json:"orphanDependents,omitempty" protobuf:"varint,3,opt,name=orphanDependents"` OrphanDependents *bool `json:"orphanDependents,omitempty" protobuf:"varint,3,opt,name=orphanDependents"`
} }
// ExportOptions is the query options to the standard REST get call.
type ExportOptions struct {
unversioned.TypeMeta `json:",inline"`
// Should this value be exported. Export strips fields that a user can not specify.
Export bool `json:"export" protobuf:"varint,1,opt,name=export"`
// Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace'
Exact bool `json:"exact" protobuf:"varint,2,opt,name=exact"`
}
// ListOptions is the query options to a standard REST list call. // ListOptions is the query options to a standard REST list call.
type ListOptions struct { type ListOptions struct {
unversioned.TypeMeta `json:",inline"` unversioned.TypeMeta `json:",inline"`

9
pkg/apis/extensions/v1beta1/types.go
View File

@ -923,15 +923,6 @@ type IngressBackend struct {
ServicePort intstr.IntOrString `json:"servicePort" protobuf:"bytes,2,opt,name=servicePort"` ServicePort intstr.IntOrString `json:"servicePort" protobuf:"bytes,2,opt,name=servicePort"`
} }
// ExportOptions is the query options to the standard REST get call.
type ExportOptions struct {
unversioned.TypeMeta `json:",inline"`
// Should this value be exported. Export strips fields that a user can not specify.
Export bool `json:"export" protobuf:"varint,1,opt,name=export"`
// Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace'
Exact bool `json:"exact" protobuf:"varint,2,opt,name=exact"`
}
// +genclient=true // +genclient=true
// ReplicaSet represents the configuration of a ReplicaSet. // ReplicaSet represents the configuration of a ReplicaSet.