github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-06-25 06:31:35 +00:00
Code Issues Projects Releases Wiki Activity

published by bot

Browse Source 
(https://github.com/kubernetes/contrib/tree/master/mungegithub)

copied from https://github.com/kubernetes/kubernetes.git, branch master,
last commit is 3aa29bca4f6f9e43d8e2a8e3a1587d92b1b2dfe2
This commit is contained in:
Kubernetes Publisher 2017-01-17 15:19:43 +00:00
parent 204f12b1f3
commit 0e140df9af
93 changed files with 2833 additions and 6994 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Godeps/Godeps.json generated
View File

@ -324,131 +324,135 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/meta", "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery", "ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered", "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion", "ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/genericapiserver/openapi/common", "ImportPath": "k8s.io/apimachinery/pkg/genericapiserver/openapi/common",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/labels", "ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/openapi",
"Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime", "ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/selection", "ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/types", "ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/diff", "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/errors", "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/framer", "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/json", "ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/net", "ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime", "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/sets", "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation", "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/wait", "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml", "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/watch", "ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "66b1ba666d4dbb77b323da06b1cbe86f83414878" "Rev": "40b9317c36d3e02d20da77c4233f4a22af6831f8"
} }
] ]
} }

2
pkg/api/doc.go
View File

@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// Package api contains the latest (or "internal") version of the // Package api contains the latest (or "internal") version of the
// Kubernetes API objects. This is the API objects as represented in memory. // Kubernetes API objects. This is the API objects as represented in memory.
// The contract presented to clients is located in the versioned packages, // The contract presented to clients is located in the versioned packages,

14
pkg/api/helpers.go
View File

@ -486,20 +486,6 @@ const (
UnsafeSysctlsPodAnnotationKey string = "security.alpha.kubernetes.io/unsafe-sysctls" UnsafeSysctlsPodAnnotationKey string = "security.alpha.kubernetes.io/unsafe-sysctls"
) )
// GetAffinityFromPod gets the json serialized affinity data from Pod.Annotations
// and converts it to the Affinity type in api.
func GetAffinityFromPodAnnotations(annotations map[string]string) (*Affinity, error) {
if len(annotations) > 0 && annotations[AffinityAnnotationKey] != "" {
var affinity Affinity
err := json.Unmarshal([]byte(annotations[AffinityAnnotationKey]), &affinity)
if err != nil {
return nil, err
}
return &affinity, nil
}
return nil, nil
}
// GetTolerationsFromPodAnnotations gets the json serialized tolerations data from Pod.Annotations // GetTolerationsFromPodAnnotations gets the json serialized tolerations data from Pod.Annotations
// and converts it to the []Toleration type in api. // and converts it to the []Toleration type in api.
func GetTolerationsFromPodAnnotations(annotations map[string]string) ([]Toleration, error) { func GetTolerationsFromPodAnnotations(annotations map[string]string) ([]Toleration, error) {

1
pkg/api/resource/amount.go
View File

@ -54,7 +54,6 @@ var (
// int64Amount represents a fixed precision numerator and arbitrary scale exponent. It is faster // int64Amount represents a fixed precision numerator and arbitrary scale exponent. It is faster
// than operations on inf.Dec for values that can be represented as int64. // than operations on inf.Dec for values that can be represented as int64.
// +k8s:openapi-gen=true
type int64Amount struct { type int64Amount struct {
value int64 value int64
scale Scale scale Scale

7
pkg/api/resource/quantity.go
View File

@ -29,7 +29,7 @@ import (
"github.com/go-openapi/spec" "github.com/go-openapi/spec"
inf "gopkg.in/inf.v0" inf "gopkg.in/inf.v0"
"k8s.io/apimachinery/pkg/genericapiserver/openapi/common" "k8s.io/apimachinery/pkg/openapi"
) )
// Quantity is a fixed-point representation of a number. // Quantity is a fixed-point representation of a number.
@ -93,7 +93,6 @@ import (
// +protobuf.embed=string // +protobuf.embed=string
// +protobuf.options.marshal=false // +protobuf.options.marshal=false
// +protobuf.options.(gogoproto.goproto_stringer)=false // +protobuf.options.(gogoproto.goproto_stringer)=false
// +k8s:openapi-gen=true
type Quantity struct { type Quantity struct {
// i is the quantity in int64 scaled form, if d.Dec == nil // i is the quantity in int64 scaled form, if d.Dec == nil
i int64Amount i int64Amount
@ -399,8 +398,8 @@ func (q Quantity) DeepCopy() Quantity {
} }
// OpenAPIDefinition returns openAPI definition for this type. // OpenAPIDefinition returns openAPI definition for this type.
func (_ Quantity) OpenAPIDefinition() common.OpenAPIDefinition { func (_ Quantity) OpenAPIDefinition() openapi.OpenAPIDefinition {
return common.OpenAPIDefinition{ return openapi.OpenAPIDefinition{
Schema: spec.Schema{ Schema: spec.Schema{
SchemaProps: spec.SchemaProps{ SchemaProps: spec.SchemaProps{
Type: []string{"string"}, Type: []string{"string"},

5
pkg/api/v1/doc.go
View File

@ -14,10 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/pkg/api
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta
// Package v1 is the v1 version of the API. // Package v1 is the v1 version of the API.
package v1 package v1

3878
pkg/api/v1/generated.pb.go
View File

File diff suppressed because it is too large Load Diff

90
pkg/api/v1/generated.proto
View File

@ -138,8 +138,6 @@ message AzureFileVolumeSource {
// Binding ties one object to another. // Binding ties one object to another.
// For example, a pod is bound to a node by a scheduler. // For example, a pod is bound to a node by a scheduler.
message Binding { message Binding {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -239,8 +237,6 @@ message ComponentCondition {
// ComponentStatus (and ComponentStatusList) holds the cluster validation info. // ComponentStatus (and ComponentStatusList) holds the cluster validation info.
message ComponentStatus { message ComponentStatus {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -253,8 +249,6 @@ message ComponentStatus {
// Status of all the conditions for the component as a list of ComponentStatus objects. // Status of all the conditions for the component as a list of ComponentStatus objects.
message ComponentStatusList { message ComponentStatusList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
@ -266,8 +260,6 @@ message ComponentStatusList {
// ConfigMap holds configuration data for pods to consume. // ConfigMap holds configuration data for pods to consume.
message ConfigMap { message ConfigMap {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -300,8 +292,6 @@ message ConfigMapKeySelector {
// ConfigMapList is a resource containing a list of ConfigMap objects. // ConfigMapList is a resource containing a list of ConfigMap objects.
message ConfigMapList { message ConfigMapList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1; optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
@ -626,8 +616,6 @@ message DaemonEndpoint {
// DeleteOptions may be provided when deleting an API object // DeleteOptions may be provided when deleting an API object
message DeleteOptions { message DeleteOptions {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// The duration in seconds before the object should be deleted. Value must be non-negative integer. // The duration in seconds before the object should be deleted. Value must be non-negative integer.
// The value zero indicates delete immediately. If this value is nil, the default grace period for the // The value zero indicates delete immediately. If this value is nil, the default grace period for the
// specified type will be used. // specified type will be used.
@ -776,8 +764,6 @@ message EndpointSubset {
// }, // },
// ] // ]
message Endpoints { message Endpoints {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -795,8 +781,6 @@ message Endpoints {
// EndpointsList is a list of endpoints. // EndpointsList is a list of endpoints.
message EndpointsList { message EndpointsList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
@ -862,8 +846,6 @@ message EnvVarSource {
// Event is a report of an event somewhere in the cluster. // Event is a report of an event somewhere in the cluster.
// TODO: Decide whether to store these separately or with the object they apply to. // TODO: Decide whether to store these separately or with the object they apply to.
message Event { message Event {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 10;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
optional ObjectMeta metadata = 1; optional ObjectMeta metadata = 1;
@ -905,8 +887,6 @@ message Event {
// EventList is a list of events. // EventList is a list of events.
message EventList { message EventList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
@ -1212,8 +1192,6 @@ message Lifecycle {
// LimitRange sets resource usage limits for each kind of resource in a Namespace. // LimitRange sets resource usage limits for each kind of resource in a Namespace.
message LimitRange { message LimitRange {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -1254,8 +1232,6 @@ message LimitRangeItem {
// LimitRangeList is a list of LimitRange items. // LimitRangeList is a list of LimitRange items.
message LimitRangeList { message LimitRangeList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
@ -1274,8 +1250,6 @@ message LimitRangeSpec {
// List holds a list of objects, which may not be known by the server. // List holds a list of objects, which may not be known by the server.
message List { message List {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
@ -1287,8 +1261,6 @@ message List {
// ListOptions is the query options to a standard REST list call. // ListOptions is the query options to a standard REST list call.
message ListOptions { message ListOptions {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 6;
// A selector to restrict the list of returned objects by their labels. // A selector to restrict the list of returned objects by their labels.
// Defaults to everything. // Defaults to everything.
// +optional // +optional
@ -1372,8 +1344,6 @@ message NFSVolumeSource {
// Namespace provides a scope for Names. // Namespace provides a scope for Names.
// Use of multiple namespaces is optional. // Use of multiple namespaces is optional.
message Namespace { message Namespace {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -1392,8 +1362,6 @@ message Namespace {
// NamespaceList is a list of Namespaces. // NamespaceList is a list of Namespaces.
message NamespaceList { message NamespaceList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
@ -1423,8 +1391,6 @@ message NamespaceStatus {
// Node is a worker node in Kubernetes. // Node is a worker node in Kubernetes.
// Each node will have a unique identifier in the cache (i.e. in etcd). // Each node will have a unique identifier in the cache (i.e. in etcd).
message Node { message Node {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -1509,8 +1475,6 @@ message NodeDaemonEndpoints {
// NodeList is the whole list of all Nodes which have been registered with master. // NodeList is the whole list of all Nodes which have been registered with master.
message NodeList { message NodeList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
@ -1522,8 +1486,6 @@ message NodeList {
// NodeProxyOptions is the query options to a Node's proxy call. // NodeProxyOptions is the query options to a Node's proxy call.
message NodeProxyOptions { message NodeProxyOptions {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 2;
// Path is the URL path to use for the current proxy request to node. // Path is the URL path to use for the current proxy request to node.
// +optional // +optional
optional string path = 1; optional string path = 1;
@ -1883,8 +1845,6 @@ message ObjectReference {
// It is analogous to a node. // It is analogous to a node.
// More info: http://kubernetes.io/docs/user-guide/persistent-volumes // More info: http://kubernetes.io/docs/user-guide/persistent-volumes
message PersistentVolume { message PersistentVolume {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -1906,8 +1866,6 @@ message PersistentVolume {
// PersistentVolumeClaim is a user's request for and claim to a persistent volume // PersistentVolumeClaim is a user's request for and claim to a persistent volume
message PersistentVolumeClaim { message PersistentVolumeClaim {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -1927,8 +1885,6 @@ message PersistentVolumeClaim {
// PersistentVolumeClaimList is a list of PersistentVolumeClaim items. // PersistentVolumeClaimList is a list of PersistentVolumeClaim items.
message PersistentVolumeClaimList { message PersistentVolumeClaimList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
@ -1994,8 +1950,6 @@ message PersistentVolumeClaimVolumeSource {
// PersistentVolumeList is a list of PersistentVolume items. // PersistentVolumeList is a list of PersistentVolume items.
message PersistentVolumeList { message PersistentVolumeList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
@ -2154,8 +2108,6 @@ message PhotonPersistentDiskVolumeSource {
// Pod is a collection of containers that can run on a host. This resource is created // Pod is a collection of containers that can run on a host. This resource is created
// by clients and scheduled onto hosts. // by clients and scheduled onto hosts.
message Pod { message Pod {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -2278,8 +2230,6 @@ message PodAntiAffinity {
// TODO: merge w/ PodExecOptions below for stdin, stdout, etc // TODO: merge w/ PodExecOptions below for stdin, stdout, etc
// and also when we cut V2, we should export a "StreamOptions" or somesuch that contains Stdin, Stdout, Stder and TTY // and also when we cut V2, we should export a "StreamOptions" or somesuch that contains Stdin, Stdout, Stder and TTY
message PodAttachOptions { message PodAttachOptions {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 6;
// Stdin if true, redirects the standard input stream of the pod for this call. // Stdin if true, redirects the standard input stream of the pod for this call.
// Defaults to false. // Defaults to false.
// +optional // +optional
@ -2342,8 +2292,6 @@ message PodCondition {
// TODO: This is largely identical to PodAttachOptions above, make sure they stay in sync and see about merging // TODO: This is largely identical to PodAttachOptions above, make sure they stay in sync and see about merging
// and also when we cut V2, we should export a "StreamOptions" or somesuch that contains Stdin, Stdout, Stder and TTY // and also when we cut V2, we should export a "StreamOptions" or somesuch that contains Stdin, Stdout, Stder and TTY
message PodExecOptions { message PodExecOptions {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 7;
// Redirect the standard input stream of the pod for this call. // Redirect the standard input stream of the pod for this call.
// Defaults to false. // Defaults to false.
// +optional // +optional
@ -2375,8 +2323,6 @@ message PodExecOptions {
// PodList is a list of Pods. // PodList is a list of Pods.
message PodList { message PodList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
@ -2389,8 +2335,6 @@ message PodList {
// PodLogOptions is the query options for a Pod's logs REST call. // PodLogOptions is the query options for a Pod's logs REST call.
message PodLogOptions { message PodLogOptions {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 9;
// The container for which to stream logs. Defaults to only container if there is one container in the pod. // The container for which to stream logs. Defaults to only container if there is one container in the pod.
// +optional // +optional
optional string container = 1; optional string container = 1;
@ -2436,8 +2380,6 @@ message PodLogOptions {
// PodProxyOptions is the query options to a Pod's proxy call. // PodProxyOptions is the query options to a Pod's proxy call.
message PodProxyOptions { message PodProxyOptions {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 2;
// Path is the URL path to use for the current proxy request to pod. // Path is the URL path to use for the current proxy request to pod.
// +optional // +optional
optional string path = 1; optional string path = 1;
@ -2662,8 +2604,6 @@ message PodStatus {
// PodStatusResult is a wrapper for PodStatus returned by kubelet that can be encode/decoded // PodStatusResult is a wrapper for PodStatus returned by kubelet that can be encode/decoded
message PodStatusResult { message PodStatusResult {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -2680,8 +2620,6 @@ message PodStatusResult {
// PodTemplate describes a template for creating copies of a predefined pod. // PodTemplate describes a template for creating copies of a predefined pod.
message PodTemplate { message PodTemplate {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -2695,8 +2633,6 @@ message PodTemplate {
// PodTemplateList is a list of PodTemplates. // PodTemplateList is a list of PodTemplates.
message PodTemplateList { message PodTemplateList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
@ -2867,8 +2803,6 @@ message RBDVolumeSource {
// RangeAllocation is not a public type. // RangeAllocation is not a public type.
message RangeAllocation { message RangeAllocation {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -2883,8 +2817,6 @@ message RangeAllocation {
// ReplicationController represents the configuration of a replication controller. // ReplicationController represents the configuration of a replication controller.
message ReplicationController { message ReplicationController {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// If the Labels of a ReplicationController are empty, they are defaulted to // If the Labels of a ReplicationController are empty, they are defaulted to
// be the same as the Pod(s) that the replication controller manages. // be the same as the Pod(s) that the replication controller manages.
// Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
@ -2928,8 +2860,6 @@ message ReplicationControllerCondition {
// ReplicationControllerList is a collection of replication controllers. // ReplicationControllerList is a collection of replication controllers.
message ReplicationControllerList { message ReplicationControllerList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
@ -3014,8 +2944,6 @@ message ResourceFieldSelector {
// ResourceQuota sets aggregate quota restrictions enforced per namespace // ResourceQuota sets aggregate quota restrictions enforced per namespace
message ResourceQuota { message ResourceQuota {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -3034,8 +2962,6 @@ message ResourceQuota {
// ResourceQuotaList is a list of ResourceQuota items. // ResourceQuotaList is a list of ResourceQuota items.
message ResourceQuotaList { message ResourceQuotaList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
@ -3108,8 +3034,6 @@ message SELinuxOptions {
// Secret holds secret data of a certain type. The total bytes of the values in // Secret holds secret data of a certain type. The total bytes of the values in
// the Data field must be less than MaxSecretSize bytes. // the Data field must be less than MaxSecretSize bytes.
message Secret { message Secret {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 5;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -3147,8 +3071,6 @@ message SecretKeySelector {
// SecretList is a list of Secret. // SecretList is a list of Secret.
message SecretList { message SecretList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
@ -3235,8 +3157,6 @@ message SecurityContext {
// SerializedReference is a reference to serialized object. // SerializedReference is a reference to serialized object.
message SerializedReference { message SerializedReference {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 2;
// The reference to an object in the system. // The reference to an object in the system.
// +optional // +optional
optional ObjectReference reference = 1; optional ObjectReference reference = 1;
@ -3246,8 +3166,6 @@ message SerializedReference {
// (for example 3306) that the proxy listens on, and the selector that determines which pods // (for example 3306) that the proxy listens on, and the selector that determines which pods
// will answer requests sent through the proxy. // will answer requests sent through the proxy.
message Service { message Service {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -3271,8 +3189,6 @@ message Service {
// * a principal that can be authenticated and authorized // * a principal that can be authenticated and authorized
// * a set of secrets // * a set of secrets
message ServiceAccount { message ServiceAccount {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -3293,8 +3209,6 @@ message ServiceAccount {
// ServiceAccountList is a list of ServiceAccount objects // ServiceAccountList is a list of ServiceAccount objects
message ServiceAccountList { message ServiceAccountList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
@ -3307,8 +3221,6 @@ message ServiceAccountList {
// ServiceList holds a list of services. // ServiceList holds a list of services.
message ServiceList { message ServiceList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
@ -3357,8 +3269,6 @@ message ServicePort {
// ServiceProxyOptions is the query options to a Service's proxy call. // ServiceProxyOptions is the query options to a Service's proxy call.
message ServiceProxyOptions { message ServiceProxyOptions {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 2;
// Path is the part of URLs that include service endpoints, suffixes, // Path is the part of URLs that include service endpoints, suffixes,
// and parameters to use for the current proxy request to service. // and parameters to use for the current proxy request to service.
// For example, the whole request URL is // For example, the whole request URL is

2
pkg/apis/apps/doc.go
View File

@ -14,6 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
package apps package apps

5
pkg/apis/apps/v1beta1/doc.go
View File

@ -14,9 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/apps
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta
package v1beta1 package v1beta1

180
pkg/apis/apps/v1beta1/generated.pb.go
View File

@ -115,14 +115,6 @@ func (m *StatefulSet) MarshalTo(data []byte) (int, error) {
return 0, err return 0, err
} }
i += n3 i += n3
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n4, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n4
return i, nil return i, nil
} }
@ -144,11 +136,11 @@ func (m *StatefulSetList) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size()))
n5, err := m.ListMeta.MarshalTo(data[i:]) n4, err := m.ListMeta.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n5 i += n4
if len(m.Items) > 0 { if len(m.Items) > 0 {
for _, msg := range m.Items { for _, msg := range m.Items {
data[i] = 0x12 data[i] = 0x12
@ -161,14 +153,6 @@ func (m *StatefulSetList) MarshalTo(data []byte) (int, error) {
i += n i += n
} }
} }
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n6, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n6
return i, nil return i, nil
} }
@ -196,20 +180,20 @@ func (m *StatefulSetSpec) MarshalTo(data []byte) (int, error) {
data[i] = 0x12 data[i] = 0x12
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.Selector.Size())) i = encodeVarintGenerated(data, i, uint64(m.Selector.Size()))
n7, err := m.Selector.MarshalTo(data[i:]) n5, err := m.Selector.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n7 i += n5
} }
data[i] = 0x1a data[i] = 0x1a
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.Template.Size())) i = encodeVarintGenerated(data, i, uint64(m.Template.Size()))
n8, err := m.Template.MarshalTo(data[i:]) n6, err := m.Template.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n8 i += n6
if len(m.VolumeClaimTemplates) > 0 { if len(m.VolumeClaimTemplates) > 0 {
for _, msg := range m.VolumeClaimTemplates { for _, msg := range m.VolumeClaimTemplates {
data[i] = 0x22 data[i] = 0x22
@ -291,8 +275,6 @@ func (m *StatefulSet) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.Status.Size() l = m.Status.Size()
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -307,8 +289,6 @@ func (m *StatefulSetList) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
} }
} }
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -366,7 +346,6 @@ func (this *StatefulSet) String() string {
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "StatefulSetSpec", "StatefulSetSpec", 1), `&`, ``, 1) + `,`, `Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "StatefulSetSpec", "StatefulSetSpec", 1), `&`, ``, 1) + `,`,
`Status:` + strings.Replace(strings.Replace(this.Status.String(), "StatefulSetStatus", "StatefulSetStatus", 1), `&`, ``, 1) + `,`, `Status:` + strings.Replace(strings.Replace(this.Status.String(), "StatefulSetStatus", "StatefulSetStatus", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -378,7 +357,6 @@ func (this *StatefulSetList) String() string {
s := strings.Join([]string{`&StatefulSetList{`, s := strings.Join([]string{`&StatefulSetList{`,
`ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`,
`Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "StatefulSet", "StatefulSet", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "StatefulSet", "StatefulSet", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -535,36 +513,6 @@ func (m *StatefulSet) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -676,36 +624,6 @@ func (m *StatefulSetList) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -1115,48 +1033,46 @@ var (
) )
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 677 bytes of a gzipped FileDescriptorProto // 645 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x94, 0xcb, 0x6e, 0xd3, 0x4e, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x53, 0x4d, 0x6f, 0xd3, 0x40,
0x14, 0xc6, 0xe3, 0x5c, 0xfa, 0xcf, 0x7f, 0x52, 0x6e, 0x43, 0x85, 0xac, 0x0a, 0xb9, 0x55, 0x37, 0x10, 0x8d, 0x93, 0xa6, 0x84, 0x4d, 0xf9, 0x5a, 0x2a, 0x14, 0x55, 0xc8, 0xad, 0x72, 0x21, 0x48,
0x04, 0xa9, 0x1d, 0x2b, 0x6d, 0x81, 0x8a, 0xa5, 0x91, 0x40, 0x48, 0x40, 0x91, 0x53, 0x55, 0x50, 0xed, 0x5a, 0x69, 0x0b, 0x54, 0x1c, 0x8d, 0x04, 0x42, 0x02, 0x8a, 0x1c, 0x54, 0x41, 0x81, 0xc3,
0x60, 0x31, 0x76, 0x4e, 0xd3, 0x21, 0xbe, 0xc9, 0x33, 0x8e, 0xd4, 0x1d, 0x9b, 0x2e, 0xd8, 0xf1, 0xda, 0x99, 0xa6, 0x4b, 0xfc, 0x25, 0xef, 0x38, 0x12, 0x37, 0x2e, 0x1c, 0xb8, 0xf1, 0x2f, 0xf8,
0x18, 0x3c, 0x01, 0xcf, 0xd0, 0x65, 0x97, 0xac, 0x2a, 0x1a, 0x5e, 0x04, 0xcd, 0x64, 0x12, 0xa7, 0x07, 0xfc, 0x86, 0x8a, 0x53, 0x8f, 0x9c, 0x2a, 0x1a, 0xfe, 0x08, 0xf2, 0x66, 0x93, 0x18, 0x9c,
0x75, 0x42, 0xab, 0x8a, 0x5d, 0xe6, 0xf2, 0xfd, 0xbe, 0x39, 0xdf, 0x39, 0x0e, 0x7a, 0xd2, 0xdb, 0xd0, 0xaa, 0x37, 0xcf, 0xee, 0xbc, 0xf7, 0x66, 0xde, 0x3e, 0x93, 0x07, 0xfd, 0x1d, 0xc9, 0x44,
0xe2, 0x84, 0xc5, 0x76, 0x2f, 0xf3, 0x20, 0x8d, 0x40, 0x00, 0xb7, 0x93, 0x5e, 0xd7, 0xa6, 0x09, 0x64, 0xf5, 0x53, 0x17, 0x92, 0x10, 0x10, 0xa4, 0x15, 0xf7, 0x7b, 0x16, 0x8f, 0x85, 0xb4, 0x78,
0xe3, 0x36, 0x4d, 0x12, 0x6e, 0xf7, 0x5b, 0x1e, 0x08, 0xda, 0xb2, 0xbb, 0x10, 0x41, 0x4a, 0x05, 0x1c, 0x4b, 0x6b, 0xd0, 0x76, 0x01, 0x79, 0xdb, 0xea, 0x41, 0x08, 0x09, 0x47, 0xe8, 0xb2, 0x38,
0x74, 0x48, 0x92, 0xc6, 0x22, 0xc6, 0x0f, 0x86, 0x42, 0x92, 0x0b, 0x49, 0xd2, 0xeb, 0x12, 0x29, 0x89, 0x30, 0xa2, 0x77, 0x46, 0x40, 0x36, 0x05, 0xb2, 0xb8, 0xdf, 0x63, 0x19, 0x90, 0x65, 0x40,
0x24, 0x52, 0x48, 0xb4, 0x70, 0x71, 0xad, 0xcb, 0xc4, 0x41, 0xe6, 0x11, 0x3f, 0x0e, 0xed, 0x6e, 0xa6, 0x81, 0x2b, 0x1b, 0x3d, 0x81, 0x87, 0xa9, 0xcb, 0xbc, 0x28, 0xb0, 0x7a, 0x51, 0x2f, 0xb2,
0xdc, 0x8d, 0x6d, 0xa5, 0xf7, 0xb2, 0x7d, 0xb5, 0x52, 0x0b, 0xf5, 0x6b, 0xc8, 0x5d, 0xdc, 0xd4, 0x14, 0xde, 0x4d, 0x0f, 0x54, 0xa5, 0x0a, 0xf5, 0x35, 0xe2, 0x5d, 0xd9, 0xd6, 0x03, 0xf1, 0x58,
0x0f, 0xa2, 0x09, 0x0b, 0xa9, 0x7f, 0xc0, 0x22, 0x48, 0x0f, 0xf3, 0x27, 0x85, 0x20, 0xa8, 0xdd, 0x04, 0xdc, 0x3b, 0x14, 0x21, 0x24, 0x1f, 0xa7, 0x23, 0x05, 0x80, 0xdc, 0x1a, 0x14, 0xa6, 0x59,
0x2f, 0xbc, 0x66, 0xd1, 0x9e, 0xa5, 0x4a, 0xb3, 0x48, 0xb0, 0x10, 0x0a, 0x82, 0xc7, 0x97, 0x09, 0xb1, 0xe6, 0xa1, 0x92, 0x34, 0x44, 0x11, 0x40, 0x01, 0x70, 0xff, 0x2c, 0x80, 0xf4, 0x0e, 0x21,
0xb8, 0x7f, 0x00, 0x21, 0x2d, 0xe8, 0xd6, 0x67, 0xe6, 0x65, 0xa7, 0xc0, 0xe3, 0x2c, 0xf5, 0x8b, 0xe0, 0x05, 0xdc, 0xe6, 0x5c, 0xbf, 0xac, 0x04, 0x64, 0x94, 0x26, 0x5e, 0x51, 0x6b, 0x7d, 0x3e,
0x5e, 0xab, 0xb3, 0x35, 0x53, 0x4a, 0x69, 0x4d, 0xbf, 0x9d, 0x09, 0x16, 0xd8, 0x2c, 0x12, 0x5c, 0x66, 0xc6, 0x2a, 0xed, 0xd9, 0xdd, 0x29, 0x0a, 0xdf, 0x12, 0x21, 0x4a, 0x4c, 0xfe, 0x85, 0x34,
0xa4, 0x17, 0x25, 0x2b, 0x47, 0x15, 0xd4, 0x68, 0x0b, 0x2a, 0x60, 0x3f, 0x0b, 0xda, 0x20, 0xf0, 0xbf, 0x95, 0x49, 0xbd, 0x83, 0x1c, 0xe1, 0x20, 0xf5, 0x3b, 0x80, 0xf4, 0x35, 0xa9, 0x65, 0x46,
0x3b, 0x54, 0x97, 0x41, 0x75, 0xa8, 0xa0, 0xa6, 0xb1, 0x6c, 0x34, 0x1b, 0xeb, 0x4d, 0x32, 0xb3, 0x75, 0x39, 0xf2, 0x86, 0xb1, 0x66, 0xb4, 0xea, 0x9b, 0x2d, 0x36, 0xf7, 0xb9, 0xd8, 0xa0, 0xcd,
0x5d, 0xa4, 0xdf, 0x22, 0xdb, 0xde, 0x67, 0xf0, 0xc5, 0x6b, 0x10, 0xd4, 0xc1, 0xc7, 0xa7, 0x4b, 0x76, 0xdd, 0x0f, 0xe0, 0xe1, 0x73, 0x40, 0x6e, 0xd3, 0xa3, 0x93, 0xd5, 0xd2, 0xf0, 0x64, 0x95,
0xa5, 0xc1, 0xe9, 0x12, 0xca, 0xf7, 0xdc, 0x31, 0x0d, 0xef, 0xa1, 0x2a, 0x4f, 0xc0, 0x37, 0xcb, 0x4c, 0xcf, 0x9c, 0x09, 0x1b, 0xdd, 0x27, 0x0b, 0x32, 0x06, 0xaf, 0x51, 0x56, 0xac, 0x3b, 0xec,
0x8a, 0xba, 0x45, 0xae, 0x38, 0x04, 0x64, 0xe2, 0x75, 0xed, 0x04, 0x7c, 0x67, 0x5e, 0xbb, 0x54, 0x9c, 0x21, 0x60, 0xb9, 0xe9, 0x3a, 0x31, 0x78, 0xf6, 0x92, 0x56, 0x59, 0xc8, 0x2a, 0x47, 0x71,
0xe5, 0xca, 0x55, 0x4c, 0xec, 0xa1, 0x39, 0x2e, 0xa8, 0xc8, 0xb8, 0x59, 0x51, 0xf4, 0xa7, 0xd7, 0x52, 0x97, 0x2c, 0x4a, 0xe4, 0x98, 0xca, 0x46, 0x45, 0xb1, 0x3f, 0xbc, 0x10, 0xbb, 0x62, 0xb0,
0xa2, 0x2b, 0x82, 0x73, 0x53, 0xf3, 0xe7, 0x86, 0x6b, 0x57, 0x93, 0xf1, 0x47, 0x54, 0x17, 0x87, 0xaf, 0x6a, 0xfe, 0xc5, 0x51, 0xed, 0x68, 0xe6, 0xe6, 0x0f, 0x83, 0x5c, 0xcb, 0x75, 0x3f, 0x13,
0x09, 0xc8, 0xaa, 0xcc, 0xaa, 0x72, 0x21, 0x23, 0x97, 0xc9, 0x49, 0xc8, 0x7d, 0x64, 0xe5, 0x32, 0x12, 0xe9, 0xbb, 0x82, 0x5b, 0x6c, 0xac, 0x9c, 0x4f, 0xc7, 0x54, 0x3b, 0xeb, 0xce, 0x5c, 0xcb,
0xa1, 0x1d, 0xad, 0x72, 0x6e, 0x6b, 0x72, 0x7d, 0xb4, 0xe3, 0x8e, 0x89, 0x2b, 0xdf, 0xcb, 0xe8, 0xd0, 0xca, 0xb3, 0xeb, 0x5a, 0xad, 0x36, 0x3e, 0xc9, 0x39, 0xf6, 0x86, 0x54, 0x05, 0x42, 0x20,
0xd6, 0xc4, 0x5b, 0x5e, 0x31, 0x2e, 0xa4, 0xe3, 0x85, 0x5e, 0x5c, 0xd1, 0x51, 0xaa, 0xcf, 0x3b, 0x1b, 0xe5, 0xb5, 0x4a, 0xab, 0xbe, 0xb9, 0x7d, 0x91, 0xa5, 0xec, 0x2b, 0x5a, 0xa0, 0xfa, 0x34,
0x8e, 0x76, 0x26, 0xfa, 0xf1, 0x1e, 0xd5, 0x98, 0x80, 0x90, 0x9b, 0xe5, 0xe5, 0x4a, 0xb3, 0xb1, 0xa3, 0x72, 0x46, 0x8c, 0xcd, 0xef, 0x95, 0xbf, 0x96, 0xc9, 0xac, 0xa4, 0x2d, 0x52, 0x4b, 0x20,
0xbe, 0x79, 0x9d, 0xc8, 0x9c, 0x1b, 0xda, 0xa0, 0xf6, 0x52, 0xa2, 0xdc, 0x21, 0xf1, 0x5c, 0x54, 0xf6, 0x85, 0xc7, 0xa5, 0x5a, 0xa6, 0x6a, 0x2f, 0x65, 0x83, 0x39, 0xfa, 0xcc, 0x99, 0xdc, 0xd2,
0x95, 0x7f, 0x1e, 0xd5, 0x8f, 0xca, 0xb9, 0xa8, 0xe4, 0x18, 0xe0, 0x26, 0xaa, 0xa7, 0x90, 0x04, 0xf7, 0xa4, 0x26, 0xc1, 0x07, 0x0f, 0xa3, 0x44, 0x3f, 0xe7, 0xd6, 0x39, 0xd7, 0xe6, 0x2e, 0xf8,
0xcc, 0xa7, 0x5c, 0x45, 0x55, 0x73, 0xe6, 0xa5, 0xda, 0xd5, 0x7b, 0xee, 0xf8, 0x14, 0x7f, 0x42, 0x1d, 0x0d, 0x1d, 0xd1, 0x8f, 0x2b, 0x67, 0x42, 0x49, 0xdf, 0x92, 0x1a, 0x42, 0x10, 0xfb, 0x1c,
0x75, 0x0e, 0x01, 0xf8, 0x22, 0x4e, 0xf5, 0x28, 0x6e, 0x5c, 0x31, 0x54, 0xea, 0x41, 0xd0, 0xd6, 0x41, 0xbf, 0xe7, 0xc6, 0xff, 0x33, 0xf8, 0x32, 0xea, 0xbe, 0xd2, 0x00, 0x15, 0x91, 0x89, 0xa9,
0xd2, 0x21, 0x7e, 0xb4, 0x72, 0xc7, 0x48, 0xfc, 0x01, 0xd5, 0x05, 0x84, 0x49, 0x40, 0x05, 0xe8, 0xe3, 0x53, 0x67, 0x42, 0x48, 0x3f, 0x1b, 0x64, 0x79, 0x10, 0xf9, 0x69, 0x00, 0x8f, 0x7c, 0x2e,
0xd2, 0xd7, 0xfe, 0xfe, 0xfd, 0xbc, 0x8d, 0x3b, 0x3b, 0x5a, 0xa0, 0xc6, 0x3b, 0xaf, 0x5c, 0xef, 0x82, 0x71, 0x87, 0x6c, 0x2c, 0x28, 0x93, 0xb7, 0xce, 0x50, 0x82, 0x44, 0x0a, 0x89, 0x10, 0xe2,
0xba, 0x63, 0x20, 0x3e, 0x32, 0xd0, 0x42, 0x3f, 0x0e, 0xb2, 0x10, 0x9e, 0x05, 0x94, 0x85, 0xa3, 0xde, 0x94, 0xc3, 0xbe, 0xad, 0xf5, 0x96, 0xf7, 0x66, 0x10, 0x3b, 0x33, 0xe5, 0xe8, 0x3d, 0x52,
0x1b, 0xdc, 0xac, 0xaa, 0x16, 0x6e, 0x5c, 0xe2, 0x04, 0x29, 0x67, 0x5c, 0x40, 0x24, 0x76, 0x73, 0x97, 0x90, 0x0c, 0x84, 0x07, 0x2f, 0x78, 0x00, 0x8d, 0xea, 0x9a, 0xd1, 0xba, 0x6c, 0xdf, 0xd4,
0x86, 0x73, 0x5f, 0xfb, 0x2d, 0xec, 0x4e, 0x01, 0xbb, 0x53, 0xed, 0xf0, 0x23, 0xd4, 0xe0, 0x90, 0x44, 0xf5, 0xce, 0xf4, 0xca, 0xc9, 0xf7, 0x35, 0xbf, 0x18, 0xe4, 0x46, 0x21, 0xb3, 0xf4, 0x31,
0xf6, 0x99, 0x0f, 0x6f, 0x68, 0x08, 0x66, 0x6d, 0xd9, 0x68, 0xfe, 0xef, 0xdc, 0xd5, 0xa0, 0x46, 0xa1, 0x91, 0x9b, 0xb5, 0x41, 0xf7, 0xc9, 0xe8, 0x07, 0x17, 0x51, 0xa8, 0x1e, 0xb1, 0x62, 0xdf,
0x3b, 0x3f, 0x72, 0x27, 0xef, 0xad, 0x7c, 0x35, 0xd0, 0x9d, 0xc2, 0xf7, 0x86, 0x9f, 0x23, 0x1c, 0x1a, 0x9e, 0xac, 0xd2, 0xdd, 0xc2, 0xad, 0x33, 0x03, 0x41, 0xd7, 0x73, 0x11, 0x28, 0xab, 0x08,
0x7b, 0xf2, 0x1a, 0x74, 0x5e, 0x0c, 0xff, 0x9c, 0x58, 0x1c, 0xa9, 0x26, 0x56, 0x9c, 0x7b, 0x83, 0x4c, 0xac, 0x2c, 0xc6, 0xc0, 0xbe, 0x7b, 0x74, 0x6a, 0x96, 0x8e, 0x4f, 0xcd, 0xd2, 0xcf, 0x53,
0xd3, 0x25, 0xbc, 0x5d, 0x38, 0x75, 0xa7, 0x28, 0xf0, 0xea, 0xc4, 0x08, 0x94, 0xd5, 0x08, 0x8c, 0xb3, 0xf4, 0x69, 0x68, 0x1a, 0x47, 0x43, 0xd3, 0x38, 0x1e, 0x9a, 0xc6, 0xaf, 0xa1, 0x69, 0x7c,
0xa3, 0x2c, 0x8e, 0x81, 0xf3, 0xf0, 0xf8, 0xcc, 0x2a, 0x9d, 0x9c, 0x59, 0xa5, 0x9f, 0x67, 0x56, 0xfd, 0x6d, 0x96, 0xf6, 0x2f, 0xe9, 0x44, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0xbb, 0xf0, 0xd3,
0xe9, 0xcb, 0xc0, 0x32, 0x8e, 0x07, 0x96, 0x71, 0x32, 0xb0, 0x8c, 0x5f, 0x03, 0xcb, 0xf8, 0xf6, 0x7e, 0x2c, 0x06, 0x00, 0x00,
0xdb, 0x2a, 0xed, 0xfd, 0xa7, 0xe7, 0xfd, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x99, 0xe5, 0x31,
0x59, 0xe8, 0x06, 0x00, 0x00,
} }

4
pkg/apis/apps/v1beta1/generated.proto
View File

@ -38,8 +38,6 @@ option go_package = "v1beta1";
// The StatefulSet guarantees that a given network identity will always // The StatefulSet guarantees that a given network identity will always
// map to the same storage identity. // map to the same storage identity.
message StatefulSet { message StatefulSet {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
@ -55,8 +53,6 @@ message StatefulSet {
// StatefulSetList is a collection of StatefulSets. // StatefulSetList is a collection of StatefulSets.
message StatefulSetList { message StatefulSetList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// +optional // +optional
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1; optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;

1
pkg/apis/authentication/doc.go
View File

@ -14,6 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +groupName=authentication.k8s.io // +groupName=authentication.k8s.io
package authentication package authentication

4
pkg/apis/authentication/v1beta1/doc.go
View File

@ -14,9 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/authentication
// +groupName=authentication.k8s.io // +groupName=authentication.k8s.io
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta
package v1beta1 package v1beta1

135
pkg/apis/authentication/v1beta1/generated.pb.go
View File

@ -151,14 +151,6 @@ func (m *TokenReview) MarshalTo(data []byte) (int, error) {
return 0, err return 0, err
} }
i += n3 i += n3
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n4, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n4
return i, nil return i, nil
} }
@ -210,11 +202,11 @@ func (m *TokenReviewStatus) MarshalTo(data []byte) (int, error) {
data[i] = 0x12 data[i] = 0x12
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.User.Size())) i = encodeVarintGenerated(data, i, uint64(m.User.Size()))
n5, err := m.User.MarshalTo(data[i:]) n4, err := m.User.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n5 i += n4
data[i] = 0x1a data[i] = 0x1a
i++ i++
i = encodeVarintGenerated(data, i, uint64(len(m.Error))) i = encodeVarintGenerated(data, i, uint64(len(m.Error)))
@ -275,11 +267,11 @@ func (m *UserInfo) MarshalTo(data []byte) (int, error) {
data[i] = 0x12 data[i] = 0x12
i++ i++
i = encodeVarintGenerated(data, i, uint64((&v).Size())) i = encodeVarintGenerated(data, i, uint64((&v).Size()))
n6, err := (&v).MarshalTo(data[i:]) n5, err := (&v).MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n6 i += n5
} }
} }
return i, nil return i, nil
@ -333,8 +325,6 @@ func (m *TokenReview) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.Status.Size() l = m.Status.Size()
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -403,7 +393,6 @@ func (this *TokenReview) String() string {
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "TokenReviewSpec", "TokenReviewSpec", 1), `&`, ``, 1) + `,`, `Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "TokenReviewSpec", "TokenReviewSpec", 1), `&`, ``, 1) + `,`,
`Status:` + strings.Replace(strings.Replace(this.Status.String(), "TokenReviewStatus", "TokenReviewStatus", 1), `&`, ``, 1) + `,`, `Status:` + strings.Replace(strings.Replace(this.Status.String(), "TokenReviewStatus", "TokenReviewStatus", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -659,36 +648,6 @@ func (m *TokenReview) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -1277,48 +1236,46 @@ var (
) )
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 688 bytes of a gzipped FileDescriptorProto // 656 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0xcf, 0x4f, 0x13, 0x41, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x53, 0xcd, 0x6e, 0xd3, 0x4c,
0x14, 0xee, 0xd2, 0x16, 0xdb, 0xa9, 0x28, 0x4e, 0x62, 0xd2, 0x34, 0x71, 0xdb, 0xd4, 0x4b, 0x4d, 0x14, 0xb5, 0xf3, 0xd3, 0x2f, 0x99, 0x7c, 0x85, 0x32, 0x12, 0x52, 0x14, 0x09, 0x27, 0x0a, 0x9b,
0x70, 0x36, 0x25, 0x06, 0x09, 0xc4, 0x03, 0x1b, 0xd0, 0x70, 0x30, 0x26, 0x03, 0x18, 0x63, 0xf4, 0x20, 0x95, 0xb1, 0x52, 0xa1, 0x52, 0xb5, 0x62, 0x51, 0xab, 0x05, 0x75, 0x81, 0x90, 0xa6, 0x14,
0x30, 0xdd, 0x3e, 0xb6, 0xeb, 0xb2, 0x3f, 0x32, 0x3b, 0x5b, 0xec, 0x8d, 0x3f, 0xc1, 0xa3, 0xde, 0x21, 0x24, 0x16, 0x13, 0xe7, 0xd6, 0x31, 0xae, 0x7f, 0x34, 0x1e, 0xa7, 0x74, 0xd7, 0x47, 0x60,
0xfc, 0x73, 0x38, 0x72, 0xf0, 0xe0, 0xc1, 0x10, 0x5b, 0xff, 0x11, 0x33, 0xb3, 0x43, 0x5b, 0x28, 0xc9, 0x92, 0xf7, 0xe0, 0x05, 0xba, 0xec, 0x82, 0x05, 0x0b, 0x14, 0x91, 0xf0, 0x22, 0x68, 0xc6,
0x8d, 0x11, 0x6e, 0x3b, 0xdf, 0xbc, 0xf7, 0x7d, 0xef, 0x7b, 0x6f, 0xde, 0xa2, 0x2d, 0x7f, 0x3d, 0x43, 0x93, 0x36, 0x8d, 0x10, 0xed, 0xce, 0x73, 0xe6, 0x9e, 0x73, 0xee, 0x3d, 0xe3, 0x8b, 0xb6,
0x21, 0x5e, 0x64, 0xf9, 0x69, 0x07, 0x78, 0x08, 0x02, 0x12, 0x2b, 0xf6, 0x5d, 0x8b, 0xc5, 0x5e, 0x83, 0x8d, 0x94, 0xf8, 0xb1, 0x1d, 0x64, 0x3d, 0xe0, 0x11, 0x08, 0x48, 0xed, 0x24, 0xf0, 0x6c,
0x62, 0xb1, 0x54, 0xf4, 0x20, 0x14, 0x9e, 0xc3, 0x84, 0x17, 0x85, 0x56, 0xbf, 0xdd, 0x01, 0xc1, 0x96, 0xf8, 0xa9, 0xcd, 0x32, 0x31, 0x80, 0x48, 0xf8, 0x2e, 0x13, 0x7e, 0x1c, 0xd9, 0xc3, 0x6e,
0xda, 0x96, 0x0b, 0x21, 0x70, 0x26, 0xa0, 0x4b, 0x62, 0x1e, 0x89, 0x08, 0xb7, 0x33, 0x0a, 0x32, 0x0f, 0x04, 0xeb, 0xda, 0x1e, 0x44, 0xc0, 0x99, 0x80, 0x3e, 0x49, 0x78, 0x2c, 0x62, 0xdc, 0xcd,
0xa1, 0x20, 0xb1, 0xef, 0x12, 0x49, 0x41, 0x2e, 0x53, 0x10, 0x4d, 0x51, 0x7b, 0xea, 0x7a, 0xa2, 0x25, 0xc8, 0x54, 0x82, 0x24, 0x81, 0x47, 0xa4, 0x04, 0xb9, 0x2c, 0x41, 0xb4, 0x44, 0xe3, 0xb1,
0x97, 0x76, 0x88, 0x13, 0x05, 0x96, 0x1b, 0xb9, 0x91, 0xa5, 0x98, 0x3a, 0xe9, 0xa1, 0x3a, 0xa9, 0xe7, 0x8b, 0x41, 0xd6, 0x23, 0x6e, 0x1c, 0xda, 0x5e, 0xec, 0xc5, 0xb6, 0x52, 0xea, 0x65, 0x87,
0x83, 0xfa, 0xca, 0x14, 0x6a, 0xcf, 0x74, 0x91, 0x2c, 0xf6, 0x02, 0xe6, 0xf4, 0xbc, 0x10, 0xf8, 0xea, 0xa4, 0x0e, 0xea, 0x2b, 0x77, 0x68, 0x3c, 0xd1, 0x4d, 0xb2, 0xc4, 0x0f, 0x99, 0x3b, 0xf0,
0x60, 0x52, 0x66, 0x00, 0x82, 0x59, 0xfd, 0x99, 0xba, 0x6a, 0xd6, 0xbc, 0x2c, 0x9e, 0x86, 0xc2, 0x23, 0xe0, 0x27, 0xd3, 0x36, 0x43, 0x10, 0xcc, 0x1e, 0xce, 0xf5, 0xd5, 0xb0, 0x17, 0xb1, 0x78,
0x0b, 0x60, 0x26, 0x61, 0xed, 0x5f, 0x09, 0x89, 0xd3, 0x83, 0x80, 0xcd, 0xe4, 0xad, 0xce, 0xed, 0x16, 0x09, 0x3f, 0x84, 0x39, 0xc2, 0xfa, 0xdf, 0x08, 0xa9, 0x3b, 0x80, 0x90, 0xcd, 0xf1, 0xd6,
0xa1, 0xc5, 0x21, 0x89, 0x52, 0xee, 0xcc, 0x6a, 0xad, 0xcc, 0xcf, 0xb9, 0xc6, 0x4a, 0xfb, 0xfa, 0x16, 0x66, 0x68, 0x73, 0x48, 0xe3, 0x8c, 0xbb, 0xf3, 0x5e, 0xab, 0x8b, 0x39, 0xd7, 0x8c, 0xd2,
0xe8, 0x54, 0x78, 0x47, 0x96, 0x17, 0x8a, 0x44, 0xf0, 0xab, 0x29, 0xcd, 0xe7, 0x08, 0xed, 0x7c, 0xbd, 0xbe, 0x3a, 0x13, 0xfe, 0x91, 0xed, 0x47, 0x22, 0x15, 0xfc, 0x2a, 0xa5, 0xfd, 0x14, 0xa1,
0x16, 0x9c, 0xbd, 0x65, 0x47, 0x29, 0xe0, 0x3a, 0x2a, 0x7a, 0x02, 0x82, 0xa4, 0x6a, 0x34, 0xf2, 0xdd, 0x8f, 0x82, 0xb3, 0x37, 0xec, 0x28, 0x03, 0xdc, 0x44, 0x65, 0x5f, 0x40, 0x98, 0xd6, 0xcd,
0xad, 0xb2, 0x5d, 0x1e, 0x9d, 0xd7, 0x8b, 0xbb, 0x12, 0xa0, 0x19, 0xbe, 0x51, 0xfa, 0xfa, 0xbd, 0x56, 0xb1, 0x53, 0x75, 0xaa, 0x93, 0x51, 0xb3, 0xbc, 0x27, 0x01, 0x9a, 0xe3, 0x9b, 0x95, 0xcf,
0x9e, 0x3b, 0xf9, 0xd5, 0xc8, 0x35, 0xbf, 0xe5, 0x51, 0x65, 0x3f, 0xf2, 0x21, 0xa4, 0xd0, 0xf7, 0x5f, 0x9a, 0xc6, 0xe9, 0x8f, 0x96, 0xd1, 0xfe, 0x5a, 0x40, 0xb5, 0xd7, 0x71, 0x00, 0x11, 0x85,
0xe0, 0x18, 0xbf, 0x43, 0x25, 0xd9, 0xe1, 0x2e, 0x13, 0xac, 0x6a, 0x34, 0x8c, 0x56, 0x65, 0xb5, 0xa1, 0x0f, 0xc7, 0xf8, 0x2d, 0xaa, 0xc8, 0x84, 0xfb, 0x4c, 0xb0, 0xba, 0xd9, 0x32, 0x3b, 0xb5,
0x45, 0xe6, 0x4e, 0x9c, 0xf4, 0xdb, 0xe4, 0x4d, 0xe7, 0x13, 0x38, 0xe2, 0x35, 0x08, 0x66, 0xe3, 0xb5, 0x0e, 0x59, 0xf8, 0xe2, 0x64, 0xd8, 0x25, 0xaf, 0x7a, 0x1f, 0xc0, 0x15, 0x2f, 0x41, 0x30,
0xd3, 0xf3, 0x7a, 0x6e, 0x74, 0x5e, 0x47, 0x13, 0x8c, 0x8e, 0xd9, 0x70, 0x17, 0x15, 0x92, 0x18, 0x07, 0x9f, 0x8d, 0x9a, 0xc6, 0x64, 0xd4, 0x44, 0x53, 0x8c, 0x5e, 0xa8, 0xe1, 0x3e, 0x2a, 0xa5,
0x9c, 0xea, 0x82, 0x62, 0xb5, 0xc9, 0x7f, 0xbf, 0x23, 0x32, 0x55, 0xe7, 0x5e, 0x0c, 0x8e, 0x7d, 0x09, 0xb8, 0xf5, 0x82, 0x52, 0x75, 0xc8, 0x3f, 0xff, 0x47, 0x64, 0xa6, 0xcf, 0xfd, 0x04, 0x5c,
0x57, 0xeb, 0x15, 0xe4, 0x89, 0x2a, 0x76, 0x7c, 0x84, 0x16, 0x13, 0xc1, 0x44, 0x9a, 0x54, 0xf3, 0xe7, 0x7f, 0xed, 0x57, 0x92, 0x27, 0xaa, 0xd4, 0xf1, 0x11, 0x5a, 0x4a, 0x05, 0x13, 0x59, 0x5a,
0x4a, 0x67, 0xfb, 0x96, 0x3a, 0x8a, 0xcb, 0xbe, 0xa7, 0x95, 0x16, 0xb3, 0x33, 0xd5, 0x1a, 0xf8, 0x2f, 0x2a, 0x9f, 0x9d, 0x5b, 0xfa, 0x28, 0x2d, 0xe7, 0x8e, 0x76, 0x5a, 0xca, 0xcf, 0x54, 0x7b,
0x03, 0x2a, 0x89, 0x41, 0x0c, 0xd2, 0x69, 0xb5, 0xa0, 0xf4, 0xc8, 0x85, 0xde, 0xf4, 0xb3, 0x9a, 0xb4, 0xd7, 0xd1, 0xdd, 0x2b, 0x4d, 0xe1, 0x87, 0xa8, 0x2c, 0x24, 0xa4, 0xd2, 0xab, 0x3a, 0xcb,
0x28, 0xca, 0x6e, 0xc8, 0xae, 0xed, 0xeb, 0x2c, 0x7b, 0x59, 0x33, 0x97, 0x2e, 0x10, 0x3a, 0x66, 0x9a, 0x59, 0xce, 0xeb, 0xf2, 0xbb, 0xf6, 0x37, 0x13, 0xdd, 0x9b, 0x73, 0xc1, 0x5b, 0x68, 0x79,
0x6c, 0xae, 0xa1, 0xfb, 0x57, 0x2c, 0xe3, 0xc7, 0xa8, 0x28, 0x24, 0xa4, 0x66, 0x53, 0xb6, 0x97, 0xa6, 0x23, 0xe8, 0x2b, 0x89, 0x8a, 0x73, 0x5f, 0x4b, 0x2c, 0x6f, 0xcf, 0x5e, 0xd2, 0xcb, 0xb5,
0x74, 0x76, 0x31, 0x8b, 0xcb, 0xee, 0x9a, 0x3f, 0x0c, 0xf4, 0x60, 0xc6, 0x03, 0xde, 0x44, 0x4b, 0xf8, 0x3d, 0x2a, 0x65, 0x29, 0x70, 0x1d, 0xef, 0xd6, 0x0d, 0xc6, 0x3e, 0x48, 0x81, 0xef, 0x45,
0x53, 0x7e, 0xa1, 0xab, 0x28, 0x4a, 0xf6, 0x43, 0x4d, 0xb1, 0xb4, 0x35, 0x7d, 0x49, 0x2f, 0xc7, 0x87, 0xf1, 0x34, 0x57, 0x89, 0x50, 0x25, 0x2b, 0xc7, 0x02, 0xce, 0x63, 0xae, 0x62, 0x9d, 0x19,
0xe2, 0x8f, 0xa8, 0x90, 0x26, 0xc0, 0xf5, 0xf0, 0x36, 0x6f, 0xd0, 0xd4, 0x83, 0x04, 0xf8, 0x6e, 0x6b, 0x57, 0x82, 0x34, 0xbf, 0x6b, 0x8f, 0x0b, 0xa8, 0xf2, 0x47, 0x05, 0xaf, 0xa2, 0x8a, 0x64,
0x78, 0x18, 0x4d, 0xa6, 0x26, 0x11, 0xaa, 0x68, 0xa5, 0x2d, 0xe0, 0x3c, 0xe2, 0x6a, 0x68, 0x53, 0x46, 0x2c, 0x04, 0x9d, 0xc5, 0x8a, 0x26, 0xa9, 0x1a, 0x89, 0xd3, 0x8b, 0x0a, 0xfc, 0x00, 0x15,
0xb6, 0x76, 0x24, 0x48, 0xb3, 0xbb, 0xe6, 0x70, 0x01, 0x95, 0x2e, 0x58, 0xf0, 0x0a, 0x2a, 0xc9, 0x33, 0xbf, 0xaf, 0xba, 0xaf, 0x3a, 0x35, 0x5d, 0x58, 0x3c, 0xd8, 0xdb, 0xa1, 0x12, 0xc7, 0x6d,
0xcc, 0x90, 0x05, 0xa0, 0x7b, 0x31, 0xee, 0xe4, 0x81, 0xc6, 0xe9, 0x38, 0x02, 0x3f, 0x42, 0xf9, 0xb4, 0xe4, 0xf1, 0x38, 0x4b, 0xe4, 0xb3, 0xca, 0x5f, 0x1a, 0xc9, 0xc7, 0x78, 0xa1, 0x10, 0xaa,
0xd4, 0xeb, 0xaa, 0xea, 0xcb, 0x76, 0x45, 0x07, 0xe6, 0x0f, 0x76, 0xb7, 0xa9, 0xc4, 0x71, 0x13, 0x6f, 0x70, 0x80, 0xca, 0x20, 0x77, 0xa0, 0x5e, 0x6a, 0x15, 0x3b, 0xb5, 0xb5, 0xe7, 0xb7, 0x88,
0x2d, 0xba, 0x3c, 0x4a, 0x63, 0xf9, 0x68, 0xe4, 0xc2, 0x20, 0x39, 0xea, 0x57, 0x0a, 0xa1, 0xfa, 0x80, 0xa8, 0x65, 0xda, 0x8d, 0x04, 0x3f, 0x99, 0x19, 0x55, 0x62, 0x34, 0xf7, 0x68, 0x1c, 0xeb,
0x06, 0xfb, 0xa8, 0x08, 0x72, 0xc3, 0xaa, 0x85, 0x46, 0xbe, 0x55, 0x59, 0x7d, 0x79, 0x8b, 0x16, 0x85, 0x53, 0x35, 0x78, 0x05, 0x15, 0x03, 0x38, 0xc9, 0xc7, 0xa4, 0xf2, 0x13, 0xef, 0xa3, 0xf2,
0x10, 0xb5, 0xaa, 0x3b, 0xa1, 0xe0, 0x83, 0x29, 0xab, 0x12, 0xa3, 0x99, 0x46, 0xed, 0x58, 0xaf, 0x50, 0xee, 0xa2, 0x7e, 0x8f, 0x67, 0x37, 0x68, 0x66, 0xba, 0xd0, 0x34, 0xd7, 0xda, 0x2c, 0x6c,
0xb3, 0x8a, 0xc1, 0xcb, 0x28, 0xef, 0xc3, 0x20, 0xb3, 0x49, 0xe5, 0x27, 0xde, 0x43, 0xc5, 0xbe, 0x98, 0xce, 0xa3, 0xb3, 0xb1, 0x65, 0x9c, 0x8f, 0x2d, 0xe3, 0xfb, 0xd8, 0x32, 0x4e, 0x27, 0x96,
0xdc, 0x74, 0x3d, 0x8f, 0x17, 0x37, 0x28, 0x66, 0xf2, 0xbb, 0xa0, 0x19, 0xd7, 0xc6, 0xc2, 0xba, 0x79, 0x36, 0xb1, 0xcc, 0xf3, 0x89, 0x65, 0xfe, 0x9c, 0x58, 0xe6, 0xa7, 0x5f, 0x96, 0xf1, 0xee,
0x61, 0x3f, 0x39, 0x1d, 0x9a, 0xb9, 0xb3, 0xa1, 0x99, 0xfb, 0x39, 0x34, 0x73, 0x27, 0x23, 0xd3, 0x3f, 0x2d, 0xf0, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xec, 0x29, 0x42, 0xc3, 0xee, 0x05, 0x00, 0x00,
0x38, 0x1d, 0x99, 0xc6, 0xd9, 0xc8, 0x34, 0x7e, 0x8f, 0x4c, 0xe3, 0xcb, 0x1f, 0x33, 0xf7, 0xfe,
0x8e, 0x26, 0xf8, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x34, 0x80, 0x2a, 0x5b, 0x4c, 0x06, 0x00, 0x00,
} }

2
pkg/apis/authentication/v1beta1/generated.proto
View File

@ -44,8 +44,6 @@ message ExtraValue {
// Note: TokenReview requests may be cached by the webhook token authenticator // Note: TokenReview requests may be cached by the webhook token authenticator
// plugin in the kube-apiserver. // plugin in the kube-apiserver.
message TokenReview { message TokenReview {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;

1
pkg/apis/authorization/doc.go
View File

@ -14,6 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +groupName=authorization.k8s.io // +groupName=authorization.k8s.io
package authorization package authorization

5
pkg/apis/authorization/v1beta1/doc.go
View File

@ -14,10 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/authorization
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta
// +groupName=authorization.k8s.io // +groupName=authorization.k8s.io
package v1beta1 package v1beta1

317
pkg/apis/authorization/v1beta1/generated.pb.go
View File

@ -181,14 +181,6 @@ func (m *LocalSubjectAccessReview) MarshalTo(data []byte) (int, error) {
return 0, err return 0, err
} }
i += n3 i += n3
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n4, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n4
return i, nil return i, nil
} }
@ -282,35 +274,27 @@ func (m *SelfSubjectAccessReview) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size()))
n5, err := m.ObjectMeta.MarshalTo(data[i:]) n4, err := m.ObjectMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n4
data[i] = 0x12
i++
i = encodeVarintGenerated(data, i, uint64(m.Spec.Size()))
n5, err := m.Spec.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n5 i += n5
data[i] = 0x12 data[i] = 0x1a
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.Spec.Size())) i = encodeVarintGenerated(data, i, uint64(m.Status.Size()))
n6, err := m.Spec.MarshalTo(data[i:]) n6, err := m.Status.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n6 i += n6
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.Status.Size()))
n7, err := m.Status.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n7
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n8, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n8
return i, nil return i, nil
} }
@ -333,21 +317,21 @@ func (m *SelfSubjectAccessReviewSpec) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ResourceAttributes.Size())) i = encodeVarintGenerated(data, i, uint64(m.ResourceAttributes.Size()))
n9, err := m.ResourceAttributes.MarshalTo(data[i:]) n7, err := m.ResourceAttributes.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n9 i += n7
} }
if m.NonResourceAttributes != nil { if m.NonResourceAttributes != nil {
data[i] = 0x12 data[i] = 0x12
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.NonResourceAttributes.Size())) i = encodeVarintGenerated(data, i, uint64(m.NonResourceAttributes.Size()))
n10, err := m.NonResourceAttributes.MarshalTo(data[i:]) n8, err := m.NonResourceAttributes.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n10 i += n8
} }
return i, nil return i, nil
} }
@ -370,35 +354,27 @@ func (m *SubjectAccessReview) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size()))
n11, err := m.ObjectMeta.MarshalTo(data[i:]) n9, err := m.ObjectMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n9
data[i] = 0x12
i++
i = encodeVarintGenerated(data, i, uint64(m.Spec.Size()))
n10, err := m.Spec.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n10
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.Status.Size()))
n11, err := m.Status.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n11 i += n11
data[i] = 0x12
i++
i = encodeVarintGenerated(data, i, uint64(m.Spec.Size()))
n12, err := m.Spec.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n12
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.Status.Size()))
n13, err := m.Status.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n13
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n14, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n14
return i, nil return i, nil
} }
@ -421,21 +397,21 @@ func (m *SubjectAccessReviewSpec) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ResourceAttributes.Size())) i = encodeVarintGenerated(data, i, uint64(m.ResourceAttributes.Size()))
n15, err := m.ResourceAttributes.MarshalTo(data[i:]) n12, err := m.ResourceAttributes.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n15 i += n12
} }
if m.NonResourceAttributes != nil { if m.NonResourceAttributes != nil {
data[i] = 0x12 data[i] = 0x12
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.NonResourceAttributes.Size())) i = encodeVarintGenerated(data, i, uint64(m.NonResourceAttributes.Size()))
n16, err := m.NonResourceAttributes.MarshalTo(data[i:]) n13, err := m.NonResourceAttributes.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n16 i += n13
} }
data[i] = 0x1a data[i] = 0x1a
i++ i++
@ -471,11 +447,11 @@ func (m *SubjectAccessReviewSpec) MarshalTo(data []byte) (int, error) {
data[i] = 0x12 data[i] = 0x12
i++ i++
i = encodeVarintGenerated(data, i, uint64((&v).Size())) i = encodeVarintGenerated(data, i, uint64((&v).Size()))
n17, err := (&v).MarshalTo(data[i:]) n14, err := (&v).MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n17 i += n14
} }
} }
return i, nil return i, nil
@ -563,8 +539,6 @@ func (m *LocalSubjectAccessReview) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.Status.Size() l = m.Status.Size()
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -607,8 +581,6 @@ func (m *SelfSubjectAccessReview) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.Status.Size() l = m.Status.Size()
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -635,8 +607,6 @@ func (m *SubjectAccessReview) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.Status.Size() l = m.Status.Size()
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -703,7 +673,6 @@ func (this *LocalSubjectAccessReview) String() string {
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "SubjectAccessReviewSpec", "SubjectAccessReviewSpec", 1), `&`, ``, 1) + `,`, `Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "SubjectAccessReviewSpec", "SubjectAccessReviewSpec", 1), `&`, ``, 1) + `,`,
`Status:` + strings.Replace(strings.Replace(this.Status.String(), "SubjectAccessReviewStatus", "SubjectAccessReviewStatus", 1), `&`, ``, 1) + `,`, `Status:` + strings.Replace(strings.Replace(this.Status.String(), "SubjectAccessReviewStatus", "SubjectAccessReviewStatus", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -743,7 +712,6 @@ func (this *SelfSubjectAccessReview) String() string {
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "SelfSubjectAccessReviewSpec", "SelfSubjectAccessReviewSpec", 1), `&`, ``, 1) + `,`, `Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "SelfSubjectAccessReviewSpec", "SelfSubjectAccessReviewSpec", 1), `&`, ``, 1) + `,`,
`Status:` + strings.Replace(strings.Replace(this.Status.String(), "SubjectAccessReviewStatus", "SubjectAccessReviewStatus", 1), `&`, ``, 1) + `,`, `Status:` + strings.Replace(strings.Replace(this.Status.String(), "SubjectAccessReviewStatus", "SubjectAccessReviewStatus", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -767,7 +735,6 @@ func (this *SubjectAccessReview) String() string {
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "SubjectAccessReviewSpec", "SubjectAccessReviewSpec", 1), `&`, ``, 1) + `,`, `Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "SubjectAccessReviewSpec", "SubjectAccessReviewSpec", 1), `&`, ``, 1) + `,`,
`Status:` + strings.Replace(strings.Replace(this.Status.String(), "SubjectAccessReviewStatus", "SubjectAccessReviewStatus", 1), `&`, ``, 1) + `,`, `Status:` + strings.Replace(strings.Replace(this.Status.String(), "SubjectAccessReviewStatus", "SubjectAccessReviewStatus", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -1014,36 +981,6 @@ func (m *LocalSubjectAccessReview) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -1545,36 +1482,6 @@ func (m *SelfSubjectAccessReview) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -1831,36 +1738,6 @@ func (m *SubjectAccessReview) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -2406,63 +2283,61 @@ var (
) )
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 927 bytes of a gzipped FileDescriptorProto // 891 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x56, 0x4f, 0x6f, 0x1b, 0x45, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x56, 0x4f, 0x8f, 0xdb, 0x44,
0x14, 0xf7, 0xc6, 0x76, 0x62, 0x4f, 0x80, 0x94, 0xa9, 0x4a, 0xb6, 0x41, 0xb2, 0x2d, 0x23, 0xa1, 0x14, 0x8f, 0x93, 0x78, 0x37, 0x99, 0x05, 0xb6, 0x4c, 0x55, 0xd6, 0x5d, 0x24, 0x27, 0x0a, 0x12,
0x54, 0x2a, 0xbb, 0x24, 0xe2, 0x4f, 0x55, 0x71, 0x20, 0x2b, 0xa2, 0xaa, 0x82, 0x16, 0x34, 0x29, 0xda, 0x4a, 0xc5, 0x66, 0x57, 0xfc, 0xa9, 0x2a, 0x0e, 0xac, 0xc5, 0xaa, 0xaa, 0xa0, 0x05, 0xcd,
0x11, 0x02, 0x2e, 0xb3, 0x9b, 0x57, 0x7b, 0xb1, 0xbd, 0xb3, 0x9a, 0x99, 0x75, 0x31, 0xa7, 0x7e, 0xc2, 0x0a, 0xc1, 0x69, 0xec, 0x7d, 0x4d, 0x4c, 0x12, 0x8f, 0x35, 0x33, 0x76, 0x09, 0xa7, 0x7e,
0x00, 0x0e, 0x1c, 0x7b, 0xe4, 0x1b, 0x20, 0x24, 0x24, 0x6e, 0x5c, 0xc9, 0xb1, 0x47, 0x0e, 0xc8, 0x00, 0x0e, 0x1c, 0x7b, 0xe4, 0x2b, 0xf0, 0x05, 0xb8, 0xb2, 0xc7, 0x72, 0x41, 0x20, 0xa1, 0x88,
0x22, 0xcb, 0xb7, 0xe0, 0x84, 0x66, 0x76, 0xd6, 0x1b, 0xd7, 0x6b, 0x2a, 0x43, 0x85, 0x84, 0xc8, 0x35, 0xdf, 0x82, 0x13, 0xf2, 0x78, 0x12, 0x37, 0x8d, 0x43, 0x15, 0x58, 0xa1, 0x1e, 0x7a, 0xf3,
0x6d, 0xe7, 0xfd, 0xf9, 0xfd, 0xde, 0xbc, 0x79, 0x6f, 0xdf, 0x43, 0xef, 0x0e, 0x6e, 0x08, 0x27, 0xbc, 0x3f, 0xbf, 0xf7, 0x9b, 0x37, 0xbf, 0xf1, 0x1b, 0xf4, 0xfe, 0xf0, 0x86, 0x70, 0x42, 0xe6,
0x64, 0xee, 0x20, 0xf1, 0x81, 0x47, 0x20, 0x41, 0xb8, 0xf1, 0xa0, 0xe7, 0xd2, 0x38, 0x14, 0x2e, 0x0e, 0x13, 0x1f, 0x78, 0x04, 0x12, 0x84, 0x1b, 0x0f, 0xfb, 0x2e, 0x8d, 0x43, 0xe1, 0xd2, 0x44,
0x4d, 0x64, 0x9f, 0xf1, 0xf0, 0x2b, 0x2a, 0x43, 0x16, 0xb9, 0xe3, 0x3d, 0x1f, 0x24, 0xdd, 0x73, 0x0e, 0x18, 0x0f, 0xbf, 0xa1, 0x32, 0x64, 0x91, 0x9b, 0xee, 0xfb, 0x20, 0xe9, 0xbe, 0xdb, 0x87,
0x7b, 0x10, 0x01, 0xa7, 0x12, 0x4e, 0x9c, 0x98, 0x33, 0xc9, 0xf0, 0xeb, 0x19, 0x82, 0x53, 0x20, 0x08, 0x38, 0x95, 0x70, 0xea, 0xc4, 0x9c, 0x49, 0x86, 0xdf, 0x2c, 0x10, 0x9c, 0x12, 0xc1, 0x89,
0x38, 0xf1, 0xa0, 0xe7, 0x28, 0x04, 0x67, 0x0e, 0xc1, 0x31, 0x08, 0x3b, 0xaf, 0xf5, 0x42, 0xd9, 0x87, 0x7d, 0x27, 0x47, 0x70, 0x16, 0x10, 0x1c, 0x8d, 0xb0, 0xfb, 0x46, 0x3f, 0x94, 0x83, 0xc4,
0x4f, 0x7c, 0x27, 0x60, 0x23, 0xb7, 0xc7, 0x7a, 0xcc, 0xd5, 0x40, 0x7e, 0x72, 0x5f, 0x9f, 0xf4, 0x77, 0x02, 0x36, 0x76, 0xfb, 0xac, 0xcf, 0x5c, 0x05, 0xe4, 0x27, 0xf7, 0xd4, 0x4a, 0x2d, 0xd4,
0x41, 0x7f, 0x65, 0x04, 0x3b, 0x6f, 0x98, 0x10, 0x69, 0x1c, 0x8e, 0x68, 0xd0, 0x0f, 0x23, 0xe0, 0x57, 0x51, 0x60, 0xf7, 0x2d, 0x4d, 0x91, 0xc6, 0xe1, 0x98, 0x06, 0x83, 0x30, 0x02, 0x3e, 0x29,
0x93, 0x22, 0xc8, 0x11, 0x48, 0xea, 0x8e, 0x17, 0xc2, 0xda, 0x71, 0x97, 0x79, 0xf1, 0x24, 0x92, 0x49, 0x8e, 0x41, 0x52, 0x37, 0x5d, 0xa2, 0xb5, 0xeb, 0xae, 0xca, 0xe2, 0x49, 0x24, 0xc3, 0x31,
0xe1, 0x08, 0x16, 0x1c, 0xde, 0x7a, 0x9a, 0x83, 0x08, 0xfa, 0x30, 0xa2, 0x0b, 0x7e, 0xfb, 0x4b, 0x2c, 0x25, 0xbc, 0xf3, 0xb4, 0x04, 0x11, 0x0c, 0x60, 0x4c, 0x97, 0xf2, 0x0e, 0x56, 0x76, 0xd0,
0x33, 0xe8, 0x72, 0x10, 0x2c, 0xe1, 0xc1, 0x22, 0xd7, 0xf5, 0xe5, 0x3e, 0x25, 0x57, 0xd9, 0x2b, 0xe5, 0x20, 0x58, 0xc2, 0x83, 0xe5, 0x5a, 0xd7, 0x57, 0xe7, 0x54, 0x6c, 0x65, 0xbf, 0x3a, 0x3a,
0xb7, 0x4e, 0x64, 0x38, 0x74, 0xc3, 0x48, 0x0a, 0xc9, 0x9f, 0x74, 0xe9, 0xbe, 0x8d, 0xd0, 0xe1, 0x91, 0xe1, 0xc8, 0x0d, 0x23, 0x29, 0x24, 0x7f, 0x32, 0xa5, 0xf7, 0x2e, 0x42, 0x47, 0x5f, 0x4b,
0x97, 0x92, 0xd3, 0x63, 0x3a, 0x4c, 0x00, 0xb7, 0x51, 0x3d, 0x94, 0x30, 0x12, 0xb6, 0xd5, 0xa9, 0x4e, 0x4f, 0xe8, 0x28, 0x01, 0xdc, 0x41, 0x66, 0x28, 0x61, 0x2c, 0x2c, 0xa3, 0xdb, 0xd8, 0x6b,
0xee, 0x36, 0xbd, 0x66, 0x3a, 0x6d, 0xd7, 0x6f, 0x2b, 0x01, 0xc9, 0xe4, 0x37, 0x1b, 0x8f, 0xbe, 0x7b, 0xed, 0x6c, 0xda, 0x31, 0x6f, 0xe7, 0x06, 0x52, 0xd8, 0x6f, 0xb6, 0x1e, 0x7e, 0xdf, 0xa9,
0x6d, 0x57, 0x1e, 0xfe, 0xda, 0xa9, 0x74, 0x7f, 0xa8, 0x22, 0xfb, 0x03, 0x16, 0xd0, 0xe1, 0x51, 0x3d, 0xf8, 0xbd, 0x5b, 0xeb, 0xfd, 0x52, 0x47, 0xd6, 0x47, 0x2c, 0xa0, 0xa3, 0xe3, 0xc4, 0xff,
0xe2, 0x7f, 0x01, 0x81, 0x3c, 0x08, 0x02, 0x10, 0x82, 0xc0, 0x38, 0x84, 0x07, 0xf8, 0x13, 0xd4, 0x0a, 0x02, 0x79, 0x18, 0x04, 0x20, 0x04, 0x81, 0x34, 0x84, 0xfb, 0xf8, 0x73, 0xd4, 0xca, 0xdb,
0x50, 0xe9, 0x3e, 0xa1, 0x92, 0xda, 0x56, 0xc7, 0xda, 0xdd, 0xdc, 0xdf, 0x75, 0x96, 0xbe, 0xbe, 0x7d, 0x4a, 0x25, 0xb5, 0x8c, 0xae, 0xb1, 0xb7, 0x75, 0xb0, 0xe7, 0xac, 0x3c, 0x7d, 0x27, 0xdd,
0x33, 0xde, 0x73, 0x3e, 0xd4, 0x18, 0x77, 0x40, 0x52, 0x0f, 0x9f, 0x4e, 0xdb, 0x95, 0x74, 0xda, 0x77, 0x3e, 0x56, 0x18, 0x77, 0x40, 0x52, 0x0f, 0x9f, 0x4d, 0x3b, 0xb5, 0x6c, 0xda, 0x41, 0xa5,
0x46, 0x85, 0x8c, 0xcc, 0xd0, 0xf0, 0x00, 0xd5, 0x44, 0x0c, 0x81, 0xbd, 0xa6, 0x51, 0x6f, 0x3b, 0x8d, 0xcc, 0xd1, 0xf0, 0x10, 0x35, 0x45, 0x0c, 0x81, 0x55, 0x57, 0xa8, 0xb7, 0x9d, 0x75, 0x35,
0xab, 0xd6, 0x94, 0x53, 0x12, 0xee, 0x51, 0x0c, 0x81, 0xf7, 0x9c, 0xa1, 0xad, 0xa9, 0x13, 0xd1, 0xe5, 0x54, 0xd0, 0x3d, 0x8e, 0x21, 0xf0, 0x5e, 0xd0, 0x65, 0x9b, 0xf9, 0x8a, 0xa8, 0x22, 0x58,
0x24, 0x58, 0xa0, 0x75, 0x21, 0xa9, 0x4c, 0x84, 0x5d, 0xd5, 0x74, 0xef, 0x3f, 0x1b, 0x3a, 0x0d, 0xa0, 0x0d, 0x21, 0xa9, 0x4c, 0x84, 0xd5, 0x50, 0xe5, 0x3e, 0xbc, 0x98, 0x72, 0x0a, 0xd2, 0x7b,
0xe9, 0xbd, 0x60, 0x08, 0xd7, 0xb3, 0x33, 0x31, 0x54, 0xf8, 0x73, 0xd4, 0x90, 0x93, 0x18, 0xd4, 0x49, 0x17, 0xdc, 0x28, 0xd6, 0x44, 0x97, 0xea, 0x7d, 0x89, 0xae, 0xdc, 0x65, 0x11, 0xd1, 0x8a,
0xbd, 0xed, 0x9a, 0xa6, 0x75, 0x72, 0xda, 0xf3, 0x15, 0x57, 0x10, 0xab, 0xdc, 0xa8, 0x1c, 0xde, 0x38, 0x94, 0x92, 0x87, 0x7e, 0x22, 0x41, 0xe0, 0x2e, 0x6a, 0xc6, 0x54, 0x0e, 0x54, 0x43, 0xdb,
0x33, 0x5e, 0xde, 0x25, 0x83, 0xdc, 0xc8, 0x25, 0x64, 0x86, 0xd8, 0xfd, 0x0c, 0x5d, 0xb9, 0xcb, 0x25, 0xdf, 0x4f, 0xa8, 0x1c, 0x10, 0xe5, 0xc9, 0x23, 0x52, 0xe0, 0xbe, 0x6a, 0xce, 0x63, 0x11,
0x22, 0x62, 0xea, 0xed, 0x40, 0x4a, 0x1e, 0xfa, 0x89, 0x04, 0x81, 0x3b, 0xa8, 0x16, 0x53, 0xd9, 0x27, 0xc0, 0x7d, 0xa2, 0x3c, 0xbd, 0x1f, 0xeb, 0x08, 0x57, 0x40, 0xbb, 0xa8, 0x1d, 0xd1, 0x31,
0xd7, 0xcf, 0xd5, 0x2c, 0xb2, 0xf1, 0x11, 0x95, 0x7d, 0xa2, 0x35, 0xca, 0x62, 0x0c, 0xdc, 0xd7, 0x88, 0x98, 0x06, 0xa0, 0xf1, 0x5f, 0xd6, 0xd9, 0xed, 0xbb, 0x33, 0x07, 0x29, 0x63, 0x9e, 0x5e,
0xa9, 0x3f, 0x67, 0x71, 0x0c, 0xdc, 0x27, 0x5a, 0xd3, 0xfd, 0x69, 0x0d, 0xe1, 0x12, 0x68, 0x17, 0x09, 0xbf, 0x86, 0xcc, 0x3e, 0x67, 0x49, 0xac, 0x5a, 0xd7, 0xf6, 0x5e, 0xd4, 0x21, 0xe6, 0xad,
0x35, 0x23, 0x3a, 0x02, 0x11, 0xd3, 0x00, 0x0c, 0xfe, 0x8b, 0xc6, 0xbb, 0x79, 0x37, 0x57, 0x90, 0xdc, 0x48, 0x0a, 0x1f, 0xbe, 0x86, 0x36, 0x53, 0xe0, 0x22, 0x64, 0x91, 0xd5, 0x54, 0x61, 0xdb,
0xc2, 0xe6, 0xe9, 0x4c, 0xf8, 0x15, 0x54, 0xef, 0x71, 0x96, 0xc4, 0xfa, 0x61, 0x9a, 0xde, 0xf3, 0x3a, 0x6c, 0xf3, 0xa4, 0x30, 0x93, 0x99, 0x1f, 0x5f, 0x47, 0xad, 0xd9, 0x2d, 0xb1, 0x4c, 0x15,
0xc6, 0xa4, 0x7e, 0x4b, 0x09, 0x49, 0xa6, 0xc3, 0xd7, 0xd0, 0xc6, 0x18, 0xb8, 0x08, 0x59, 0xa4, 0x7b, 0x49, 0xc7, 0xb6, 0x66, 0x1b, 0x22, 0xf3, 0x08, 0xfc, 0x36, 0xda, 0x12, 0x89, 0x3f, 0x4f,
0x13, 0xd9, 0xf4, 0xb6, 0x8c, 0xd9, 0xc6, 0x71, 0x26, 0x26, 0xb9, 0x1e, 0x5f, 0x47, 0x8d, 0xbc, 0xd8, 0x50, 0x09, 0x97, 0x75, 0xc2, 0xd6, 0x71, 0xe9, 0x22, 0x8f, 0xc7, 0xe5, 0xdb, 0xca, 0xf7,
0x07, 0xed, 0xba, 0xb6, 0x9d, 0x25, 0x31, 0xbf, 0x10, 0x99, 0x59, 0xe0, 0x37, 0xd1, 0xa6, 0x48, 0x68, 0x6d, 0x2e, 0x6e, 0x2b, 0x6f, 0x01, 0x51, 0x9e, 0xde, 0x6f, 0x75, 0xb4, 0x73, 0x0c, 0xa3,
0xfc, 0x99, 0xc3, 0xba, 0x76, 0xb8, 0x6c, 0x1c, 0x36, 0x8f, 0x0a, 0x15, 0x39, 0x6f, 0xa7, 0xae, 0x7b, 0xff, 0xaf, 0xea, 0xd9, 0x82, 0xea, 0xef, 0xfc, 0x0b, 0x19, 0x56, 0x53, 0x7e, 0xb6, 0x94,
0xa5, 0xee, 0x68, 0x6f, 0xcc, 0x5f, 0x4b, 0xa5, 0x80, 0x68, 0x4d, 0xf7, 0xc7, 0x2a, 0xda, 0x3e, 0xff, 0x53, 0x1d, 0xbd, 0xfa, 0x0f, 0x44, 0xf1, 0xb7, 0x06, 0xc2, 0x7c, 0x49, 0xbc, 0xba, 0xd5,
0x82, 0xe1, 0xfd, 0x7f, 0xb7, 0xa7, 0xd8, 0x5c, 0x4f, 0xdd, 0xf9, 0x1b, 0x45, 0x5e, 0x1e, 0xf2, 0x1f, 0xac, 0xcf, 0x70, 0xf9, 0x22, 0x78, 0xaf, 0x64, 0xd3, 0x4e, 0xc5, 0x05, 0x21, 0x15, 0x75,
0xff, 0xa9, 0xaf, 0x7e, 0x5e, 0x43, 0x2f, 0xff, 0x45, 0x1a, 0xf0, 0xd7, 0x16, 0xc2, 0x7c, 0xa1, 0xf1, 0x43, 0x03, 0x5d, 0x89, 0xaa, 0x6e, 0xaa, 0x3e, 0xa6, 0x5b, 0xeb, 0x33, 0xaa, 0xbc, 0xf8,
0x35, 0xcc, 0x43, 0xbe, 0xb7, 0xfa, 0xfd, 0x17, 0xdb, 0xcc, 0x7b, 0x29, 0x9d, 0xb6, 0x4b, 0xda, 0xde, 0xd5, 0x6c, 0xda, 0xa9, 0xfe, 0x27, 0x90, 0x6a, 0x02, 0xbd, 0x9f, 0xeb, 0xe8, 0xf2, 0xf3,
0x8f, 0x94, 0xf0, 0xe2, 0x47, 0x16, 0xba, 0x12, 0x95, 0xfd, 0x07, 0x4c, 0x11, 0xdc, 0x5a, 0x3d, 0xff, 0xf2, 0xc5, 0xaa, 0xf3, 0xaf, 0x26, 0xda, 0x79, 0xae, 0xcc, 0xff, 0xa8, 0xcc, 0xf9, 0xe0,
0xa2, 0xd2, 0xdf, 0x8a, 0x77, 0x35, 0x9d, 0xb6, 0xcb, 0xff, 0x38, 0xa4, 0x3c, 0x80, 0xee, 0x77, 0x68, 0x2c, 0xfe, 0x61, 0x3f, 0x13, 0xc0, 0xf5, 0xe0, 0xe8, 0xce, 0x06, 0x47, 0x53, 0xbd, 0x41,
0x55, 0x74, 0xf9, 0x62, 0xa6, 0xfc, 0x97, 0x6a, 0xff, 0x8f, 0x1a, 0xda, 0xbe, 0xa8, 0xfb, 0x7f, 0x50, 0x7e, 0x14, 0x6a, 0x68, 0x88, 0xd9, 0xd4, 0x98, 0x20, 0x13, 0xf2, 0x37, 0x8b, 0x65, 0x76,
0x58, 0xf7, 0xb3, 0xa1, 0x57, 0x9d, 0x9f, 0x0e, 0x1f, 0x0b, 0xe0, 0x66, 0xe8, 0x75, 0xf2, 0xa1, 0x1b, 0x7b, 0x5b, 0x07, 0x9f, 0x5e, 0x98, 0xd8, 0x1c, 0xf5, 0x14, 0x3a, 0x8a, 0x24, 0x9f, 0x94,
0x57, 0xd3, 0xdb, 0x19, 0x52, 0x0f, 0xad, 0x07, 0x9e, 0xc8, 0x27, 0xde, 0x04, 0xd5, 0x41, 0x6d, 0x03, 0x4b, 0xd9, 0x48, 0x51, 0x71, 0x37, 0xd5, 0xcf, 0x25, 0x15, 0x83, 0x2f, 0xa1, 0xc6, 0x10,
0x73, 0x76, 0xbd, 0x53, 0xdd, 0xdd, 0xdc, 0xbf, 0xf7, 0xcc, 0x4a, 0xd9, 0xd1, 0x4b, 0xe2, 0x61, 0x26, 0xc5, 0xc0, 0x24, 0xf9, 0x27, 0x26, 0xc8, 0x4c, 0xf3, 0x97, 0x94, 0x6e, 0xf4, 0x7b, 0xeb,
0x24, 0xf9, 0xa4, 0x18, 0xb6, 0x5a, 0x46, 0x32, 0xc6, 0x9d, 0xb1, 0x59, 0x24, 0xb5, 0x0d, 0xbe, 0x53, 0x2b, 0x5f, 0x63, 0xa4, 0x80, 0xba, 0x59, 0xbf, 0x61, 0xf4, 0x7e, 0x30, 0xd0, 0xd5, 0x95,
0x84, 0xaa, 0x03, 0x98, 0x64, 0xc3, 0x9e, 0xa8, 0x4f, 0x4c, 0x50, 0x7d, 0xac, 0x76, 0x4c, 0x93, 0x92, 0xcd, 0xc7, 0x28, 0x1d, 0x8d, 0xd8, 0x7d, 0x38, 0x55, 0x5c, 0x5a, 0xe5, 0x18, 0x3d, 0x2c,
0xe8, 0x77, 0x56, 0x0f, 0xad, 0xd8, 0x53, 0x49, 0x06, 0x75, 0x73, 0xed, 0x86, 0xd5, 0xfd, 0xde, 0xcc, 0x64, 0xe6, 0xc7, 0xaf, 0xa3, 0x0d, 0x0e, 0x54, 0xb0, 0x48, 0x8f, 0xee, 0xb9, 0xda, 0x89,
0x42, 0x57, 0x97, 0x36, 0x84, 0x5a, 0x01, 0xe8, 0x70, 0xc8, 0x1e, 0xc0, 0x89, 0x8e, 0xa5, 0x51, 0xb2, 0x12, 0xed, 0xc5, 0x87, 0x68, 0x1b, 0xf2, 0xf2, 0x8a, 0xdc, 0x11, 0xe7, 0x8c, 0xeb, 0x23,
0xac, 0x00, 0x07, 0x99, 0x98, 0xe4, 0x7a, 0xfc, 0x2a, 0x5a, 0xe7, 0x40, 0x05, 0x8b, 0xcc, 0xda, 0xdb, 0xd1, 0x09, 0xdb, 0x47, 0x8b, 0x6e, 0xf2, 0x64, 0xbc, 0x77, 0xed, 0xec, 0xdc, 0xae, 0x3d,
0x31, 0xeb, 0x25, 0xa2, 0xa5, 0xc4, 0x68, 0xf1, 0x01, 0xda, 0x02, 0x45, 0xaf, 0x83, 0x3b, 0xe4, 0x3a, 0xb7, 0x6b, 0xbf, 0x9e, 0xdb, 0xb5, 0x07, 0x99, 0x6d, 0x9c, 0x65, 0xb6, 0xf1, 0x28, 0xb3,
0x9c, 0x71, 0xf3, 0x64, 0xdb, 0xc6, 0x61, 0xeb, 0x70, 0x5e, 0x4d, 0x9e, 0xb4, 0xf7, 0xae, 0x9d, 0x8d, 0x3f, 0x32, 0xdb, 0xf8, 0xee, 0x4f, 0xbb, 0xf6, 0xc5, 0xa6, 0xde, 0xf4, 0xdf, 0x01, 0x00,
0x9e, 0xb5, 0x2a, 0x8f, 0xcf, 0x5a, 0x95, 0x5f, 0xce, 0x5a, 0x95, 0x87, 0x69, 0xcb, 0x3a, 0x4d, 0x00, 0xff, 0xff, 0x1f, 0x8b, 0xf7, 0x94, 0x5d, 0x0c, 0x00, 0x00,
0x5b, 0xd6, 0xe3, 0xb4, 0x65, 0xfd, 0x96, 0xb6, 0xac, 0x6f, 0x7e, 0x6f, 0x55, 0x3e, 0xdd, 0x30,
0x97, 0xfe, 0x33, 0x00, 0x00, 0xff, 0xff, 0x4a, 0x7d, 0x0c, 0xb9, 0x77, 0x0d, 0x00, 0x00,
} }

6
pkg/apis/authorization/v1beta1/generated.proto
View File

@ -44,8 +44,6 @@ message ExtraValue {
// Having a namespace scoped resource makes it much easier to grant namespace scoped policy that includes permissions // Having a namespace scoped resource makes it much easier to grant namespace scoped policy that includes permissions
// checking. // checking.
message LocalSubjectAccessReview { message LocalSubjectAccessReview {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
@ -107,8 +105,6 @@ message ResourceAttributes {
// spec.namespace means "in all namespaces". Self is a special case, because users should always be able // spec.namespace means "in all namespaces". Self is a special case, because users should always be able
// to check whether they can perform an action // to check whether they can perform an action
message SelfSubjectAccessReview { message SelfSubjectAccessReview {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
@ -134,8 +130,6 @@ message SelfSubjectAccessReviewSpec {
// SubjectAccessReview checks whether or not a user or group can perform an action. // SubjectAccessReview checks whether or not a user or group can perform an action.
message SubjectAccessReview { message SubjectAccessReview {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;

2
pkg/apis/autoscaling/doc.go
View File

@ -14,6 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
package autoscaling package autoscaling

5
pkg/apis/autoscaling/v1/doc.go
View File

@ -14,9 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/autoscaling
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta
package v1 package v1

281
pkg/apis/autoscaling/v1/generated.pb.go
View File

@ -175,14 +175,6 @@ func (m *HorizontalPodAutoscaler) MarshalTo(data []byte) (int, error) {
return 0, err return 0, err
} }
i += n3 i += n3
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n4, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n4
return i, nil return i, nil
} }
@ -204,11 +196,11 @@ func (m *HorizontalPodAutoscalerList) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size()))
n5, err := m.ListMeta.MarshalTo(data[i:]) n4, err := m.ListMeta.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n5 i += n4
if len(m.Items) > 0 { if len(m.Items) > 0 {
for _, msg := range m.Items { for _, msg := range m.Items {
data[i] = 0x12 data[i] = 0x12
@ -221,14 +213,6 @@ func (m *HorizontalPodAutoscalerList) MarshalTo(data []byte) (int, error) {
i += n i += n
} }
} }
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n6, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n6
return i, nil return i, nil
} }
@ -250,11 +234,11 @@ func (m *HorizontalPodAutoscalerSpec) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ScaleTargetRef.Size())) i = encodeVarintGenerated(data, i, uint64(m.ScaleTargetRef.Size()))
n7, err := m.ScaleTargetRef.MarshalTo(data[i:]) n5, err := m.ScaleTargetRef.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n7 i += n5
if m.MinReplicas != nil { if m.MinReplicas != nil {
data[i] = 0x10 data[i] = 0x10
i++ i++
@ -295,11 +279,11 @@ func (m *HorizontalPodAutoscalerStatus) MarshalTo(data []byte) (int, error) {
data[i] = 0x12 data[i] = 0x12
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.LastScaleTime.Size())) i = encodeVarintGenerated(data, i, uint64(m.LastScaleTime.Size()))
n8, err := m.LastScaleTime.MarshalTo(data[i:]) n6, err := m.LastScaleTime.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n8 i += n6
} }
data[i] = 0x18 data[i] = 0x18
i++ i++
@ -333,35 +317,27 @@ func (m *Scale) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size()))
n9, err := m.ObjectMeta.MarshalTo(data[i:]) n7, err := m.ObjectMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n7
data[i] = 0x12
i++
i = encodeVarintGenerated(data, i, uint64(m.Spec.Size()))
n8, err := m.Spec.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n8
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.Status.Size()))
n9, err := m.Status.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n9 i += n9
data[i] = 0x12
i++
i = encodeVarintGenerated(data, i, uint64(m.Spec.Size()))
n10, err := m.Spec.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n10
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.Status.Size()))
n11, err := m.Status.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n11
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n12, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n12
return i, nil return i, nil
} }
@ -459,8 +435,6 @@ func (m *HorizontalPodAutoscaler) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.Status.Size() l = m.Status.Size()
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -475,8 +449,6 @@ func (m *HorizontalPodAutoscalerList) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
} }
} }
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -522,8 +494,6 @@ func (m *Scale) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.Status.Size() l = m.Status.Size()
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -576,7 +546,6 @@ func (this *HorizontalPodAutoscaler) String() string {
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "HorizontalPodAutoscalerSpec", "HorizontalPodAutoscalerSpec", 1), `&`, ``, 1) + `,`, `Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "HorizontalPodAutoscalerSpec", "HorizontalPodAutoscalerSpec", 1), `&`, ``, 1) + `,`,
`Status:` + strings.Replace(strings.Replace(this.Status.String(), "HorizontalPodAutoscalerStatus", "HorizontalPodAutoscalerStatus", 1), `&`, ``, 1) + `,`, `Status:` + strings.Replace(strings.Replace(this.Status.String(), "HorizontalPodAutoscalerStatus", "HorizontalPodAutoscalerStatus", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -588,7 +557,6 @@ func (this *HorizontalPodAutoscalerList) String() string {
s := strings.Join([]string{`&HorizontalPodAutoscalerList{`, s := strings.Join([]string{`&HorizontalPodAutoscalerList{`,
`ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`,
`Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "HorizontalPodAutoscaler", "HorizontalPodAutoscaler", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "HorizontalPodAutoscaler", "HorizontalPodAutoscaler", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -628,7 +596,6 @@ func (this *Scale) String() string {
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "ScaleSpec", "ScaleSpec", 1), `&`, ``, 1) + `,`, `Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "ScaleSpec", "ScaleSpec", 1), `&`, ``, 1) + `,`,
`Status:` + strings.Replace(strings.Replace(this.Status.String(), "ScaleStatus", "ScaleStatus", 1), `&`, ``, 1) + `,`, `Status:` + strings.Replace(strings.Replace(this.Status.String(), "ScaleStatus", "ScaleStatus", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -918,36 +885,6 @@ func (m *HorizontalPodAutoscaler) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -1059,36 +996,6 @@ func (m *HorizontalPodAutoscalerList) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -1529,36 +1436,6 @@ func (m *Scale) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -1853,61 +1730,59 @@ var (
) )
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 888 bytes of a gzipped FileDescriptorProto // 855 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xc4, 0x56, 0x4d, 0x6f, 0xdc, 0x44, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x6f, 0xdc, 0x44,
0x18, 0x5e, 0xef, 0x47, 0x95, 0x8e, 0x49, 0x02, 0x83, 0xd4, 0xae, 0x52, 0x61, 0x47, 0x0b, 0x87, 0x14, 0x5f, 0xef, 0x47, 0x95, 0x8e, 0x49, 0x02, 0x83, 0xd4, 0xae, 0x52, 0x61, 0x47, 0x0b, 0x87,
0x80, 0x8a, 0xad, 0x5d, 0x95, 0x8a, 0x1e, 0xe3, 0xa0, 0xd2, 0x8a, 0x86, 0x46, 0x93, 0xb4, 0x42, 0x80, 0x8a, 0xad, 0x5d, 0x95, 0x8a, 0x1e, 0xe3, 0xa0, 0xd2, 0x8a, 0x86, 0x46, 0x93, 0xb6, 0x42,
0x08, 0x21, 0xcd, 0x7a, 0xdf, 0x3a, 0xd3, 0x5d, 0x7f, 0x68, 0x66, 0xbc, 0xa2, 0x3d, 0x71, 0xe2, 0x08, 0x21, 0xcd, 0x7a, 0x5f, 0x9d, 0xe9, 0xae, 0x3d, 0xd6, 0xcc, 0x78, 0x05, 0x3d, 0x71, 0xe2,
0xcc, 0x85, 0x9f, 0xc1, 0x8f, 0x80, 0x53, 0x8e, 0x3d, 0x72, 0x5a, 0x11, 0xf3, 0x23, 0xb8, 0x70, 0xcc, 0x85, 0x03, 0x7f, 0x0e, 0xb7, 0xdc, 0xe8, 0x91, 0xd3, 0x8a, 0x18, 0xfe, 0x0c, 0x0e, 0xc8,
0x40, 0x9e, 0x9d, 0x78, 0xed, 0x4d, 0x9c, 0x0f, 0x11, 0xd4, 0xdb, 0xce, 0xcc, 0xf3, 0xf1, 0xce, 0xb3, 0x13, 0xef, 0x57, 0xbc, 0x49, 0x04, 0xdc, 0x76, 0xe6, 0xfd, 0x3e, 0xde, 0xbc, 0xf7, 0xfc,
0x33, 0xef, 0x78, 0x16, 0x3d, 0x18, 0x7f, 0x2e, 0x1c, 0x16, 0xbb, 0xe3, 0x74, 0x08, 0x3c, 0x02, 0x16, 0x3d, 0x18, 0x7e, 0x2a, 0x3d, 0xc6, 0xfd, 0x61, 0xd6, 0x07, 0x91, 0x80, 0x02, 0xe9, 0xa7,
0x09, 0xc2, 0x4d, 0xc6, 0x81, 0x4b, 0x13, 0x26, 0x5c, 0x9a, 0xca, 0x58, 0xf8, 0x74, 0xc2, 0xa2, 0xc3, 0xc8, 0xa7, 0x29, 0x93, 0x3e, 0xcd, 0x14, 0x97, 0x21, 0x1d, 0xb1, 0x24, 0xf2, 0xc7, 0x5d,
0xc0, 0x9d, 0xf6, 0xdd, 0x00, 0x22, 0xe0, 0x54, 0xc2, 0xc8, 0x49, 0x78, 0x2c, 0x63, 0xfc, 0xf1, 0x3f, 0x82, 0x04, 0x04, 0x55, 0x30, 0xf0, 0x52, 0xc1, 0x15, 0xc7, 0x1f, 0x4e, 0xa9, 0xde, 0x8c,
0x9c, 0xea, 0x2c, 0xa8, 0x4e, 0x32, 0x0e, 0x9c, 0x9c, 0xea, 0x94, 0xa8, 0xce, 0xb4, 0xbf, 0xf1, 0xea, 0xa5, 0xc3, 0xc8, 0x2b, 0xa8, 0xde, 0x1c, 0xd5, 0x1b, 0x77, 0x77, 0x3e, 0x8e, 0x98, 0x3a,
0x69, 0xc0, 0xe4, 0x61, 0x3a, 0x74, 0xfc, 0x38, 0x74, 0x83, 0x38, 0x88, 0x5d, 0xa5, 0x30, 0x4c, 0xc9, 0xfa, 0x5e, 0xc8, 0x63, 0x3f, 0xe2, 0x11, 0xf7, 0xb5, 0x42, 0x3f, 0x7b, 0xa9, 0x4f, 0xfa,
0x5f, 0xa8, 0x91, 0x1a, 0xa8, 0x5f, 0x73, 0xe5, 0x8d, 0x7b, 0xba, 0x28, 0x9a, 0xb0, 0x90, 0xfa, 0xa0, 0x7f, 0x4d, 0x95, 0x77, 0xee, 0x99, 0xa4, 0x68, 0xca, 0x62, 0x1a, 0x9e, 0xb0, 0x04, 0xc4,
0x87, 0x2c, 0x02, 0xfe, 0x6a, 0x51, 0x56, 0x08, 0x92, 0x9e, 0x51, 0xcf, 0x86, 0x5b, 0xc7, 0xe2, 0xf7, 0xb3, 0xb4, 0x62, 0x50, 0xf4, 0x82, 0x7c, 0x76, 0xfc, 0x2a, 0x96, 0xc8, 0x12, 0xc5, 0x62,
0x69, 0x24, 0x59, 0x08, 0xa7, 0x08, 0xf7, 0x2f, 0x22, 0x08, 0xff, 0x10, 0x42, 0x7a, 0x8a, 0x37, 0x58, 0x21, 0xdc, 0xbf, 0x8c, 0x20, 0xc3, 0x13, 0x88, 0xe9, 0x0a, 0xaf, 0x57, 0x59, 0x33, 0x5f,
0xa8, 0xcd, 0xcc, 0xe5, 0x20, 0xe2, 0x94, 0xfb, 0xa7, 0xbd, 0xee, 0xd6, 0x73, 0xce, 0xd8, 0x4a, 0x80, 0xe4, 0x99, 0x08, 0x57, 0xbd, 0xee, 0x56, 0x73, 0x2e, 0x78, 0x4a, 0xf7, 0x62, 0x74, 0xa6,
0xff, 0x6c, 0x74, 0x2a, 0xd9, 0xc4, 0x65, 0x91, 0x14, 0x92, 0x2f, 0x53, 0x7a, 0xbf, 0x18, 0xe8, 0xd8, 0xc8, 0x67, 0x89, 0x92, 0x4a, 0x2c, 0x53, 0x3a, 0x3f, 0x5b, 0xe8, 0xce, 0x81, 0xe0, 0x52,
0xce, 0x0e, 0x8f, 0x85, 0x78, 0x0e, 0x5c, 0xb0, 0x38, 0x7a, 0x3a, 0x7c, 0x09, 0xbe, 0x24, 0xf0, 0xbe, 0x00, 0x21, 0x19, 0x4f, 0x9e, 0xf6, 0x5f, 0x41, 0xa8, 0x08, 0xbc, 0x04, 0x01, 0x49, 0x08,
0x02, 0x38, 0x44, 0x3e, 0xe0, 0x4d, 0xd4, 0x1e, 0xb3, 0x68, 0xd4, 0x35, 0x36, 0x8d, 0xad, 0x9b, 0x78, 0x17, 0x35, 0x87, 0x2c, 0x19, 0xb4, 0xad, 0x5d, 0x6b, 0xef, 0x66, 0xf0, 0xd6, 0xe9, 0xc4,
0xde, 0x3b, 0x47, 0x33, 0xbb, 0x91, 0xcd, 0xec, 0xf6, 0x57, 0x2c, 0x1a, 0x11, 0xb5, 0x92, 0x23, 0xad, 0xe5, 0x13, 0xb7, 0xf9, 0x05, 0x4b, 0x06, 0x44, 0x47, 0x0a, 0x44, 0x42, 0x63, 0x68, 0xd7,
0x22, 0x1a, 0x42, 0xb7, 0x59, 0x45, 0x7c, 0x4d, 0x43, 0x20, 0x6a, 0x05, 0x0f, 0x10, 0xa2, 0x09, 0x17, 0x11, 0x5f, 0xd2, 0x18, 0x88, 0x8e, 0xe0, 0x1e, 0x42, 0x34, 0x65, 0xc6, 0xa0, 0xdd, 0xd0,
0xd3, 0x06, 0xdd, 0x96, 0xc2, 0x61, 0x8d, 0x43, 0xdb, 0x7b, 0x8f, 0xf5, 0x0a, 0x29, 0xa1, 0x7a, 0x38, 0x6c, 0x70, 0x68, 0xff, 0xe8, 0xb1, 0x89, 0x90, 0x39, 0x54, 0xe7, 0xb7, 0x3a, 0xba, 0xfd,
0xbf, 0xb6, 0xd0, 0xed, 0x47, 0x31, 0x67, 0xaf, 0xe3, 0x48, 0xd2, 0xc9, 0x5e, 0x3c, 0xda, 0xd6, 0x88, 0x0b, 0xf6, 0x9a, 0x27, 0x8a, 0x8e, 0x8e, 0xf8, 0x60, 0xdf, 0x8c, 0x06, 0x08, 0xfc, 0x15,
0xad, 0x01, 0x1c, 0x7f, 0x83, 0x56, 0xf2, 0xc3, 0x1c, 0x51, 0x49, 0x55, 0x5d, 0xe6, 0x60, 0xcb, 0xda, 0x28, 0x9a, 0x39, 0xa0, 0x8a, 0xea, 0xbc, 0xec, 0xde, 0x9e, 0x57, 0x39, 0x54, 0xde, 0xb8,
0xa9, 0x6d, 0x2a, 0x67, 0xda, 0x77, 0xe6, 0x9b, 0xda, 0x05, 0x49, 0x17, 0xbe, 0x8b, 0x39, 0x52, 0xeb, 0x4d, 0x1f, 0x75, 0x08, 0x8a, 0xce, 0x7c, 0x67, 0x77, 0xa4, 0x54, 0xc3, 0x27, 0xa8, 0x29,
0xa8, 0xe1, 0x43, 0xd4, 0x16, 0x09, 0xf8, 0x6a, 0x2f, 0xe6, 0xe0, 0xa1, 0x73, 0xe9, 0x56, 0x75, 0x53, 0x08, 0xf5, 0x5b, 0xec, 0xde, 0x43, 0xef, 0xca, 0xa3, 0xea, 0x55, 0xe4, 0x7a, 0x9c, 0x42,
0x6a, 0x6a, 0xdd, 0x4f, 0xc0, 0x5f, 0x64, 0x92, 0x8f, 0x88, 0x72, 0xc0, 0x09, 0xba, 0x21, 0x24, 0x38, 0xab, 0x49, 0x71, 0x22, 0xda, 0x01, 0xa7, 0xe8, 0x86, 0x54, 0x54, 0x65, 0x52, 0xd7, 0xc3,
0x95, 0xa9, 0x50, 0x79, 0x98, 0x83, 0x47, 0xd7, 0xe0, 0xa5, 0xf4, 0xbc, 0x35, 0xed, 0x76, 0x63, 0xee, 0x3d, 0xfa, 0x0f, 0xbc, 0xb4, 0x5e, 0xb0, 0x65, 0xdc, 0x6e, 0x4c, 0xcf, 0xc4, 0xf8, 0x74,
0x3e, 0x26, 0xda, 0x07, 0x7f, 0x87, 0x56, 0xe4, 0xab, 0x04, 0xf2, 0x1d, 0x77, 0xdb, 0xca, 0xd3, 0xfe, 0xb2, 0xd0, 0x9d, 0x0a, 0xe6, 0x13, 0x26, 0x15, 0xfe, 0x66, 0xa5, 0xaa, 0xde, 0x79, 0x4e,
0x39, 0xf1, 0x2c, 0x77, 0xf2, 0xc2, 0x35, 0x4f, 0x25, 0xb7, 0x3b, 0xd0, 0x2c, 0xef, 0x5d, 0xad, 0xf3, 0x93, 0x3e, 0xcb, 0xaa, 0x40, 0x17, 0xe9, 0x14, 0x6c, 0x5d, 0xdb, 0xb7, 0x8d, 0xf3, 0xc6,
0xbc, 0x72, 0x32, 0x43, 0x0a, 0xc5, 0xde, 0xef, 0x4d, 0x74, 0xa7, 0xa6, 0xae, 0x27, 0x4c, 0xc8, 0xf9, 0xcd, 0x5c, 0x65, 0x23, 0xd4, 0x62, 0x0a, 0x62, 0xd9, 0xae, 0xef, 0x36, 0xf6, 0xec, 0x5e,
0xdc, 0x7d, 0xe9, 0xcc, 0x2e, 0xe9, 0x9e, 0xb3, 0xab, 0xee, 0x27, 0x33, 0xa5, 0x73, 0x0b, 0x50, 0xf0, 0xef, 0x9f, 0x1b, 0x6c, 0x1a, 0xbb, 0xd6, 0xe3, 0x42, 0x98, 0x4c, 0xf5, 0x3b, 0x7f, 0xd7,
0x87, 0x49, 0x08, 0x45, 0xb7, 0xb9, 0xd9, 0xda, 0x32, 0x07, 0xde, 0x7f, 0x0f, 0xd3, 0x5b, 0xd5, 0x2b, 0x9f, 0x59, 0x94, 0x1f, 0xff, 0x68, 0xa1, 0x2d, 0x7d, 0x7c, 0x46, 0x45, 0x04, 0xc5, 0xa4,
0x76, 0x9d, 0xc7, 0xb9, 0x30, 0x99, 0xeb, 0x57, 0x42, 0x6c, 0x5d, 0x7b, 0x88, 0xff, 0xd4, 0x87, 0x9b, 0xd7, 0x5e, 0xa7, 0xdb, 0x6b, 0xbe, 0x98, 0xe0, 0x96, 0x49, 0x6b, 0xeb, 0x78, 0xc1, 0x85,
0x98, 0xb7, 0x0e, 0xfe, 0xc9, 0x40, 0x6b, 0x6a, 0x78, 0x40, 0x79, 0x00, 0xf9, 0x2d, 0xd5, 0x59, 0x2c, 0xb9, 0xe2, 0x2e, 0xb2, 0x63, 0x96, 0x10, 0x48, 0x47, 0x2c, 0xa4, 0x52, 0x8f, 0x5c, 0x2b,
0x5e, 0xa5, 0x53, 0xcf, 0xb9, 0xed, 0xde, 0x2d, 0x5d, 0xdc, 0xda, 0x7e, 0xc5, 0x85, 0x2c, 0xb9, 0xd8, 0xce, 0x27, 0xae, 0x7d, 0x38, 0xbb, 0x26, 0xf3, 0x18, 0xfc, 0x09, 0xb2, 0x63, 0xfa, 0x5d,
0xe2, 0x3e, 0x32, 0x43, 0x16, 0x11, 0x48, 0x26, 0xcc, 0xa7, 0x42, 0x5d, 0x97, 0x8e, 0xb7, 0x9e, 0x49, 0x69, 0x68, 0xca, 0xbb, 0xc6, 0xcf, 0x3e, 0x9c, 0x85, 0xc8, 0x3c, 0x0e, 0xbf, 0x42, 0x8e,
0xcd, 0x6c, 0x73, 0x77, 0x31, 0x4d, 0xca, 0x18, 0xfc, 0x19, 0x32, 0x43, 0xfa, 0x43, 0x41, 0x69, 0xd2, 0xb6, 0x07, 0x47, 0xcf, 0x9f, 0x2b, 0x36, 0x62, 0xaf, 0xa9, 0x62, 0x3c, 0x39, 0x02, 0x11,
0x29, 0xca, 0xfb, 0xda, 0xcf, 0xdc, 0x5d, 0x2c, 0x91, 0x32, 0x0e, 0xbf, 0x44, 0x96, 0x54, 0xb6, 0x42, 0xa2, 0x68, 0x04, 0xed, 0xa6, 0x56, 0xea, 0xe4, 0x13, 0xd7, 0x79, 0xb6, 0x16, 0x49, 0x2e,
0x3b, 0x7b, 0xcf, 0x9e, 0x49, 0x36, 0x61, 0xaf, 0xa9, 0x64, 0x71, 0xb4, 0x07, 0xdc, 0x87, 0x48, 0x51, 0xea, 0xfc, 0xda, 0x40, 0xef, 0xad, 0x9d, 0x4f, 0xfc, 0x10, 0x61, 0xde, 0x97, 0x20, 0xc6,
0xd2, 0x00, 0x54, 0x2f, 0x77, 0xbc, 0x5e, 0x36, 0xb3, 0xad, 0x83, 0x73, 0x91, 0xe4, 0x02, 0xa5, 0x30, 0xf8, 0x7c, 0xba, 0x8c, 0x8a, 0xad, 0x50, 0xf4, 0xa0, 0x11, 0xdc, 0xca, 0x27, 0x2e, 0x7e,
0xde, 0x6f, 0x2d, 0xf4, 0xc1, 0xb9, 0x77, 0x0b, 0x3f, 0x44, 0x38, 0x1e, 0x0a, 0xe0, 0x53, 0x18, 0xba, 0x12, 0x25, 0x17, 0x30, 0x70, 0x88, 0x36, 0x47, 0x54, 0xaa, 0x69, 0x95, 0x99, 0x59, 0x40,
0x7d, 0x39, 0xff, 0x90, 0xe6, 0x5f, 0xb4, 0xfc, 0x0c, 0x5a, 0xde, 0xad, 0x6c, 0x66, 0xe3, 0xa7, 0x76, 0xef, 0xa3, 0xab, 0x0d, 0x6d, 0xc1, 0x08, 0xde, 0xc9, 0x27, 0xee, 0xe6, 0x93, 0x79, 0x11,
0xa7, 0x56, 0xc9, 0x19, 0x0c, 0xec, 0xa3, 0xd5, 0x09, 0x15, 0x72, 0x9e, 0x32, 0xd3, 0x1f, 0x4f, 0xb2, 0xa8, 0x89, 0xf7, 0xd1, 0x76, 0x98, 0x09, 0x01, 0x89, 0x5a, 0xaa, 0xfa, 0x6d, 0x53, 0xf5,
0x73, 0xf0, 0xc9, 0x25, 0x7b, 0x89, 0x85, 0xe0, 0xbd, 0x97, 0xcd, 0xec, 0xd5, 0x27, 0x65, 0x11, 0xed, 0x83, 0xc5, 0x30, 0x59, 0xc6, 0x17, 0x12, 0x03, 0x90, 0x4c, 0xc0, 0xa0, 0x94, 0x68, 0x2e,
0x52, 0xd5, 0xc4, 0xdb, 0x68, 0xdd, 0x4f, 0x39, 0x87, 0x48, 0x2e, 0xa5, 0x7e, 0x5b, 0xa7, 0xbe, 0x4a, 0x7c, 0xb6, 0x18, 0x26, 0xcb, 0x78, 0x1c, 0x23, 0xd7, 0xa8, 0x56, 0x76, 0xb0, 0xa5, 0x25,
0xbe, 0x53, 0x5d, 0x26, 0xcb, 0xf8, 0x5c, 0x62, 0x04, 0x82, 0x71, 0x18, 0x15, 0x12, 0xed, 0xaa, 0xdf, 0xcf, 0x27, 0xae, 0x7b, 0xb0, 0x1e, 0x4a, 0x2e, 0xd3, 0xea, 0xfc, 0x52, 0x47, 0x2d, 0x5d,
0xc4, 0x17, 0xd5, 0x65, 0xb2, 0x8c, 0xc7, 0x21, 0xb2, 0xb5, 0x6a, 0xed, 0x09, 0x76, 0x94, 0xe4, 0x82, 0xff, 0x71, 0xd3, 0xbe, 0x58, 0xd8, 0xb4, 0xf7, 0xae, 0xf1, 0xed, 0xe9, 0xcc, 0x2a, 0xf7,
0x87, 0xd9, 0xcc, 0xb6, 0x77, 0xce, 0x87, 0x92, 0x8b, 0xb4, 0x7a, 0x7f, 0x37, 0x51, 0x47, 0x45, 0xea, 0xb7, 0x4b, 0x7b, 0xf5, 0xfe, 0xb5, 0x95, 0xd7, 0x6f, 0xd1, 0x07, 0xe8, 0x66, 0x99, 0x00,
0xf0, 0x3f, 0xbe, 0x12, 0xcf, 0x2b, 0xaf, 0xc4, 0xbd, 0x2b, 0xdc, 0x3d, 0x55, 0x59, 0xed, 0x9b, 0xbe, 0x8b, 0x36, 0xc4, 0x79, 0x4f, 0x2d, 0xdd, 0x80, 0x72, 0x05, 0x96, 0xcd, 0x2c, 0x11, 0x1d,
0xf0, 0xfd, 0xd2, 0x9b, 0x70, 0xff, 0xca, 0xca, 0x6f, 0xf3, 0x05, 0x78, 0x80, 0x6e, 0x16, 0xdb, 0x86, 0xec, 0x39, 0x87, 0xeb, 0x91, 0x0b, 0xb4, 0x84, 0x11, 0x84, 0x8a, 0x0b, 0xf3, 0x4f, 0x5b,
0xc3, 0x77, 0xd1, 0x0a, 0x3f, 0xe9, 0x18, 0x43, 0x1d, 0x6f, 0x41, 0x2d, 0x5a, 0xa5, 0x40, 0xf4, 0xa2, 0x8f, 0xcd, 0x3d, 0x29, 0x11, 0xc1, 0x07, 0xa7, 0x67, 0x4e, 0xed, 0xcd, 0x99, 0x53, 0xfb,
0x18, 0x32, 0x4b, 0xf5, 0x5f, 0x8d, 0x9c, 0xa3, 0x05, 0x4c, 0xc0, 0x97, 0x31, 0xd7, 0xff, 0x41, 0xfd, 0xcc, 0xa9, 0xfd, 0x90, 0x3b, 0xd6, 0x69, 0xee, 0x58, 0x6f, 0x72, 0xc7, 0xfa, 0x23, 0x77,
0x0a, 0xf4, 0xbe, 0x9e, 0x27, 0x05, 0xc2, 0xfb, 0xe8, 0xe8, 0xd8, 0x6a, 0xbc, 0x39, 0xb6, 0x1a, 0xac, 0x9f, 0xfe, 0x74, 0x6a, 0x5f, 0xd7, 0xc7, 0xdd, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xe2,
0x7f, 0x1c, 0x5b, 0x8d, 0x1f, 0x33, 0xcb, 0x38, 0xca, 0x2c, 0xe3, 0x4d, 0x66, 0x19, 0x7f, 0x66, 0xa2, 0xe7, 0x25, 0xc5, 0x09, 0x00, 0x00,
0x96, 0xf1, 0xf3, 0x5f, 0x56, 0xe3, 0xdb, 0xe6, 0xb4, 0xff, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff,
0xab, 0x47, 0x03, 0x8d, 0xdf, 0x0a, 0x00, 0x00,
} }

6
pkg/apis/autoscaling/v1/generated.proto
View File

@ -46,8 +46,6 @@ message CrossVersionObjectReference {
// configuration of a horizontal pod autoscaler. // configuration of a horizontal pod autoscaler.
message HorizontalPodAutoscaler { message HorizontalPodAutoscaler {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // Standard object metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
@ -63,8 +61,6 @@ message HorizontalPodAutoscaler {
// list of horizontal pod autoscaler objects. // list of horizontal pod autoscaler objects.
message HorizontalPodAutoscalerList { message HorizontalPodAutoscalerList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// +optional // +optional
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1; optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
@ -117,8 +113,6 @@ message HorizontalPodAutoscalerStatus {
// Scale represents a scaling request for a resource. // Scale represents a scaling request for a resource.
message Scale { message Scale {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata. // Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;

2
pkg/apis/batch/doc.go
View File

@ -14,6 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
package batch package batch

5
pkg/apis/batch/v1/doc.go
View File

@ -14,9 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/batch
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta
package v1 package v1

234
pkg/apis/batch/v1/generated.pb.go
View File

@ -121,14 +121,6 @@ func (m *Job) MarshalTo(data []byte) (int, error) {
return 0, err return 0, err
} }
i += n3 i += n3
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n4, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n4
return i, nil return i, nil
} }
@ -158,19 +150,19 @@ func (m *JobCondition) MarshalTo(data []byte) (int, error) {
data[i] = 0x1a data[i] = 0x1a
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.LastProbeTime.Size())) i = encodeVarintGenerated(data, i, uint64(m.LastProbeTime.Size()))
n5, err := m.LastProbeTime.MarshalTo(data[i:]) n4, err := m.LastProbeTime.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n4
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.LastTransitionTime.Size()))
n5, err := m.LastTransitionTime.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n5 i += n5
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.LastTransitionTime.Size()))
n6, err := m.LastTransitionTime.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n6
data[i] = 0x2a data[i] = 0x2a
i++ i++
i = encodeVarintGenerated(data, i, uint64(len(m.Reason))) i = encodeVarintGenerated(data, i, uint64(len(m.Reason)))
@ -200,11 +192,11 @@ func (m *JobList) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size()))
n7, err := m.ListMeta.MarshalTo(data[i:]) n6, err := m.ListMeta.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n7 i += n6
if len(m.Items) > 0 { if len(m.Items) > 0 {
for _, msg := range m.Items { for _, msg := range m.Items {
data[i] = 0x12 data[i] = 0x12
@ -217,14 +209,6 @@ func (m *JobList) MarshalTo(data []byte) (int, error) {
i += n i += n
} }
} }
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n8, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n8
return i, nil return i, nil
} }
@ -262,11 +246,11 @@ func (m *JobSpec) MarshalTo(data []byte) (int, error) {
data[i] = 0x22 data[i] = 0x22
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.Selector.Size())) i = encodeVarintGenerated(data, i, uint64(m.Selector.Size()))
n9, err := m.Selector.MarshalTo(data[i:]) n7, err := m.Selector.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n9 i += n7
} }
if m.ManualSelector != nil { if m.ManualSelector != nil {
data[i] = 0x28 data[i] = 0x28
@ -281,11 +265,11 @@ func (m *JobSpec) MarshalTo(data []byte) (int, error) {
data[i] = 0x32 data[i] = 0x32
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.Template.Size())) i = encodeVarintGenerated(data, i, uint64(m.Template.Size()))
n10, err := m.Template.MarshalTo(data[i:]) n8, err := m.Template.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n10 i += n8
return i, nil return i, nil
} }
@ -320,21 +304,21 @@ func (m *JobStatus) MarshalTo(data []byte) (int, error) {
data[i] = 0x12 data[i] = 0x12
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.StartTime.Size())) i = encodeVarintGenerated(data, i, uint64(m.StartTime.Size()))
n11, err := m.StartTime.MarshalTo(data[i:]) n9, err := m.StartTime.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n11 i += n9
} }
if m.CompletionTime != nil { if m.CompletionTime != nil {
data[i] = 0x1a data[i] = 0x1a
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.CompletionTime.Size())) i = encodeVarintGenerated(data, i, uint64(m.CompletionTime.Size()))
n12, err := m.CompletionTime.MarshalTo(data[i:]) n10, err := m.CompletionTime.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n12 i += n10
} }
data[i] = 0x20 data[i] = 0x20
i++ i++
@ -384,8 +368,6 @@ func (m *Job) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.Status.Size() l = m.Status.Size()
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -418,8 +400,6 @@ func (m *JobList) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
} }
} }
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -491,7 +471,6 @@ func (this *Job) String() string {
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "JobSpec", "JobSpec", 1), `&`, ``, 1) + `,`, `Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "JobSpec", "JobSpec", 1), `&`, ``, 1) + `,`,
`Status:` + strings.Replace(strings.Replace(this.Status.String(), "JobStatus", "JobStatus", 1), `&`, ``, 1) + `,`, `Status:` + strings.Replace(strings.Replace(this.Status.String(), "JobStatus", "JobStatus", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -518,7 +497,6 @@ func (this *JobList) String() string {
s := strings.Join([]string{`&JobList{`, s := strings.Join([]string{`&JobList{`,
`ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`,
`Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Job", "Job", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Job", "Job", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -680,36 +658,6 @@ func (m *Job) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -1047,36 +995,6 @@ func (m *JobList) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -1602,62 +1520,60 @@ var (
) )
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 905 bytes of a gzipped FileDescriptorProto // 879 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x95, 0x4d, 0x6f, 0xe3, 0x44, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x54, 0xcd, 0x6f, 0xe3, 0x44,
0x18, 0xc7, 0xf3, 0xda, 0x26, 0xd3, 0x97, 0x5d, 0x46, 0xaa, 0x14, 0x7a, 0x48, 0x56, 0x05, 0xa1, 0x14, 0xcf, 0x47, 0xd3, 0x4d, 0xa6, 0x1f, 0xbb, 0x8c, 0x54, 0x29, 0xf4, 0x90, 0xac, 0x02, 0x42,
0x05, 0xed, 0xda, 0x4a, 0x77, 0x85, 0x10, 0x07, 0x24, 0x5c, 0x84, 0x44, 0xd5, 0xb2, 0xd5, 0xa4, 0x0b, 0xda, 0xb5, 0x95, 0xee, 0x0a, 0x21, 0x0e, 0x48, 0xb8, 0x08, 0x89, 0xaa, 0x65, 0xab, 0x49,
0x02, 0xc4, 0xcb, 0x61, 0x6c, 0x3f, 0x4d, 0x87, 0xda, 0x1e, 0xcb, 0x33, 0x8e, 0xb4, 0x37, 0x3e, 0x05, 0x88, 0x8f, 0xc3, 0xd8, 0x7e, 0x4d, 0x87, 0xda, 0x1e, 0xcb, 0x33, 0x8e, 0xd4, 0x1b, 0x37,
0x02, 0x07, 0x3e, 0x0a, 0x07, 0x3e, 0x42, 0x8f, 0x3d, 0x72, 0x8a, 0xa8, 0x11, 0x5f, 0x62, 0x4f, 0xae, 0xfc, 0x31, 0x08, 0xf1, 0x27, 0xf4, 0xd8, 0x23, 0xa7, 0x88, 0x9a, 0xff, 0x62, 0x4f, 0x68,
0x68, 0xc6, 0x13, 0xdb, 0x49, 0x93, 0x92, 0xa2, 0xbd, 0x65, 0x9e, 0x79, 0xfe, 0xbf, 0x99, 0x79, 0xc6, 0xe3, 0x8f, 0x34, 0x69, 0xc9, 0x72, 0xb3, 0xdf, 0xbc, 0xdf, 0xef, 0x7d, 0xfd, 0xde, 0x43,
0x9e, 0xbf, 0x9f, 0xa0, 0x17, 0x57, 0x9f, 0x08, 0x8b, 0x71, 0xfb, 0x2a, 0x75, 0x21, 0x89, 0x40, 0x2f, 0x2f, 0x3f, 0x11, 0x16, 0xe3, 0xf6, 0x65, 0xea, 0x42, 0x12, 0x81, 0x04, 0x61, 0xc7, 0x97,
0x82, 0xb0, 0xe3, 0xab, 0xb1, 0x4d, 0x63, 0x26, 0x6c, 0x97, 0x4a, 0xef, 0xd2, 0x9e, 0x0c, 0xed, 0x53, 0x9b, 0xc6, 0x4c, 0xd8, 0x2e, 0x95, 0xde, 0x85, 0x3d, 0x1b, 0xdb, 0x53, 0x88, 0x20, 0xa1,
0x31, 0x44, 0x90, 0x50, 0x09, 0xbe, 0x15, 0x27, 0x5c, 0x72, 0xfc, 0x5e, 0x2e, 0xb2, 0x4a, 0x91, 0x12, 0x7c, 0x2b, 0x4e, 0xb8, 0xe4, 0xf8, 0xbd, 0x1c, 0x64, 0x55, 0x20, 0x2b, 0xbe, 0x9c, 0x5a,
0x15, 0x5f, 0x8d, 0x2d, 0x25, 0xb2, 0xb4, 0xc8, 0x9a, 0x0c, 0xf7, 0x9f, 0x8f, 0x99, 0xbc, 0x4c, 0x0a, 0x64, 0x69, 0x90, 0x35, 0x1b, 0xef, 0xbf, 0x98, 0x32, 0x79, 0x91, 0xba, 0x96, 0xc7, 0x43,
0x5d, 0xcb, 0xe3, 0xa1, 0x3d, 0xe6, 0x63, 0x6e, 0x6b, 0xad, 0x9b, 0x5e, 0xe8, 0x95, 0x5e, 0xe8, 0x7b, 0xca, 0xa7, 0xdc, 0xd6, 0x58, 0x37, 0x3d, 0xd7, 0x7f, 0xfa, 0x47, 0x7f, 0xe5, 0x9c, 0xfb,
0x5f, 0x39, 0x73, 0xff, 0xa5, 0xb9, 0x08, 0x8d, 0x59, 0x48, 0xbd, 0x4b, 0x16, 0x41, 0xf2, 0xba, 0xaf, 0x4c, 0x22, 0x34, 0x66, 0x21, 0xf5, 0x2e, 0x58, 0x04, 0xc9, 0x55, 0x95, 0x4a, 0x08, 0x92,
0xbc, 0x4a, 0x08, 0x92, 0x2e, 0xb9, 0xc9, 0xbe, 0xbd, 0x4a, 0x95, 0xa4, 0x91, 0x64, 0x21, 0xdc, 0xae, 0xc8, 0x64, 0xdf, 0xbe, 0x0f, 0x95, 0xa4, 0x91, 0x64, 0x21, 0x2c, 0x01, 0x3e, 0xfe, 0x2f,
0x11, 0x7c, 0xfc, 0x5f, 0x02, 0xe1, 0x5d, 0x42, 0x48, 0xef, 0xe8, 0x0e, 0x57, 0xd6, 0xc9, 0x4e, 0x80, 0xf0, 0x2e, 0x20, 0xa4, 0x4b, 0xb8, 0x83, 0x7b, 0xfb, 0x64, 0x27, 0x20, 0x78, 0x9a, 0x78,
0x40, 0xf0, 0x34, 0xf1, 0xee, 0x9e, 0xf5, 0x6c, 0xb5, 0x66, 0xc9, 0x53, 0x86, 0xcb, 0xb3, 0x53, 0xcb, 0xb1, 0x9e, 0xdf, 0x8f, 0x59, 0x51, 0xca, 0x78, 0xb5, 0x77, 0x2a, 0x59, 0x60, 0xb3, 0x48,
0xc9, 0x02, 0x9b, 0x45, 0x52, 0xc8, 0x64, 0x51, 0x72, 0xf0, 0x4f, 0x03, 0x35, 0x8f, 0xb9, 0x8b, 0x0a, 0x99, 0xdc, 0x85, 0x8c, 0x7e, 0x6d, 0xa1, 0xf6, 0x11, 0x77, 0xf1, 0x77, 0xa8, 0xab, 0x1a,
0xbf, 0x43, 0x1d, 0x55, 0x20, 0x9f, 0x4a, 0xda, 0xab, 0x3f, 0xa9, 0x3f, 0xdd, 0x3a, 0x7c, 0x6a, 0xe4, 0x53, 0x49, 0xfb, 0xcd, 0xa7, 0xcd, 0x67, 0x5b, 0x07, 0xcf, 0xac, 0x7b, 0x47, 0x64, 0xcd,
0xad, 0x6c, 0x91, 0x35, 0x19, 0x5a, 0xaf, 0xdc, 0x9f, 0xc1, 0x93, 0xa7, 0x20, 0xa9, 0x83, 0xaf, 0xc6, 0xd6, 0x6b, 0xf7, 0x67, 0xf0, 0xe4, 0x09, 0x48, 0xea, 0xe0, 0xeb, 0xf9, 0xb0, 0x91, 0xcd,
0xa7, 0x83, 0x5a, 0x36, 0x1d, 0xa0, 0x32, 0x46, 0x0a, 0x1a, 0xfe, 0x1a, 0xb5, 0x44, 0x0c, 0x5e, 0x87, 0xa8, 0xb2, 0x91, 0x92, 0x0d, 0x7f, 0x8d, 0x36, 0x44, 0x0c, 0x5e, 0xbf, 0xa5, 0x59, 0x9f,
0xaf, 0xa1, 0xa9, 0xcf, 0xac, 0x35, 0x1a, 0x6f, 0x1d, 0x73, 0x77, 0x14, 0x83, 0xe7, 0x6c, 0x1b, 0x5b, 0x6b, 0x0c, 0xde, 0x3a, 0xe2, 0xee, 0x24, 0x06, 0xcf, 0xd9, 0x36, 0xcc, 0x1b, 0xea, 0x8f,
0x72, 0x4b, 0xad, 0x88, 0xe6, 0xe0, 0x6f, 0xd0, 0x86, 0x90, 0x54, 0xa6, 0xa2, 0xd7, 0xd4, 0x44, 0x68, 0x1e, 0xfc, 0x0d, 0xda, 0x14, 0x92, 0xca, 0x54, 0xf4, 0xdb, 0x9a, 0xd1, 0x5a, 0x9b, 0x51,
0x6b, 0x6d, 0xa2, 0x56, 0x39, 0xbb, 0x86, 0xb9, 0x91, 0xaf, 0x89, 0xa1, 0xe1, 0x1f, 0x51, 0x47, 0xa3, 0x9c, 0x5d, 0xc3, 0xb9, 0x99, 0xff, 0x13, 0xc3, 0x36, 0xba, 0x69, 0xa3, 0xed, 0x23, 0xee,
0xbe, 0x8e, 0x41, 0xdd, 0xbe, 0xd7, 0x9a, 0x27, 0x57, 0x3b, 0x5d, 0xb2, 0xd5, 0x0b, 0x15, 0xfa, 0x1e, 0xf2, 0xc8, 0x67, 0x92, 0xf1, 0x08, 0xbf, 0x42, 0x1b, 0xf2, 0x2a, 0x06, 0xdd, 0x8e, 0x9e,
0xdc, 0xa8, 0x9c, 0xc7, 0x86, 0xdc, 0x99, 0x45, 0x48, 0x41, 0x3c, 0xb8, 0x69, 0xa2, 0xed, 0x63, 0xf3, 0xb4, 0x48, 0xe5, 0xec, 0x2a, 0x86, 0x37, 0xf3, 0xe1, 0x93, 0xba, 0xaf, 0xb2, 0x11, 0xed,
0xee, 0x1e, 0xf1, 0xc8, 0x67, 0x92, 0xf1, 0x08, 0xbf, 0x44, 0x2d, 0xb5, 0xa9, 0x8b, 0xdd, 0x75, 0x5d, 0x4b, 0xaf, 0xa5, 0x71, 0x9f, 0x2d, 0x86, 0x7b, 0x33, 0x1f, 0x3e, 0x38, 0x53, 0xab, 0xe4,
0x9e, 0xcc, 0x1e, 0xaa, 0xa4, 0x6f, 0xa6, 0x83, 0xc7, 0xd5, 0x5c, 0x15, 0x23, 0x3a, 0xbb, 0xf2, 0x5c, 0x4c, 0x0f, 0x4f, 0xd1, 0x4e, 0x40, 0x85, 0x3c, 0x4d, 0xb8, 0x0b, 0x67, 0x2c, 0x04, 0x53,
0xf8, 0x86, 0xd6, 0x7d, 0x36, 0xff, 0x98, 0x37, 0xd3, 0xc1, 0xbd, 0x8e, 0xb1, 0x0a, 0xe6, 0xc2, 0xfd, 0x47, 0x45, 0xf5, 0x75, 0x35, 0x56, 0xf5, 0xab, 0x29, 0xa8, 0xf2, 0x15, 0xc2, 0xd9, 0x33,
0xe3, 0xc7, 0x68, 0x27, 0xa0, 0x42, 0x9e, 0x25, 0xdc, 0x85, 0x73, 0x16, 0x82, 0xa9, 0xed, 0x47, 0xa9, 0xec, 0x1c, 0xd7, 0x89, 0xc8, 0x22, 0x2f, 0x9e, 0x21, 0xac, 0x0c, 0x67, 0x09, 0x8d, 0x44,
0x6b, 0x56, 0x80, 0x85, 0xe0, 0xec, 0x99, 0xab, 0xec, 0x9c, 0x54, 0x41, 0x64, 0x9e, 0x8b, 0x27, 0x5e, 0x9c, 0x8a, 0xb6, 0xf1, 0xd6, 0xd1, 0xf6, 0x4d, 0x34, 0x7c, 0xbc, 0xc4, 0x46, 0x56, 0x44,
0x08, 0xab, 0xc0, 0x79, 0x42, 0x23, 0x91, 0x3f, 0x4e, 0x9d, 0xd6, 0x7a, 0xf0, 0x69, 0xfb, 0xe6, 0xc0, 0x1f, 0xa0, 0xcd, 0x04, 0xa8, 0xe0, 0x51, 0xbf, 0xa3, 0x1b, 0x57, 0xce, 0x89, 0x68, 0x2b,
0x34, 0x7c, 0x72, 0x87, 0x46, 0x96, 0x9c, 0x80, 0x3f, 0x40, 0x1b, 0x09, 0x50, 0xc1, 0xa3, 0x5e, 0x31, 0xaf, 0xf8, 0x43, 0xf4, 0x28, 0x04, 0x21, 0xe8, 0x14, 0xfa, 0x9b, 0xda, 0xf1, 0xb1, 0x71,
0x5b, 0x17, 0xae, 0x70, 0x01, 0xd1, 0x51, 0x62, 0x76, 0xf1, 0x87, 0x68, 0x33, 0x04, 0x21, 0xe8, 0x7c, 0x74, 0x92, 0x9b, 0x49, 0xf1, 0x3e, 0xfa, 0xa3, 0x89, 0x1e, 0x1d, 0x71, 0xf7, 0x98, 0x09,
0x18, 0x7a, 0x1b, 0x3a, 0xf1, 0x91, 0x49, 0xdc, 0x3c, 0xcd, 0xc3, 0x64, 0xb6, 0x7f, 0xf0, 0x5b, 0x89, 0x7f, 0x5c, 0x12, 0xb8, 0xb5, 0x5e, 0x31, 0x0a, 0xad, 0x65, 0xfe, 0xc4, 0xc4, 0xe9, 0x16,
0x03, 0x6d, 0x1e, 0x73, 0xf7, 0x84, 0x09, 0xa9, 0xcc, 0xb3, 0xf0, 0xf9, 0xac, 0x69, 0x1e, 0xa5, 0x96, 0x9a, 0xc8, 0x4f, 0x50, 0x87, 0x49, 0x08, 0xd5, 0xd0, 0xdb, 0x0f, 0xef, 0xce, 0xa2, 0x26,
0x9e, 0x37, 0xcf, 0x2c, 0x52, 0xf9, 0x84, 0x4e, 0x51, 0x9b, 0x49, 0x08, 0x55, 0xd3, 0x9b, 0xf7, 0x9d, 0x1d, 0x43, 0xda, 0xf9, 0x4a, 0xc1, 0x49, 0xce, 0x32, 0xfa, 0xb3, 0xad, 0x13, 0x57, 0xaa,
0x7f, 0x99, 0xf3, 0x8e, 0x77, 0x76, 0x0c, 0xb4, 0xfd, 0x95, 0x92, 0x93, 0x9c, 0x32, 0xe7, 0xf4, 0xc7, 0x63, 0xb4, 0x15, 0xd3, 0x84, 0x06, 0x01, 0x04, 0x4c, 0x84, 0x3a, 0xf7, 0x8e, 0xf3, 0x38,
0xe6, 0x5b, 0x77, 0xfa, 0x1f, 0x4d, 0x5d, 0x16, 0xf5, 0xc5, 0xe2, 0x21, 0xda, 0x8a, 0x69, 0x42, 0x9b, 0x0f, 0xb7, 0x4e, 0x2b, 0x33, 0xa9, 0xfb, 0x28, 0x88, 0xc7, 0xc3, 0x38, 0x00, 0xd5, 0xdc,
0x83, 0x00, 0x02, 0x26, 0x42, 0x5d, 0x99, 0xb6, 0xf3, 0x28, 0x9b, 0x0e, 0xb6, 0xce, 0xca, 0x30, 0x5c, 0x88, 0x06, 0x72, 0x58, 0x99, 0x49, 0xdd, 0x07, 0xbf, 0x46, 0x7b, 0xd4, 0x93, 0x6c, 0x06,
0xa9, 0xe6, 0x28, 0x89, 0xc7, 0xc3, 0x38, 0x00, 0xd5, 0xba, 0xdc, 0xe6, 0x46, 0x72, 0x54, 0x86, 0x5f, 0x00, 0xf5, 0x03, 0x16, 0xc1, 0x04, 0x3c, 0x1e, 0xf9, 0xf9, 0x92, 0xb5, 0x9d, 0x77, 0xb3,
0x49, 0x35, 0x07, 0xbf, 0x42, 0x7b, 0xd4, 0x93, 0x6c, 0x02, 0x5f, 0x00, 0xf5, 0x03, 0x16, 0xc1, 0xf9, 0x70, 0xef, 0xf3, 0x55, 0x0e, 0x64, 0x35, 0x0e, 0xff, 0x84, 0xba, 0x02, 0x02, 0xf0, 0x24,
0x08, 0x3c, 0x1e, 0xf9, 0xf9, 0x80, 0x68, 0x3a, 0xef, 0x66, 0xd3, 0xc1, 0xde, 0xe7, 0xcb, 0x12, 0x4f, 0x8c, 0x78, 0x5e, 0xae, 0xd9, 0x6f, 0xea, 0x42, 0x30, 0x31, 0x50, 0x67, 0x5b, 0x35, 0xbc,
0xc8, 0x72, 0x1d, 0xfe, 0x09, 0x75, 0x04, 0x04, 0xe0, 0x49, 0x9e, 0x18, 0x6b, 0xbe, 0x58, 0xb3, 0xf8, 0x23, 0x25, 0x25, 0xfe, 0x14, 0xed, 0x86, 0x34, 0x4a, 0x69, 0xe9, 0xa9, 0x55, 0xd3, 0x75,
0x9b, 0xd4, 0x85, 0x60, 0x64, 0xa4, 0xce, 0xb6, 0xaa, 0xd0, 0x6c, 0x45, 0x0a, 0x24, 0xfe, 0x14, 0x70, 0x36, 0x1f, 0xee, 0x9e, 0x2c, 0xbc, 0x90, 0x3b, 0x9e, 0xf8, 0x07, 0xd4, 0x95, 0x10, 0xc6,
0xed, 0x86, 0x34, 0x4a, 0x69, 0x91, 0xa9, 0x3d, 0xd9, 0x71, 0x70, 0x36, 0x1d, 0xec, 0x9e, 0xce, 0x01, 0x95, 0xb9, 0x84, 0xb6, 0x0e, 0x5e, 0x3c, 0x7c, 0xeb, 0x4e, 0xb9, 0x7f, 0x66, 0x00, 0xfa,
0xed, 0x90, 0x85, 0x4c, 0xfc, 0x03, 0xea, 0x48, 0x08, 0xe3, 0x80, 0xca, 0xdc, 0xa0, 0x5b, 0x87, 0x2c, 0x95, 0x4a, 0x28, 0xac, 0xa4, 0x24, 0x1c, 0xfd, 0xde, 0x46, 0xbd, 0xf2, 0xd8, 0x60, 0x40,
0xcf, 0xef, 0x9f, 0xd3, 0x67, 0xdc, 0x3f, 0x37, 0x02, 0x3d, 0x52, 0xcb, 0xd6, 0x99, 0x28, 0x29, 0xc8, 0x2b, 0x16, 0x5a, 0xf4, 0x9b, 0x5a, 0x1c, 0xe3, 0x75, 0xc5, 0x51, 0x9e, 0x82, 0xea, 0xc2,
0x80, 0x07, 0xbf, 0x37, 0x51, 0xb7, 0x18, 0x94, 0x18, 0x10, 0xf2, 0x66, 0xe3, 0x42, 0xf4, 0xea, 0x96, 0x26, 0x41, 0x6a, 0xc4, 0xf8, 0x5b, 0xd4, 0x13, 0x92, 0x26, 0x52, 0xaf, 0x6a, 0xeb, 0xad,
0xda, 0x7a, 0xc3, 0x75, 0xad, 0x57, 0x0c, 0x9a, 0xf2, 0xdf, 0xa1, 0x08, 0x09, 0x52, 0x01, 0xe3, 0x57, 0x75, 0x27, 0x9b, 0x0f, 0x7b, 0x93, 0x82, 0x80, 0x54, 0x5c, 0xf8, 0x1c, 0xed, 0x56, 0x2a,
0x6f, 0x51, 0x57, 0x48, 0x9a, 0x48, 0x3d, 0x08, 0x1a, 0x0f, 0x1e, 0x04, 0x3b, 0xd9, 0x74, 0xd0, 0xf9, 0x9f, 0x67, 0x47, 0x8f, 0xe4, 0x70, 0x81, 0x85, 0xdc, 0x61, 0x55, 0xcb, 0x9f, 0xcb, 0x48,
0x1d, 0xcd, 0x00, 0xa4, 0x64, 0xe1, 0x0b, 0xb4, 0x5b, 0xba, 0xe4, 0x7f, 0x0e, 0x35, 0xdd, 0x92, 0x6b, 0xa5, 0x53, 0x2d, 0x7f, 0xae, 0x39, 0x62, 0x5e, 0xb1, 0x8d, 0x7a, 0x22, 0xf5, 0x3c, 0x00,
0xa3, 0x39, 0x0a, 0x59, 0xa0, 0xaa, 0xd1, 0x92, 0xdb, 0x48, 0x7b, 0xa5, 0x5d, 0x8e, 0x96, 0xdc, 0x1f, 0x7c, 0x3d, 0xf1, 0x8e, 0xf3, 0x8e, 0x71, 0xed, 0x4d, 0x8a, 0x07, 0x52, 0xf9, 0x28, 0xe2,
0x73, 0xc4, 0xec, 0x62, 0x1b, 0x75, 0x45, 0xea, 0x79, 0x00, 0x3e, 0xf8, 0xba, 0xe3, 0x6d, 0xe7, 0x73, 0xca, 0x02, 0xf0, 0xf5, 0xa4, 0x6b, 0xc4, 0x5f, 0x6a, 0x2b, 0x31, 0xaf, 0xce, 0xfb, 0xd7,
0x1d, 0x93, 0xda, 0x1d, 0xcd, 0x36, 0x48, 0x99, 0xa3, 0xc0, 0x17, 0x94, 0x05, 0xe0, 0xeb, 0x4e, 0xb7, 0x83, 0xc6, 0xcd, 0xed, 0xa0, 0xf1, 0xd7, 0xed, 0xa0, 0xf1, 0x4b, 0x36, 0x68, 0x5e, 0x67,
0x57, 0xc0, 0x5f, 0xea, 0x28, 0x31, 0xbb, 0xce, 0xfb, 0xd7, 0xb7, 0xfd, 0xda, 0xcd, 0x6d, 0xbf, 0x83, 0xe6, 0x4d, 0x36, 0x68, 0xfe, 0x9d, 0x0d, 0x9a, 0xbf, 0xfd, 0x33, 0x68, 0x7c, 0xdf, 0x9a,
0xf6, 0xe7, 0x6d, 0xbf, 0xf6, 0x4b, 0xd6, 0xaf, 0x5f, 0x67, 0xfd, 0xfa, 0x4d, 0xd6, 0xaf, 0xff, 0x8d, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x15, 0xe7, 0x70, 0xeb, 0x08, 0x00, 0x00,
0x95, 0xf5, 0xeb, 0xbf, 0xfe, 0xdd, 0xaf, 0x7d, 0xdf, 0x98, 0x0c, 0xff, 0x0d, 0x00, 0x00, 0xff,
0xff, 0xa2, 0x94, 0x7a, 0x7f, 0xa7, 0x09, 0x00, 0x00,
} }

4
pkg/apis/batch/v1/generated.proto
View File

@ -33,8 +33,6 @@ option go_package = "v1";
// Job represents the configuration of a single job. // Job represents the configuration of a single job.
message Job { message Job {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -78,8 +76,6 @@ message JobCondition {
// JobList is a collection of jobs. // JobList is a collection of jobs.
message JobList { message JobList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata // Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional

5
pkg/apis/batch/v2alpha1/doc.go
View File

@ -14,9 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/batch
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta
package v2alpha1 package v2alpha1

445
pkg/apis/batch/v2alpha1/generated.pb.go
View File

@ -157,14 +157,6 @@ func (m *CronJob) MarshalTo(data []byte) (int, error) {
return 0, err return 0, err
} }
i += n3 i += n3
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n4, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n4
return i, nil return i, nil
} }
@ -186,11 +178,11 @@ func (m *CronJobList) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size()))
n5, err := m.ListMeta.MarshalTo(data[i:]) n4, err := m.ListMeta.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n5 i += n4
if len(m.Items) > 0 { if len(m.Items) > 0 {
for _, msg := range m.Items { for _, msg := range m.Items {
data[i] = 0x12 data[i] = 0x12
@ -203,14 +195,6 @@ func (m *CronJobList) MarshalTo(data []byte) (int, error) {
i += n i += n
} }
} }
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n6, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n6
return i, nil return i, nil
} }
@ -255,11 +239,11 @@ func (m *CronJobSpec) MarshalTo(data []byte) (int, error) {
data[i] = 0x2a data[i] = 0x2a
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.JobTemplate.Size())) i = encodeVarintGenerated(data, i, uint64(m.JobTemplate.Size()))
n7, err := m.JobTemplate.MarshalTo(data[i:]) n5, err := m.JobTemplate.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n7 i += n5
return i, nil return i, nil
} }
@ -294,11 +278,11 @@ func (m *CronJobStatus) MarshalTo(data []byte) (int, error) {
data[i] = 0x22 data[i] = 0x22
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.LastScheduleTime.Size())) i = encodeVarintGenerated(data, i, uint64(m.LastScheduleTime.Size()))
n8, err := m.LastScheduleTime.MarshalTo(data[i:]) n6, err := m.LastScheduleTime.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n8 i += n6
} }
return i, nil return i, nil
} }
@ -321,35 +305,27 @@ func (m *Job) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size()))
n9, err := m.ObjectMeta.MarshalTo(data[i:]) n7, err := m.ObjectMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n7
data[i] = 0x12
i++
i = encodeVarintGenerated(data, i, uint64(m.Spec.Size()))
n8, err := m.Spec.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n8
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.Status.Size()))
n9, err := m.Status.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n9 i += n9
data[i] = 0x12
i++
i = encodeVarintGenerated(data, i, uint64(m.Spec.Size()))
n10, err := m.Spec.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n10
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.Status.Size()))
n11, err := m.Status.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n11
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n12, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n12
return i, nil return i, nil
} }
@ -379,19 +355,19 @@ func (m *JobCondition) MarshalTo(data []byte) (int, error) {
data[i] = 0x1a data[i] = 0x1a
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.LastProbeTime.Size())) i = encodeVarintGenerated(data, i, uint64(m.LastProbeTime.Size()))
n13, err := m.LastProbeTime.MarshalTo(data[i:]) n10, err := m.LastProbeTime.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n13 i += n10
data[i] = 0x22 data[i] = 0x22
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.LastTransitionTime.Size())) i = encodeVarintGenerated(data, i, uint64(m.LastTransitionTime.Size()))
n14, err := m.LastTransitionTime.MarshalTo(data[i:]) n11, err := m.LastTransitionTime.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n14 i += n11
data[i] = 0x2a data[i] = 0x2a
i++ i++
i = encodeVarintGenerated(data, i, uint64(len(m.Reason))) i = encodeVarintGenerated(data, i, uint64(len(m.Reason)))
@ -421,11 +397,11 @@ func (m *JobList) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size()))
n15, err := m.ListMeta.MarshalTo(data[i:]) n12, err := m.ListMeta.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n15 i += n12
if len(m.Items) > 0 { if len(m.Items) > 0 {
for _, msg := range m.Items { for _, msg := range m.Items {
data[i] = 0x12 data[i] = 0x12
@ -438,14 +414,6 @@ func (m *JobList) MarshalTo(data []byte) (int, error) {
i += n i += n
} }
} }
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n16, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n16
return i, nil return i, nil
} }
@ -483,11 +451,11 @@ func (m *JobSpec) MarshalTo(data []byte) (int, error) {
data[i] = 0x22 data[i] = 0x22
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.Selector.Size())) i = encodeVarintGenerated(data, i, uint64(m.Selector.Size()))
n17, err := m.Selector.MarshalTo(data[i:]) n13, err := m.Selector.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n17 i += n13
} }
if m.ManualSelector != nil { if m.ManualSelector != nil {
data[i] = 0x28 data[i] = 0x28
@ -502,11 +470,11 @@ func (m *JobSpec) MarshalTo(data []byte) (int, error) {
data[i] = 0x32 data[i] = 0x32
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.Template.Size())) i = encodeVarintGenerated(data, i, uint64(m.Template.Size()))
n18, err := m.Template.MarshalTo(data[i:]) n14, err := m.Template.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n18 i += n14
return i, nil return i, nil
} }
@ -541,21 +509,21 @@ func (m *JobStatus) MarshalTo(data []byte) (int, error) {
data[i] = 0x12 data[i] = 0x12
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.StartTime.Size())) i = encodeVarintGenerated(data, i, uint64(m.StartTime.Size()))
n19, err := m.StartTime.MarshalTo(data[i:]) n15, err := m.StartTime.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n19 i += n15
} }
if m.CompletionTime != nil { if m.CompletionTime != nil {
data[i] = 0x1a data[i] = 0x1a
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.CompletionTime.Size())) i = encodeVarintGenerated(data, i, uint64(m.CompletionTime.Size()))
n20, err := m.CompletionTime.MarshalTo(data[i:]) n16, err := m.CompletionTime.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n20 i += n16
} }
data[i] = 0x20 data[i] = 0x20
i++ i++
@ -587,27 +555,19 @@ func (m *JobTemplate) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size()))
n21, err := m.ObjectMeta.MarshalTo(data[i:]) n17, err := m.ObjectMeta.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n21 i += n17
data[i] = 0x12 data[i] = 0x12
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.Template.Size())) i = encodeVarintGenerated(data, i, uint64(m.Template.Size()))
n22, err := m.Template.MarshalTo(data[i:]) n18, err := m.Template.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n22 i += n18
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n23, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n23
return i, nil return i, nil
} }
@ -629,19 +589,19 @@ func (m *JobTemplateSpec) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size()))
n24, err := m.ObjectMeta.MarshalTo(data[i:]) n19, err := m.ObjectMeta.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n24 i += n19
data[i] = 0x12 data[i] = 0x12
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.Spec.Size())) i = encodeVarintGenerated(data, i, uint64(m.Spec.Size()))
n25, err := m.Spec.MarshalTo(data[i:]) n20, err := m.Spec.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n25 i += n20
return i, nil return i, nil
} }
@ -681,8 +641,6 @@ func (m *CronJob) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.Status.Size() l = m.Status.Size()
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -697,8 +655,6 @@ func (m *CronJobList) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
} }
} }
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -745,8 +701,6 @@ func (m *Job) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.Status.Size() l = m.Status.Size()
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -779,8 +733,6 @@ func (m *JobList) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
} }
} }
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -838,8 +790,6 @@ func (m *JobTemplate) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.Template.Size() l = m.Template.Size()
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -874,7 +824,6 @@ func (this *CronJob) String() string {
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "CronJobSpec", "CronJobSpec", 1), `&`, ``, 1) + `,`, `Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "CronJobSpec", "CronJobSpec", 1), `&`, ``, 1) + `,`,
`Status:` + strings.Replace(strings.Replace(this.Status.String(), "CronJobStatus", "CronJobStatus", 1), `&`, ``, 1) + `,`, `Status:` + strings.Replace(strings.Replace(this.Status.String(), "CronJobStatus", "CronJobStatus", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -886,7 +835,6 @@ func (this *CronJobList) String() string {
s := strings.Join([]string{`&CronJobList{`, s := strings.Join([]string{`&CronJobList{`,
`ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`,
`Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "CronJob", "CronJob", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "CronJob", "CronJob", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -924,7 +872,6 @@ func (this *Job) String() string {
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "JobSpec", "JobSpec", 1), `&`, ``, 1) + `,`, `Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "JobSpec", "JobSpec", 1), `&`, ``, 1) + `,`,
`Status:` + strings.Replace(strings.Replace(this.Status.String(), "JobStatus", "JobStatus", 1), `&`, ``, 1) + `,`, `Status:` + strings.Replace(strings.Replace(this.Status.String(), "JobStatus", "JobStatus", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -951,7 +898,6 @@ func (this *JobList) String() string {
s := strings.Join([]string{`&JobList{`, s := strings.Join([]string{`&JobList{`,
`ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`,
`Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Job", "Job", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Job", "Job", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -993,7 +939,6 @@ func (this *JobTemplate) String() string {
s := strings.Join([]string{`&JobTemplate{`, s := strings.Join([]string{`&JobTemplate{`,
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Template:` + strings.Replace(strings.Replace(this.Template.String(), "JobTemplateSpec", "JobTemplateSpec", 1), `&`, ``, 1) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "JobTemplateSpec", "JobTemplateSpec", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -1136,36 +1081,6 @@ func (m *CronJob) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -1277,36 +1192,6 @@ func (m *CronJobList) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -1740,36 +1625,6 @@ func (m *Job) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -2107,36 +1962,6 @@ func (m *JobList) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -2645,36 +2470,6 @@ func (m *JobTemplate) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -2912,80 +2707,78 @@ var (
) )
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 1187 bytes of a gzipped FileDescriptorProto // 1158 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x56, 0xcb, 0x6f, 0x23, 0xc5, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x56, 0x4b, 0x6f, 0x23, 0x45,
0x13, 0x8e, 0x3d, 0x89, 0x1f, 0xed, 0x3c, 0xfb, 0xf7, 0x8b, 0xd6, 0x04, 0xc9, 0x8e, 0x2c, 0x81, 0x10, 0xce, 0xd8, 0x89, 0x1f, 0xed, 0xcd, 0xab, 0x21, 0x5a, 0x13, 0x24, 0x3b, 0xb2, 0x04, 0xca,
0xb2, 0xab, 0xdd, 0x19, 0xc5, 0x44, 0xcb, 0xb2, 0x07, 0xa4, 0x9d, 0x20, 0x24, 0xa2, 0x44, 0x1b, 0xae, 0x76, 0x67, 0x14, 0x13, 0x2d, 0xcb, 0x1e, 0x90, 0x76, 0x82, 0x90, 0x88, 0x12, 0x6d, 0xd4,
0xb5, 0xb3, 0xec, 0x0a, 0x82, 0x44, 0x7b, 0xa6, 0x63, 0xcf, 0x66, 0x5e, 0x4c, 0xf7, 0x44, 0xca, 0xce, 0xb2, 0x2b, 0x08, 0x12, 0xed, 0x71, 0xc7, 0x9e, 0xcd, 0xcc, 0xf4, 0x30, 0xdd, 0x13, 0x29,
0x8d, 0x33, 0x27, 0xce, 0x1c, 0xf9, 0x07, 0xb8, 0x22, 0x6e, 0xdc, 0x72, 0xcc, 0x81, 0x03, 0x27, 0x37, 0xce, 0x9c, 0x90, 0xf8, 0x01, 0xfc, 0x0d, 0x84, 0xb8, 0x20, 0x71, 0xc8, 0x31, 0x48, 0x1c,
0x8b, 0x0c, 0x7f, 0x01, 0xd7, 0x48, 0x48, 0xa8, 0xdb, 0x3d, 0x0f, 0xbf, 0x76, 0xed, 0x40, 0x58, 0x38, 0x59, 0x64, 0xf8, 0x17, 0x39, 0xa1, 0x6e, 0xf7, 0x3c, 0xfc, 0xca, 0xc6, 0x41, 0x8b, 0xc4,
0x71, 0x9b, 0xa9, 0xae, 0xef, 0xab, 0xee, 0xaa, 0xaf, 0xab, 0x1a, 0x7c, 0x70, 0xfa, 0x88, 0xaa, 0xcd, 0x53, 0x5d, 0xdf, 0x57, 0xd5, 0x55, 0x5f, 0x57, 0x19, 0x7c, 0x74, 0xf2, 0x98, 0xe9, 0x36,
0x96, 0xa7, 0x9d, 0x86, 0x6d, 0x12, 0xb8, 0x84, 0x11, 0xaa, 0xf9, 0xa7, 0x1d, 0x0d, 0xfb, 0x16, 0x35, 0x4e, 0xc2, 0x36, 0x09, 0x3c, 0xc2, 0x09, 0x33, 0xfc, 0x93, 0xae, 0x81, 0x7d, 0x9b, 0x19,
0xd5, 0xda, 0x98, 0x19, 0x5d, 0xed, 0xac, 0x89, 0x6d, 0xbf, 0x8b, 0xb7, 0xb5, 0x0e, 0x71, 0x49, 0x6d, 0xcc, 0xad, 0x9e, 0x71, 0xda, 0xc4, 0x8e, 0xdf, 0xc3, 0x5b, 0x46, 0x97, 0x78, 0x24, 0xc0,
0x80, 0x19, 0x31, 0x55, 0x3f, 0xf0, 0x98, 0x07, 0xef, 0xf6, 0xa1, 0x6a, 0x0a, 0x55, 0xfd, 0xd3, 0x9c, 0x74, 0x74, 0x3f, 0xa0, 0x9c, 0xc2, 0x7b, 0x03, 0xa8, 0x9e, 0x42, 0x75, 0xff, 0xa4, 0xab,
0x8e, 0xca, 0xa1, 0xaa, 0x80, 0xaa, 0x31, 0x74, 0xe3, 0x41, 0xc7, 0x62, 0xdd, 0xb0, 0xad, 0x1a, 0x0b, 0xa8, 0x2e, 0xa1, 0x7a, 0x0c, 0x5d, 0x7f, 0xd8, 0xb5, 0x79, 0x2f, 0x6c, 0xeb, 0x16, 0x75,
0x9e, 0xa3, 0x75, 0xbc, 0x8e, 0xa7, 0x09, 0x86, 0x76, 0x78, 0x22, 0xfe, 0xc4, 0x8f, 0xf8, 0xea, 0x8d, 0x2e, 0xed, 0x52, 0x43, 0x32, 0xb4, 0xc3, 0x63, 0xf9, 0x25, 0x3f, 0xe4, 0xaf, 0x01, 0xf3,
0x33, 0x6f, 0xec, 0xc8, 0x4d, 0x61, 0xdf, 0x72, 0xb0, 0xd1, 0xb5, 0x5c, 0x12, 0x9c, 0xa7, 0xdb, 0xfa, 0xb6, 0x4a, 0x0a, 0xfb, 0xb6, 0x8b, 0xad, 0x9e, 0xed, 0x91, 0xe0, 0x2c, 0x4d, 0xcb, 0x25,
0x72, 0x08, 0xc3, 0xda, 0xd9, 0xc8, 0x7e, 0x36, 0xb4, 0x49, 0xa8, 0x20, 0x74, 0x99, 0xe5, 0x90, 0x1c, 0x1b, 0xa7, 0x63, 0xf9, 0xac, 0x1b, 0xd3, 0x50, 0x41, 0xe8, 0x71, 0xdb, 0x25, 0x63, 0x80,
0x11, 0xc0, 0xc3, 0xd7, 0x01, 0xa8, 0xd1, 0x25, 0x0e, 0x1e, 0xc1, 0x35, 0x27, 0xe6, 0x4c, 0x0b, 0x47, 0xaf, 0x03, 0x30, 0xab, 0x47, 0x5c, 0x3c, 0x86, 0x6b, 0x4e, 0xad, 0x99, 0x11, 0x10, 0x46,
0x08, 0xf5, 0xc2, 0xc0, 0x18, 0x8d, 0x75, 0x7f, 0x32, 0x66, 0xcc, 0x51, 0xb6, 0xc7, 0x7b, 0x87, 0xc3, 0xc0, 0x1a, 0x8f, 0xf5, 0x60, 0x3a, 0x66, 0xc2, 0x55, 0xb6, 0x26, 0x7b, 0x87, 0xdc, 0x76,
0xcc, 0xb2, 0x35, 0xcb, 0x65, 0x94, 0x05, 0xc3, 0x90, 0xc6, 0x9f, 0x79, 0x50, 0xdc, 0x0d, 0x3c, 0x0c, 0xdb, 0xe3, 0x8c, 0x07, 0xa3, 0x90, 0xc6, 0x8f, 0x39, 0x50, 0xdc, 0x09, 0xa8, 0xb7, 0x4b,
0x77, 0xcf, 0x6b, 0xc3, 0x17, 0xa0, 0xc4, 0x93, 0x64, 0x62, 0x86, 0xab, 0xb9, 0xcd, 0xdc, 0x56, 0xdb, 0xf0, 0x25, 0x28, 0x89, 0x22, 0x75, 0x30, 0xc7, 0x55, 0x6d, 0x43, 0xdb, 0xac, 0x34, 0x37,
0xa5, 0xb9, 0xa5, 0x4e, 0x2c, 0x96, 0x7a, 0xb6, 0xad, 0x3e, 0x6d, 0xbf, 0x24, 0x06, 0x3b, 0x20, 0xf5, 0xa9, 0xcd, 0xd2, 0x4f, 0xb7, 0xf4, 0x67, 0xed, 0x57, 0xc4, 0xe2, 0xfb, 0x84, 0x63, 0x13,
0x0c, 0xeb, 0xf0, 0xa2, 0x57, 0x9f, 0x8b, 0x7a, 0x75, 0x90, 0xda, 0x50, 0xc2, 0x06, 0x5f, 0x80, 0x9e, 0xf7, 0xeb, 0x73, 0x51, 0xbf, 0x0e, 0x52, 0x1b, 0x4a, 0xd8, 0xe0, 0x4b, 0x30, 0xcf, 0x7c,
0x79, 0xea, 0x13, 0xa3, 0x9a, 0x17, 0xac, 0x0f, 0xd5, 0xa9, 0x25, 0xa0, 0xca, 0xbd, 0xb5, 0x7c, 0x62, 0x55, 0x73, 0x92, 0xf5, 0x91, 0x7e, 0x63, 0x09, 0xe8, 0x2a, 0xb7, 0x96, 0x4f, 0x2c, 0xf3,
0x62, 0xe8, 0x8b, 0x32, 0xc6, 0x3c, 0xff, 0x43, 0x82, 0x11, 0x7e, 0x09, 0x0a, 0x94, 0x61, 0x16, 0x8e, 0x8a, 0x31, 0x2f, 0xbe, 0x90, 0x64, 0x84, 0x5f, 0x83, 0x02, 0xe3, 0x98, 0x87, 0xac, 0x9a,
0xd2, 0xaa, 0x22, 0xb8, 0x1f, 0xdd, 0x80, 0x5b, 0xe0, 0xf5, 0x65, 0xc9, 0x5e, 0xe8, 0xff, 0x23, 0x97, 0xdc, 0x8f, 0x6f, 0xc1, 0x2d, 0xf1, 0xe6, 0x92, 0x62, 0x2f, 0x0c, 0xbe, 0x91, 0xe2, 0x6d,
0xc9, 0x0b, 0x8f, 0x41, 0x89, 0x9d, 0xfb, 0x84, 0x9f, 0xa8, 0x3a, 0x2f, 0x62, 0xa8, 0x71, 0x8c, 0xfc, 0xa6, 0x81, 0x8a, 0xf2, 0xdc, 0xb3, 0x19, 0x87, 0x47, 0x63, 0x55, 0xd2, 0xe3, 0x98, 0x59,
0xac, 0x02, 0xd2, 0x28, 0xfc, 0xd4, 0x3c, 0x3b, 0x47, 0x12, 0xa5, 0xaf, 0x4a, 0xe6, 0x52, 0x6c, 0x45, 0xa4, 0x51, 0x85, 0xb7, 0xa8, 0x96, 0x40, 0xcb, 0x5a, 0xad, 0xa8, 0x48, 0xa5, 0xd8, 0x92,
0x41, 0x09, 0x63, 0xe3, 0xfb, 0x3c, 0xa8, 0xc8, 0x7d, 0xec, 0x5b, 0x94, 0xf1, 0x68, 0x43, 0x35, 0xa9, 0xd4, 0x0b, 0xb0, 0x60, 0x73, 0xe2, 0xb2, 0x6a, 0x6e, 0x23, 0xbf, 0x59, 0x69, 0x36, 0x67,
0x98, 0x32, 0x1a, 0x47, 0x0f, 0x46, 0x8b, 0x2d, 0x99, 0x3a, 0x3c, 0x07, 0x0b, 0x16, 0x23, 0x0e, 0xbf, 0x8e, 0xb9, 0xa8, 0xe8, 0x17, 0x3e, 0x13, 0x44, 0x68, 0xc0, 0xd7, 0xf8, 0x2e, 0x9f, 0x5c,
0xad, 0xe6, 0x37, 0x95, 0xad, 0x4a, 0xb3, 0x39, 0x7b, 0xb2, 0xf4, 0x25, 0x49, 0xbf, 0xf0, 0x09, 0x43, 0x94, 0x0f, 0x3e, 0x00, 0x25, 0xa1, 0xd3, 0x4e, 0xe8, 0x10, 0x79, 0x8d, 0x72, 0x9a, 0x56,
0x27, 0x42, 0x7d, 0xbe, 0x81, 0x24, 0x29, 0xff, 0x78, 0x92, 0xbe, 0x51, 0x92, 0x24, 0xf1, 0xd2, 0x4b, 0xd9, 0x51, 0xe2, 0x01, 0x9f, 0x83, 0xbb, 0x8c, 0xe3, 0x80, 0xdb, 0x5e, 0xf7, 0x13, 0x82,
0xc3, 0xfb, 0xa0, 0xc4, 0xef, 0x98, 0x19, 0xda, 0x44, 0x24, 0xa9, 0x9c, 0xa2, 0x5b, 0xd2, 0x8e, 0x3b, 0x8e, 0xed, 0x91, 0x16, 0xb1, 0xa8, 0xd7, 0x61, 0xb2, 0xa7, 0x79, 0xf3, 0xdd, 0xa8, 0x5f,
0x12, 0x0f, 0xf8, 0x0c, 0xdc, 0xa1, 0x0c, 0x07, 0xcc, 0x72, 0x3b, 0x1f, 0x11, 0x6c, 0xda, 0x96, 0xbf, 0xdb, 0x9a, 0xec, 0x82, 0xa6, 0x61, 0xe1, 0x11, 0x58, 0xb5, 0xa8, 0x67, 0x85, 0x41, 0x40,
0x4b, 0x5a, 0xc4, 0xf0, 0x5c, 0x93, 0x0a, 0x3d, 0x2a, 0xfa, 0xdb, 0x51, 0xaf, 0x7e, 0xa7, 0x35, 0x3c, 0xeb, 0xec, 0x80, 0x3a, 0xb6, 0x75, 0x26, 0x1b, 0x59, 0x36, 0x75, 0x95, 0xcd, 0xea, 0xce,
0xde, 0x05, 0x4d, 0xc2, 0xc2, 0x63, 0xb0, 0x66, 0x78, 0xae, 0x11, 0x06, 0x01, 0x71, 0x8d, 0xf3, 0xa8, 0xc3, 0xd5, 0x24, 0x23, 0x1a, 0x27, 0x82, 0xef, 0x81, 0x22, 0x0b, 0x99, 0x4f, 0xbc, 0x4e,
0x43, 0xcf, 0xb6, 0x8c, 0x73, 0x71, 0xf6, 0xb2, 0xae, 0xca, 0xdd, 0xac, 0xed, 0x0e, 0x3b, 0x5c, 0x75, 0x7e, 0x43, 0xdb, 0x2c, 0x99, 0x95, 0xa8, 0x5f, 0x2f, 0xb6, 0x06, 0x26, 0x14, 0x9f, 0xc1,
0x8f, 0x33, 0xa2, 0x51, 0x22, 0xf8, 0x0e, 0x28, 0xd2, 0x90, 0xfa, 0xc4, 0x35, 0x85, 0xe8, 0x4a, 0x6f, 0x40, 0xe5, 0x15, 0x6d, 0x1f, 0x12, 0xd7, 0x77, 0x30, 0x27, 0xd5, 0x05, 0xd9, 0xd3, 0x27,
0x7a, 0x25, 0xea, 0xd5, 0x8b, 0xad, 0xbe, 0x09, 0xc5, 0x6b, 0xf0, 0x2b, 0x50, 0x79, 0xe9, 0xb5, 0x33, 0x14, 0x7e, 0x37, 0x45, 0x4b, 0x9d, 0xbe, 0xa5, 0x52, 0xaf, 0x64, 0x0e, 0x50, 0x36, 0x46,
0x8f, 0x88, 0xe3, 0xdb, 0x98, 0x91, 0xea, 0x82, 0x48, 0xfd, 0xe3, 0x19, 0xca, 0xba, 0x97, 0xa2, 0xe3, 0x0f, 0x0d, 0x2c, 0x0e, 0xa9, 0x0f, 0x3e, 0x07, 0x05, 0x6c, 0x71, 0xfb, 0x54, 0x34, 0x43,
0xc5, 0x1d, 0xfb, 0x9f, 0xdc, 0x7a, 0x25, 0xb3, 0x80, 0xb2, 0x31, 0x1a, 0xbf, 0xe4, 0xc0, 0xd2, 0x34, 0xfe, 0xe1, 0x4d, 0x5e, 0x1e, 0x22, 0xc7, 0x44, 0x5c, 0x98, 0xa4, 0xe2, 0x7d, 0x2a, 0x49,
0xc0, 0xcd, 0x81, 0xcf, 0x40, 0x01, 0x1b, 0xcc, 0x3a, 0xe3, 0xc5, 0xe0, 0xb2, 0x7a, 0x30, 0x4d, 0x90, 0x22, 0x83, 0x0e, 0x58, 0x71, 0x30, 0xe3, 0x71, 0x47, 0x0f, 0x6d, 0x97, 0xc8, 0x5a, 0x54,
0xd7, 0x40, 0xe4, 0x84, 0xf0, 0x03, 0x93, 0xf4, 0xe2, 0x3d, 0x11, 0x24, 0x48, 0x92, 0x41, 0x1b, 0x9a, 0xf7, 0x6f, 0x26, 0x5a, 0x81, 0x30, 0xdf, 0x8e, 0xfa, 0xf5, 0x95, 0xbd, 0x11, 0x1e, 0x34,
0xac, 0xda, 0x98, 0xb2, 0xb8, 0xa2, 0x47, 0x96, 0x43, 0xe4, 0x05, 0xbc, 0x37, 0xa5, 0xb6, 0x2c, 0xc6, 0xdc, 0xf8, 0x21, 0x07, 0xf2, 0x6f, 0x76, 0x90, 0x1c, 0x0e, 0x0d, 0x92, 0xe6, 0x6c, 0x4d,
0x87, 0xe8, 0xff, 0x8f, 0x7a, 0xf5, 0xd5, 0xfd, 0x21, 0x1e, 0x34, 0xc2, 0xdc, 0xf8, 0x23, 0x0f, 0x9a, 0x3a, 0x44, 0x8e, 0x46, 0x86, 0xc8, 0xf6, 0x8c, 0xbc, 0xd7, 0x0f, 0x90, 0x8b, 0x3c, 0xb8,
0x94, 0xdb, 0x6d, 0x82, 0x47, 0x03, 0x4d, 0xb0, 0x39, 0x5b, 0x91, 0x26, 0x36, 0xc0, 0xe3, 0xa1, 0xb3, 0x4b, 0xdb, 0x3b, 0xd4, 0xeb, 0xd8, 0xdc, 0xa6, 0x1e, 0xdc, 0x06, 0xf3, 0xfc, 0xcc, 0x8f,
0x06, 0xb8, 0x33, 0x23, 0xef, 0x9b, 0x6c, 0x7e, 0x97, 0x0a, 0x58, 0xdc, 0xf3, 0xda, 0xbb, 0x9e, 0x9f, 0xdd, 0x46, 0x9c, 0xd0, 0xe1, 0x99, 0x4f, 0xae, 0xfa, 0xf5, 0x95, 0xac, 0xaf, 0xb0, 0x21,
0x6b, 0x5a, 0xcc, 0xf2, 0x5c, 0xb8, 0x03, 0xe6, 0xf9, 0xa2, 0xbc, 0xd4, 0x9b, 0xf1, 0x71, 0x39, 0xe9, 0x0d, 0x3f, 0x4f, 0x92, 0xcc, 0x49, 0xdc, 0xc7, 0xc3, 0xe1, 0xae, 0xfa, 0xf5, 0x6b, 0x97,
0xf4, 0xba, 0x57, 0x5f, 0xcd, 0xfa, 0x72, 0x1b, 0x12, 0xde, 0xf0, 0xd3, 0x24, 0x05, 0x79, 0x81, 0x85, 0x9e, 0x70, 0x0e, 0xa7, 0x07, 0xbb, 0x60, 0x51, 0x34, 0xf2, 0x20, 0xa0, 0xed, 0x81, 0x3e,
0xfb, 0x70, 0xf0, 0x30, 0xd7, 0xbd, 0xfa, 0x2b, 0xc7, 0xa8, 0x9a, 0x70, 0x0e, 0x1d, 0xbe, 0x03, 0xf2, 0x33, 0xeb, 0x63, 0x4d, 0xa5, 0xb2, 0xb8, 0x97, 0x25, 0x42, 0xc3, 0xbc, 0xf0, 0x14, 0x40,
0x96, 0xb8, 0x4c, 0x0e, 0x03, 0xaf, 0xdd, 0x57, 0x9f, 0x32, 0xb3, 0xfa, 0xd6, 0xe5, 0x56, 0x96, 0x61, 0x38, 0x0c, 0xb0, 0xc7, 0x06, 0x97, 0xbb, 0x9d, 0x1a, 0xd7, 0x55, 0x34, 0xb8, 0x37, 0xc6,
0xf6, 0xb3, 0x44, 0x68, 0x90, 0x17, 0x9e, 0x01, 0xc8, 0x0d, 0x47, 0x01, 0x76, 0x69, 0xff, 0x70, 0x86, 0x26, 0x44, 0x80, 0xef, 0x83, 0x42, 0x40, 0x30, 0xa3, 0x9e, 0x7c, 0xda, 0xe5, 0xb4, 0x4f,
0x37, 0xd3, 0xfa, 0x86, 0x8c, 0x06, 0xf7, 0x47, 0xd8, 0xd0, 0x98, 0x08, 0xf0, 0x5d, 0x50, 0x08, 0x48, 0x5a, 0x91, 0x3a, 0x85, 0xf7, 0x40, 0xd1, 0x25, 0x8c, 0xe1, 0x2e, 0xa9, 0x16, 0xa4, 0xe3,
0x08, 0xa6, 0x9e, 0x2b, 0x1a, 0x47, 0x39, 0x55, 0x01, 0x12, 0x56, 0x24, 0x57, 0xe1, 0x5d, 0x50, 0xb2, 0x72, 0x2c, 0xee, 0x0f, 0xcc, 0x28, 0x3e, 0x6f, 0xfc, 0xa2, 0x81, 0xe2, 0x7f, 0xb3, 0x0f,
0x74, 0x08, 0xa5, 0xb8, 0x43, 0xaa, 0x05, 0xe1, 0xb8, 0x22, 0x1d, 0x8b, 0x07, 0x7d, 0x33, 0x8a, 0x5a, 0xc3, 0xfb, 0x40, 0x9f, 0x4d, 0x99, 0x53, 0x76, 0xc1, 0x4f, 0x79, 0x99, 0xbe, 0xdc, 0x03,
0xd7, 0x1b, 0xdf, 0xe5, 0x41, 0xf1, 0xdf, 0x99, 0x65, 0xad, 0xc1, 0x59, 0xa6, 0xce, 0xa6, 0xfb, 0x5b, 0xa0, 0xe2, 0xe3, 0x00, 0x3b, 0x0e, 0x71, 0x6c, 0xe6, 0xca, 0x1b, 0x2c, 0x98, 0xcb, 0x62,
0x37, 0x32, 0xc7, 0x7e, 0x54, 0x44, 0x72, 0xc4, 0x0c, 0xdb, 0x06, 0x15, 0x1f, 0x07, 0xd8, 0xb6, 0x7a, 0x1d, 0xa4, 0x66, 0x94, 0xf5, 0x11, 0x10, 0x8b, 0xba, 0xbe, 0x43, 0x44, 0x89, 0x07, 0x72,
0x89, 0x6d, 0x51, 0x47, 0xe4, 0x67, 0x41, 0x5f, 0xe1, 0x9d, 0xf7, 0x30, 0x35, 0xa3, 0xac, 0x0f, 0x54, 0x90, 0x9d, 0xd4, 0x8c, 0xb2, 0x3e, 0xf0, 0x19, 0x58, 0x1b, 0x4c, 0xa4, 0xd1, 0xed, 0x91,
0x87, 0x18, 0x9e, 0xe3, 0xdb, 0x84, 0x17, 0xb0, 0x2f, 0x76, 0x09, 0xd9, 0x4d, 0xcd, 0x28, 0xeb, 0x97, 0xdb, 0xe3, 0x9d, 0xa8, 0x5f, 0x5f, 0x7b, 0x3a, 0xc9, 0x01, 0x4d, 0xc6, 0xc1, 0xaf, 0x40,
0x03, 0x9f, 0x82, 0xf5, 0x7e, 0x37, 0x1d, 0x9e, 0x7c, 0x8a, 0x98, 0x7c, 0x6f, 0x45, 0xbd, 0xfa, 0x89, 0x11, 0x87, 0x58, 0x9c, 0x06, 0x4a, 0x42, 0x1f, 0xdc, 0xb0, 0xea, 0xb8, 0x4d, 0x9c, 0x96,
0xfa, 0x93, 0x71, 0x0e, 0x68, 0x3c, 0x0e, 0x7e, 0x01, 0x4a, 0x94, 0xd8, 0xc4, 0x60, 0x5e, 0x20, 0x82, 0x9a, 0x77, 0xe4, 0xbe, 0x53, 0x5f, 0x28, 0xa1, 0x84, 0x4f, 0xc0, 0x92, 0x8b, 0xbd, 0x10,
0x05, 0xfa, 0xde, 0x94, 0x35, 0xc5, 0x6d, 0x62, 0xb7, 0x24, 0x54, 0x5f, 0x14, 0xb3, 0x5a, 0xfe, 0x27, 0x9e, 0x52, 0x3b, 0x25, 0x13, 0x46, 0xfd, 0xfa, 0xd2, 0xfe, 0xd0, 0x09, 0x1a, 0xf1, 0x84,
0xa1, 0x84, 0x12, 0x3e, 0x06, 0xcb, 0x0e, 0x76, 0x43, 0x9c, 0x78, 0x0a, 0x65, 0x96, 0x74, 0x18, 0x5f, 0x82, 0x12, 0x8f, 0x97, 0x49, 0x41, 0xa6, 0xf6, 0x9a, 0x61, 0x7e, 0x40, 0x3b, 0x43, 0xfb,
0xf5, 0xea, 0xcb, 0x07, 0x03, 0x2b, 0x68, 0xc8, 0x13, 0x7e, 0x0e, 0x4a, 0x2c, 0x1e, 0x84, 0x05, 0x23, 0xd1, 0x43, 0xb2, 0x3c, 0x12, 0xc2, 0xc6, 0xcf, 0x79, 0x50, 0x4e, 0xb7, 0xc6, 0x09, 0x00,
0xb1, 0xb5, 0xd7, 0x0c, 0xa2, 0x43, 0xcf, 0x1c, 0x98, 0x7d, 0x69, 0xe9, 0xe2, 0xc1, 0x97, 0x10, 0x56, 0xfc, 0xac, 0x99, 0xda, 0x1c, 0x1f, 0xce, 0x26, 0x91, 0x64, 0x2c, 0xa4, 0x93, 0x37, 0x31,
0x36, 0x7e, 0x52, 0x40, 0x39, 0x9d, 0x78, 0xa7, 0x00, 0x18, 0x71, 0xd3, 0xa0, 0x72, 0xea, 0xbd, 0x31, 0x94, 0xa1, 0x87, 0x2f, 0x40, 0x59, 0xee, 0x71, 0xf9, 0x6c, 0x73, 0x33, 0x3f, 0xdb, 0xc5,
0x3f, 0x9b, 0x00, 0x93, 0xa6, 0x93, 0x4e, 0x8d, 0xc4, 0x44, 0x51, 0x86, 0x1e, 0x3e, 0x07, 0x65, 0xa8, 0x5f, 0x2f, 0xb7, 0x62, 0x02, 0x94, 0x72, 0xc1, 0x63, 0xb0, 0x94, 0x6a, 0xe5, 0x96, 0x23,
0xf1, 0x06, 0x11, 0x4d, 0x21, 0x3f, 0x73, 0x53, 0x58, 0x8a, 0x7a, 0xf5, 0x72, 0x2b, 0x26, 0x40, 0x48, 0x36, 0x66, 0x67, 0x88, 0x05, 0x8d, 0xb0, 0x8a, 0x41, 0xa0, 0x76, 0xec, 0xbc, 0x94, 0xec,
0x29, 0x17, 0x3c, 0x01, 0xcb, 0xa9, 0x56, 0x6e, 0xd8, 0xe0, 0x44, 0x61, 0x76, 0x07, 0x58, 0xd0, 0xb4, 0xa5, 0x69, 0x80, 0x32, 0x0b, 0x2d, 0x8b, 0x90, 0x0e, 0xe9, 0xc8, 0xbe, 0x2f, 0x98, 0xab,
0x10, 0x2b, 0x6f, 0x33, 0xf2, 0x7d, 0x30, 0x2f, 0x24, 0x3b, 0x69, 0xe0, 0x6b, 0xa0, 0x4c, 0x43, 0xca, 0xb5, 0xdc, 0x8a, 0x0f, 0x50, 0xea, 0x23, 0x88, 0x8f, 0xb1, 0xed, 0x90, 0x8e, 0xec, 0x77,
0xc3, 0x20, 0xc4, 0x24, 0xa6, 0xa8, 0xfb, 0x82, 0xbe, 0x26, 0x5d, 0xcb, 0xad, 0x78, 0x01, 0xa5, 0x86, 0xf8, 0x53, 0x69, 0x45, 0xea, 0xb4, 0xf1, 0xbb, 0x06, 0xb2, 0xff, 0x09, 0xde, 0xe0, 0x9e,
0x3e, 0x9c, 0xf8, 0x04, 0x5b, 0x36, 0x31, 0x45, 0xbd, 0x33, 0xc4, 0x1f, 0x0b, 0x2b, 0x92, 0xab, 0xec, 0x65, 0x34, 0x98, 0xfb, 0xd7, 0x7f, 0x68, 0xae, 0x13, 0xe4, 0xaf, 0x1a, 0x58, 0x1e, 0xf1,
0x8d, 0x1f, 0xf2, 0x20, 0xfb, 0x9e, 0xb9, 0xc5, 0x19, 0xdf, 0xcd, 0x68, 0x30, 0xff, 0xb7, 0x1f, 0xff, 0xbf, 0xed, 0x7f, 0xf3, 0xfe, 0xf9, 0x65, 0x6d, 0xee, 0xe2, 0xb2, 0x36, 0xf7, 0xe7, 0x65,
0x63, 0xaf, 0x10, 0xe4, 0x2d, 0x77, 0xaa, 0x9f, 0x73, 0x60, 0x65, 0x68, 0x37, 0xff, 0xb5, 0x97, 0x6d, 0xee, 0xdb, 0xa8, 0xa6, 0x9d, 0x47, 0x35, 0xed, 0x22, 0xaa, 0x69, 0x7f, 0x45, 0x35, 0xed,
0x91, 0x7e, 0xef, 0xe2, 0xaa, 0x36, 0x77, 0x79, 0x55, 0x9b, 0xfb, 0xf5, 0xaa, 0x36, 0xf7, 0x75, 0xfb, 0xbf, 0x6b, 0x73, 0x5f, 0x94, 0x62, 0x9e, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x00, 0x9d,
0x54, 0xcb, 0x5d, 0x44, 0xb5, 0xdc, 0x65, 0x54, 0xcb, 0xfd, 0x16, 0xd5, 0x72, 0xdf, 0xfe, 0x5e, 0xf9, 0x2b, 0xfa, 0x0e, 0x00, 0x00,
0x9b, 0xfb, 0xac, 0x14, 0xf3, 0xfc, 0x15, 0x00, 0x00, 0xff, 0xff, 0x6e, 0x22, 0xb7, 0xad, 0xd0,
0x10, 0x00, 0x00,
} }

10
pkg/apis/batch/v2alpha1/generated.proto
View File

@ -33,8 +33,6 @@ option go_package = "v2alpha1";
// CronJob represents the configuration of a single cron job. // CronJob represents the configuration of a single cron job.
message CronJob { message CronJob {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -53,8 +51,6 @@ message CronJob {
// CronJobList is a collection of cron jobs. // CronJobList is a collection of cron jobs.
message CronJobList { message CronJobList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata // Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -101,8 +97,6 @@ message CronJobStatus {
// Job represents the configuration of a single job. // Job represents the configuration of a single job.
message Job { message Job {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -146,8 +140,6 @@ message JobCondition {
// JobList is a collection of jobs. // JobList is a collection of jobs.
message JobList { message JobList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata // Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -240,8 +232,6 @@ message JobStatus {
// JobTemplate describes a template for creating copies of a predefined pod. // JobTemplate describes a template for creating copies of a predefined pod.
message JobTemplate { message JobTemplate {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional

1
pkg/apis/certificates/doc.go
View File

@ -14,6 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +groupName=certificates.k8s.io // +groupName=certificates.k8s.io
package certificates package certificates

31
pkg/apis/certificates/v1alpha1/defaults.go Normal file
View File

@ -0,0 +1,31 @@
/*
Copyright 2017 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 "k8s.io/apimachinery/pkg/runtime"
func addDefaultingFuncs(scheme *runtime.Scheme) error {
RegisterDefaults(scheme)
return scheme.AddDefaultingFuncs(
SetDefaults_CertificateSigningRequestSpec,
)
}
func SetDefaults_CertificateSigningRequestSpec(obj *CertificateSigningRequestSpec) {
if obj.Usages == nil {
obj.Usages = []KeyUsage{UsageDigitalSignature, UsageKeyEncipherment}
}
}

5
pkg/apis/certificates/v1alpha1/doc.go
View File

@ -14,10 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/certificates
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta
// +groupName=certificates.k8s.io // +groupName=certificates.k8s.io
package v1alpha1 package v1alpha1

186
pkg/apis/certificates/v1alpha1/generated.pb.go
View File

@ -127,14 +127,6 @@ func (m *CertificateSigningRequest) MarshalTo(data []byte) (int, error) {
return 0, err return 0, err
} }
i += n3 i += n3
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n4, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n4
return i, nil return i, nil
} }
@ -168,11 +160,11 @@ func (m *CertificateSigningRequestCondition) MarshalTo(data []byte) (int, error)
data[i] = 0x22 data[i] = 0x22
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.LastUpdateTime.Size())) i = encodeVarintGenerated(data, i, uint64(m.LastUpdateTime.Size()))
n5, err := m.LastUpdateTime.MarshalTo(data[i:]) n4, err := m.LastUpdateTime.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n5 i += n4
return i, nil return i, nil
} }
@ -194,11 +186,11 @@ func (m *CertificateSigningRequestList) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size()))
n6, err := m.ListMeta.MarshalTo(data[i:]) n5, err := m.ListMeta.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n6 i += n5
if len(m.Items) > 0 { if len(m.Items) > 0 {
for _, msg := range m.Items { for _, msg := range m.Items {
data[i] = 0x12 data[i] = 0x12
@ -211,14 +203,6 @@ func (m *CertificateSigningRequestList) MarshalTo(data []byte) (int, error) {
i += n i += n
} }
} }
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n7, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n7
return i, nil return i, nil
} }
@ -356,8 +340,6 @@ func (m *CertificateSigningRequest) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.Status.Size() l = m.Status.Size()
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -386,8 +368,6 @@ func (m *CertificateSigningRequestList) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
} }
} }
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -454,7 +434,6 @@ func (this *CertificateSigningRequest) String() string {
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "CertificateSigningRequestSpec", "CertificateSigningRequestSpec", 1), `&`, ``, 1) + `,`, `Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "CertificateSigningRequestSpec", "CertificateSigningRequestSpec", 1), `&`, ``, 1) + `,`,
`Status:` + strings.Replace(strings.Replace(this.Status.String(), "CertificateSigningRequestStatus", "CertificateSigningRequestStatus", 1), `&`, ``, 1) + `,`, `Status:` + strings.Replace(strings.Replace(this.Status.String(), "CertificateSigningRequestStatus", "CertificateSigningRequestStatus", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -479,7 +458,6 @@ func (this *CertificateSigningRequestList) String() string {
s := strings.Join([]string{`&CertificateSigningRequestList{`, s := strings.Join([]string{`&CertificateSigningRequestList{`,
`ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`,
`Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "CertificateSigningRequest", "CertificateSigningRequest", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "CertificateSigningRequest", "CertificateSigningRequest", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -636,36 +614,6 @@ func (m *CertificateSigningRequest) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -944,36 +892,6 @@ func (m *CertificateSigningRequestList) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -1410,53 +1328,51 @@ var (
) )
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 760 bytes of a gzipped FileDescriptorProto // 735 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x54, 0x4d, 0x4f, 0x1b, 0x3b, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x54, 0xbf, 0x4f, 0x1b, 0x49,
0x14, 0xcd, 0x24, 0x21, 0x24, 0x0e, 0x0f, 0x9e, 0xac, 0x27, 0x94, 0x87, 0xc4, 0x04, 0x45, 0xef, 0x14, 0xf6, 0xda, 0xc6, 0xd8, 0x63, 0x0e, 0x4e, 0xa3, 0x13, 0xf2, 0x21, 0xb1, 0x46, 0xd6, 0xdd,
0x55, 0x29, 0xa2, 0x9e, 0x26, 0xaa, 0x2a, 0x96, 0xd5, 0x50, 0xa9, 0x42, 0x80, 0x50, 0x0d, 0x91, 0xc9, 0x87, 0xb8, 0xdd, 0xb3, 0x15, 0x45, 0x94, 0xd1, 0x12, 0x29, 0x42, 0x80, 0x50, 0x06, 0x2c,
0xaa, 0xaa, 0x1b, 0x67, 0x62, 0x26, 0x26, 0xcc, 0x07, 0x63, 0x0f, 0x52, 0x76, 0x5d, 0x76, 0xd9, 0x45, 0x51, 0x9a, 0xf1, 0xfa, 0xb1, 0x1e, 0xcc, 0xfe, 0x60, 0x67, 0x16, 0xc9, 0x5d, 0xca, 0x94,
0x3f, 0xd0, 0x1f, 0xd3, 0x1d, 0x9b, 0x4a, 0x2c, 0xbb, 0x4a, 0x4b, 0xba, 0xec, 0x3f, 0x60, 0x55, 0xf9, 0x07, 0xf2, 0xff, 0x50, 0x52, 0xa6, 0x72, 0x82, 0x29, 0x53, 0xa4, 0xa7, 0x8a, 0x66, 0x3c,
0xd9, 0xf1, 0x24, 0x21, 0x21, 0x85, 0x4a, 0xd9, 0xc5, 0xc7, 0xf7, 0x9e, 0x73, 0xe7, 0xdc, 0xe3, 0x6b, 0x3b, 0x18, 0x87, 0x44, 0xa2, 0xf3, 0x7c, 0xf3, 0xde, 0xf7, 0xbd, 0xf9, 0xde, 0xb7, 0x46,
0x80, 0x17, 0x9d, 0x6d, 0x8e, 0x58, 0x60, 0x75, 0xe2, 0x26, 0x8d, 0x7c, 0x2a, 0x28, 0xb7, 0xc2, 0xcf, 0x7a, 0xdb, 0xdc, 0x62, 0xa1, 0xdd, 0x4b, 0xda, 0x10, 0x07, 0x20, 0x80, 0xdb, 0x51, 0xcf,
0x8e, 0x6b, 0x91, 0x90, 0x71, 0xcb, 0xa1, 0x91, 0x60, 0x27, 0xcc, 0x21, 0x12, 0xbd, 0xa8, 0x91, 0xb3, 0x69, 0xc4, 0xb8, 0xed, 0x42, 0x2c, 0xd8, 0x09, 0x73, 0xa9, 0x44, 0x2f, 0x1a, 0xf4, 0x2c,
0xb3, 0xb0, 0x4d, 0x6a, 0x96, 0x4b, 0x7d, 0x1a, 0x11, 0x41, 0x5b, 0x28, 0x8c, 0x02, 0x11, 0xc0, 0xea, 0xd2, 0x86, 0xed, 0x41, 0x00, 0x31, 0x15, 0xd0, 0xb1, 0xa2, 0x38, 0x14, 0x21, 0xfe, 0x7f,
0xa7, 0x03, 0x06, 0x34, 0x62, 0x40, 0x61, 0xc7, 0x45, 0x92, 0x01, 0x8d, 0x33, 0xa0, 0x84, 0x61, 0xc4, 0x60, 0x4d, 0x18, 0xac, 0xa8, 0xe7, 0x59, 0x92, 0xc1, 0x9a, 0x66, 0xb0, 0x52, 0x86, 0xb5,
0xed, 0x89, 0xcb, 0x44, 0x3b, 0x6e, 0x22, 0x27, 0xf0, 0x2c, 0x37, 0x70, 0x03, 0x4b, 0x11, 0x35, 0xff, 0x3c, 0x26, 0xba, 0x49, 0xdb, 0x72, 0x43, 0xdf, 0xf6, 0x42, 0x2f, 0xb4, 0x15, 0x51, 0x3b,
0xe3, 0x13, 0x75, 0x52, 0x07, 0xf5, 0x6b, 0x20, 0xb0, 0xf6, 0x4c, 0x8f, 0x48, 0x42, 0xe6, 0x11, 0x39, 0x51, 0x27, 0x75, 0x50, 0xbf, 0x46, 0x02, 0x6b, 0x4f, 0xf4, 0x88, 0x34, 0x62, 0x3e, 0x75,
0xa7, 0xcd, 0x7c, 0x1a, 0x75, 0x47, 0x43, 0x7a, 0x54, 0x10, 0xeb, 0x62, 0x6a, 0xac, 0x35, 0x6b, 0xbb, 0x2c, 0x80, 0xb8, 0x3f, 0x19, 0xd2, 0x07, 0x41, 0xed, 0x8b, 0x99, 0xb1, 0xd6, 0xec, 0x79,
0x56, 0x57, 0x14, 0xfb, 0x82, 0x79, 0x74, 0xaa, 0xe1, 0xf9, 0x7d, 0x0d, 0xdc, 0x69, 0x53, 0x8f, 0x5d, 0x71, 0x12, 0x08, 0xe6, 0xc3, 0x4c, 0xc3, 0xd3, 0x87, 0x1a, 0xb8, 0xdb, 0x05, 0x9f, 0xce,
0x4c, 0xf5, 0xd5, 0x67, 0x3a, 0x68, 0x45, 0x94, 0x07, 0x71, 0xe4, 0x4c, 0x6b, 0x6d, 0xcd, 0xee, 0xf4, 0x35, 0xe7, 0x3a, 0x68, 0xc7, 0xc0, 0xc3, 0x24, 0x76, 0x67, 0xb5, 0xb6, 0xe6, 0xf7, 0xdc,
0xb9, 0xe3, 0x53, 0x6a, 0x77, 0x57, 0xc7, 0x82, 0x9d, 0x59, 0xcc, 0x17, 0x5c, 0x44, 0x93, 0x2d, 0xf3, 0x94, 0xc6, 0xfd, 0xd5, 0x89, 0x60, 0x67, 0x36, 0x0b, 0x04, 0x17, 0xf1, 0xdd, 0x96, 0xda,
0x95, 0xcf, 0x19, 0xf0, 0xef, 0xce, 0xc8, 0xfc, 0x23, 0xe6, 0xfa, 0xcc, 0x77, 0x31, 0x3d, 0x8f, 0x4d, 0x16, 0xfd, 0xb9, 0x33, 0x31, 0xff, 0x88, 0x79, 0x01, 0x0b, 0x3c, 0x02, 0xe7, 0x09, 0x70,
0x29, 0x17, 0xf0, 0x0d, 0xc8, 0x4b, 0xdb, 0x5a, 0x44, 0x90, 0x92, 0xb1, 0x61, 0x54, 0x8b, 0xf5, 0x81, 0x5f, 0xa1, 0xa2, 0xb4, 0xad, 0x43, 0x05, 0xad, 0x18, 0x1b, 0x46, 0xbd, 0xdc, 0xac, 0x5b,
0x2a, 0x9a, 0xb9, 0x45, 0x74, 0x51, 0x43, 0x87, 0xcd, 0x53, 0xea, 0x88, 0x03, 0x2a, 0x88, 0x0d, 0x73, 0xb7, 0x68, 0x5d, 0x34, 0xac, 0xc3, 0xf6, 0x29, 0xb8, 0xe2, 0x00, 0x04, 0x75, 0xf0, 0xe5,
0x2f, 0x7b, 0xe5, 0x54, 0xbf, 0x57, 0x06, 0x23, 0x0c, 0x0f, 0xd9, 0xe0, 0x39, 0xc8, 0xf2, 0x90, 0xa0, 0x9a, 0x19, 0x0e, 0xaa, 0x68, 0x82, 0x91, 0x31, 0x1b, 0x3e, 0x47, 0x79, 0x1e, 0x81, 0x5b,
0x3a, 0xa5, 0xb4, 0x62, 0x3d, 0x44, 0x7f, 0x9a, 0x0d, 0x34, 0x73, 0xe8, 0xa3, 0x90, 0x3a, 0xf6, 0xc9, 0x2a, 0xd6, 0x43, 0xeb, 0x57, 0xb3, 0x61, 0xcd, 0x1d, 0xfa, 0x28, 0x02, 0xd7, 0x59, 0xd2,
0x92, 0x16, 0xcf, 0xca, 0x13, 0x56, 0x52, 0xb0, 0x0b, 0x72, 0x5c, 0x10, 0x11, 0xf3, 0x52, 0x46, 0xe2, 0x79, 0x79, 0x22, 0x4a, 0x0a, 0xf7, 0x51, 0x81, 0x0b, 0x2a, 0x12, 0x5e, 0xc9, 0x29, 0xd1,
0x89, 0xbe, 0x9e, 0xa7, 0xa8, 0x22, 0xb6, 0x97, 0xb5, 0x6c, 0x6e, 0x70, 0xc6, 0x5a, 0x10, 0xbe, 0x97, 0x8f, 0x29, 0xaa, 0x88, 0x9d, 0x65, 0x2d, 0x5b, 0x18, 0x9d, 0x89, 0x16, 0xac, 0x7d, 0xc8,
0x03, 0x79, 0xd1, 0x0d, 0xa9, 0xf4, 0xa0, 0x94, 0x55, 0xe2, 0x28, 0x11, 0x1f, 0x4f, 0xd1, 0x48, 0xa2, 0xda, 0xdc, 0xde, 0x9d, 0x30, 0xe8, 0x30, 0xc1, 0xc2, 0x00, 0x6f, 0xa3, 0xbc, 0xe8, 0x47,
0x5e, 0xfa, 0x24, 0xfd, 0x3c, 0xd6, 0x5d, 0xf6, 0xdf, 0x9a, 0x39, 0x9f, 0x20, 0x78, 0xc8, 0x58, 0xa0, 0xac, 0x2e, 0x39, 0x7f, 0xa5, 0x6f, 0x38, 0xee, 0x47, 0x70, 0x3b, 0xa8, 0xfe, 0x71, 0xb7,
0xf9, 0x94, 0x06, 0x95, 0x99, 0x93, 0xed, 0x04, 0x7e, 0x8b, 0x09, 0x16, 0xf8, 0x70, 0x1b, 0x64, 0x5e, 0xe2, 0x44, 0x75, 0xe0, 0x7f, 0x50, 0x21, 0x06, 0xca, 0xc3, 0x40, 0x19, 0x5a, 0x9a, 0x0c,
0x65, 0x8b, 0x5a, 0x64, 0xc1, 0xfe, 0x2f, 0x71, 0x48, 0x12, 0xde, 0xf4, 0xca, 0xff, 0x4c, 0xd6, 0x42, 0x14, 0x4a, 0xf4, 0x2d, 0xfe, 0x17, 0x2d, 0xfa, 0xc0, 0x39, 0xf5, 0x40, 0x99, 0x50, 0x72,
0x4b, 0x1c, 0xab, 0x0e, 0xf8, 0x08, 0xe4, 0x22, 0x4a, 0x78, 0xe0, 0xab, 0x75, 0x15, 0x46, 0x9f, 0x56, 0x74, 0xe1, 0xe2, 0xc1, 0x08, 0x26, 0xe9, 0x3d, 0x3e, 0x45, 0xcb, 0x67, 0x94, 0x8b, 0x56,
0x89, 0x15, 0x8a, 0xf5, 0x2d, 0x7c, 0x0c, 0x16, 0x3d, 0xca, 0x39, 0x71, 0xa9, 0xb2, 0xb8, 0x60, 0xd4, 0xa1, 0x02, 0x8e, 0x99, 0x0f, 0x95, 0xbc, 0xb2, 0x6d, 0x33, 0xb5, 0x6d, 0x3a, 0xff, 0x13,
0xaf, 0xe8, 0xc2, 0xc5, 0x83, 0x01, 0x8c, 0x93, 0x7b, 0x78, 0x0a, 0x96, 0xcf, 0x08, 0x17, 0x8d, 0xe3, 0xe4, 0x86, 0x65, 0x12, 0x64, 0x87, 0xb3, 0xaa, 0xd9, 0x97, 0xf7, 0xbf, 0x63, 0x22, 0x77,
0xb0, 0x45, 0x04, 0x3d, 0x66, 0x1e, 0xd5, 0xbe, 0x6c, 0x3e, 0xd0, 0x17, 0xe6, 0x51, 0x7b, 0x55, 0x98, 0x6b, 0x5f, 0x0d, 0xb4, 0x3e, 0xd7, 0x9f, 0x7d, 0xc6, 0x05, 0x7e, 0x33, 0x93, 0x44, 0xeb,
0xb3, 0x2f, 0xef, 0xdf, 0x62, 0xc2, 0x13, 0xcc, 0x95, 0x2f, 0x69, 0xb0, 0x3e, 0xd3, 0x9f, 0x7d, 0xe7, 0xe6, 0x90, 0xdd, 0x2a, 0x8f, 0xbf, 0xeb, 0x59, 0x8a, 0x29, 0x32, 0x95, 0xc6, 0x08, 0x2d,
0xc6, 0x85, 0xdc, 0xcf, 0x44, 0xce, 0x1f, 0xb8, 0x1f, 0xd9, 0x7d, 0x7b, 0x3f, 0x09, 0x32, 0x96, 0x30, 0x01, 0x3e, 0xaf, 0x64, 0x37, 0x72, 0xf5, 0x72, 0x73, 0xef, 0x11, 0x93, 0xe1, 0xfc, 0xa6,
0xf5, 0x10, 0x2c, 0x30, 0x41, 0x3d, 0x5e, 0x4a, 0x6f, 0x64, 0xaa, 0xc5, 0xfa, 0xde, 0x1c, 0x73, 0x75, 0x17, 0x76, 0xa5, 0x02, 0x19, 0x09, 0xd5, 0xbe, 0xfc, 0xe8, 0xc5, 0x32, 0xb4, 0xf8, 0x6f,
0x67, 0xff, 0xa5, 0x75, 0x17, 0x76, 0xa5, 0x02, 0x1e, 0x08, 0xdd, 0xca, 0x5b, 0x66, 0xee, 0x79, 0xb4, 0x18, 0x8f, 0x8e, 0xea, 0xc1, 0x4b, 0x4e, 0x59, 0xae, 0x49, 0x57, 0x90, 0xf4, 0x0e, 0x6f,
0xfb, 0x69, 0xfc, 0xc6, 0x4f, 0xf9, 0xe0, 0xe0, 0xff, 0x60, 0x31, 0x1a, 0x1c, 0x95, 0x9d, 0x4b, 0xa1, 0x62, 0xc2, 0x21, 0x0e, 0xa8, 0x0f, 0x7a, 0xf7, 0xe3, 0x87, 0xb6, 0x34, 0x4e, 0xc6, 0x15,
0x76, 0x51, 0x86, 0x40, 0x57, 0xe0, 0xe4, 0x0e, 0x6e, 0x81, 0x7c, 0xcc, 0x69, 0xe4, 0x13, 0x8f, 0x78, 0x1d, 0xe5, 0x12, 0xd6, 0xd1, 0xbb, 0x2f, 0xeb, 0xc2, 0x5c, 0x6b, 0xf7, 0x39, 0x91, 0x38,
0xea, 0x64, 0x0d, 0x65, 0x1b, 0x1a, 0xc7, 0xc3, 0x0a, 0xb8, 0x0e, 0x32, 0x31, 0x6b, 0xe9, 0x64, 0xae, 0xa1, 0x82, 0x17, 0x87, 0x49, 0xc4, 0x2b, 0xf9, 0x8d, 0x5c, 0xbd, 0xe4, 0x20, 0x19, 0xa1,
0x15, 0x75, 0x61, 0xa6, 0xb1, 0xfb, 0x12, 0x4b, 0x1c, 0x56, 0x40, 0xce, 0x8d, 0x82, 0x38, 0xe4, 0x17, 0x0a, 0x21, 0xfa, 0x06, 0x37, 0x51, 0xb1, 0x07, 0xfd, 0x96, 0xca, 0xd0, 0x82, 0xaa, 0x5a,
0xa5, 0xec, 0x46, 0xa6, 0x5a, 0xb0, 0x81, 0x0c, 0xe8, 0x2b, 0x85, 0x60, 0x7d, 0x03, 0xeb, 0x20, 0x95, 0x55, 0x0a, 0xe0, 0xb7, 0x83, 0x6a, 0x71, 0x4f, 0xdf, 0x92, 0x71, 0x5d, 0xed, 0x93, 0x81,
0xdf, 0xa1, 0xdd, 0x86, 0x4a, 0xe8, 0x82, 0xaa, 0x5a, 0x95, 0x55, 0x0a, 0xe0, 0x37, 0xbd, 0x72, 0xaa, 0x0f, 0x7c, 0x3b, 0xf8, 0x9d, 0x81, 0x90, 0x9b, 0x46, 0x9b, 0x57, 0x0c, 0xb5, 0x89, 0xe3,
0x7e, 0x4f, 0xdf, 0xe2, 0x61, 0x5d, 0xe5, 0x9b, 0x01, 0xca, 0xf7, 0xbc, 0x7b, 0xf8, 0xc1, 0x00, 0x47, 0xdc, 0xc4, 0xf8, 0xbb, 0x99, 0xfc, 0x35, 0x8d, 0x21, 0x4e, 0xa6, 0xb4, 0x71, 0x03, 0x95,
0xc0, 0x49, 0x1e, 0x0e, 0x2f, 0x19, 0x6a, 0xcf, 0xc7, 0x73, 0xdc, 0xf3, 0xf0, 0x55, 0x8e, 0xfe, 0xa7, 0xb8, 0x95, 0xad, 0x4b, 0xce, 0xca, 0x70, 0x50, 0x2d, 0x4f, 0x91, 0x93, 0xe9, 0x1a, 0x67,
0x56, 0x87, 0x10, 0xc7, 0x63, 0xda, 0xb0, 0x06, 0x8a, 0x63, 0xdc, 0xca, 0xd6, 0x25, 0x7b, 0xa5, 0xf3, 0xf2, 0xda, 0xcc, 0x5c, 0x5d, 0x9b, 0x99, 0x8f, 0xd7, 0x66, 0xe6, 0xed, 0xd0, 0x34, 0x2e,
0xdf, 0x2b, 0x17, 0xc7, 0xc8, 0xf1, 0x78, 0x8d, 0xbd, 0x79, 0x79, 0x6d, 0xa6, 0xae, 0xae, 0xcd, 0x87, 0xa6, 0x71, 0x35, 0x34, 0x8d, 0xcf, 0x43, 0xd3, 0x78, 0x7f, 0x63, 0x66, 0x5e, 0x17, 0xd3,
0xd4, 0xd7, 0x6b, 0x33, 0xf5, 0xbe, 0x6f, 0x1a, 0x97, 0x7d, 0xd3, 0xb8, 0xea, 0x9b, 0xc6, 0xf7, 0x09, 0xbf, 0x05, 0x00, 0x00, 0xff, 0xff, 0x55, 0xe5, 0xc0, 0xfd, 0x4b, 0x07, 0x00, 0x00,
0xbe, 0x69, 0x7c, 0xfc, 0x61, 0xa6, 0xde, 0xe6, 0x93, 0x09, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff,
0x32, 0x89, 0x6c, 0x98, 0x07, 0x08, 0x00, 0x00,
} }

4
pkg/apis/certificates/v1alpha1/generated.proto
View File

@ -33,8 +33,6 @@ option go_package = "v1alpha1";
// Describes a certificate signing request // Describes a certificate signing request
message CertificateSigningRequest { message CertificateSigningRequest {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
@ -65,8 +63,6 @@ message CertificateSigningRequestCondition {
} }
message CertificateSigningRequestList { message CertificateSigningRequestList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// +optional // +optional
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1; optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;

4
pkg/apis/certificates/v1alpha1/register.go
View File

@ -1,5 +1,5 @@
/* /*
Copyright 2016 The Kubernetes Authors. Copyright 2017 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -40,7 +40,7 @@ func Resource(resource string) schema.GroupResource {
} }
var ( var (
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs) SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs, addDefaultingFuncs)
AddToScheme = SchemeBuilder.AddToScheme AddToScheme = SchemeBuilder.AddToScheme
) )

15
pkg/apis/certificates/v1alpha1/zz_generated.defaults.go
View File

@ -28,5 +28,20 @@ import (
// Public to allow building arbitrary schemes. // Public to allow building arbitrary schemes.
// All generated defaulters are covering - they call all nested defaulters. // All generated defaulters are covering - they call all nested defaulters.
func RegisterDefaults(scheme *runtime.Scheme) error { func RegisterDefaults(scheme *runtime.Scheme) error {
scheme.AddTypeDefaultingFunc(&CertificateSigningRequest{}, func(obj interface{}) { SetObjectDefaults_CertificateSigningRequest(obj.(*CertificateSigningRequest)) })
scheme.AddTypeDefaultingFunc(&CertificateSigningRequestList{}, func(obj interface{}) {
SetObjectDefaults_CertificateSigningRequestList(obj.(*CertificateSigningRequestList))
})
return nil return nil
} }
func SetObjectDefaults_CertificateSigningRequest(in *CertificateSigningRequest) {
SetDefaults_CertificateSigningRequestSpec(&in.Spec)
}
func SetObjectDefaults_CertificateSigningRequestList(in *CertificateSigningRequestList) {
for i := range in.Items {
a := &in.Items[i]
SetObjectDefaults_CertificateSigningRequest(a)
}
}

2
pkg/apis/componentconfig/doc.go
View File

@ -14,6 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
package componentconfig package componentconfig

2
pkg/apis/componentconfig/register.go
View File

@ -48,6 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&KubeProxyConfiguration{}, &KubeProxyConfiguration{},
&KubeSchedulerConfiguration{}, &KubeSchedulerConfiguration{},
&KubeletConfiguration{}, &KubeletConfiguration{},
&AdmissionConfiguration{},
) )
return nil return nil
} }
@ -55,3 +56,4 @@ func addKnownTypes(scheme *runtime.Scheme) error {
func (obj *KubeProxyConfiguration) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta } func (obj *KubeProxyConfiguration) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *KubeSchedulerConfiguration) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta } func (obj *KubeSchedulerConfiguration) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *KubeletConfiguration) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta } func (obj *KubeletConfiguration) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *AdmissionConfiguration) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

33
pkg/apis/componentconfig/types.go
View File

@ -18,6 +18,7 @@ package componentconfig
import ( import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api"
utilconfig "k8s.io/client-go/pkg/util/config" utilconfig "k8s.io/client-go/pkg/util/config"
) )
@ -601,6 +602,13 @@ type LeaderElectionConfiguration struct {
type KubeControllerManagerConfiguration struct { type KubeControllerManagerConfiguration struct {
metav1.TypeMeta metav1.TypeMeta
// Controllers is the list of controllers to enable or disable
// '*' means "all enabled by default controllers"
// 'foo' means "enable 'foo'"
// '-foo' means "disable 'foo'"
// first item for a particular name wins
Controllers []string
// port is the port that the controller-manager's http service runs on. // port is the port that the controller-manager's http service runs on.
Port int32 Port int32
// address is the IP address to serve on (set to 0.0.0.0 for all interfaces). // address is the IP address to serve on (set to 0.0.0.0 for all interfaces).
@ -828,3 +836,28 @@ type PersistentVolumeRecyclerConfiguration struct {
// in a multi-node cluster. // in a multi-node cluster.
IncrementTimeoutHostPath int32 IncrementTimeoutHostPath int32
} }
// AdmissionConfiguration provides versioned configuration for admission controllers.
type AdmissionConfiguration struct {
metav1.TypeMeta
// Plugins allows specifying a configuration per admission control plugin.
Plugins []AdmissionPluginConfiguration
}
// AdmissionPluginConfiguration provides the configuration for a single plug-in.
type AdmissionPluginConfiguration struct {
// Name is the name of the admission controller.
// It must match the registered admission plugin name.
Name string
// Path is the path to a configuration file that contains the plugin's
// configuration
// +optional
Path string
// Configuration is an embedded configuration object to be used as the plugin's
// configuration. If present, it will be used instead of the path to the configuration file.
// +optional
Configuration runtime.Object
}

5
pkg/apis/componentconfig/v1alpha1/doc.go
View File

@ -14,9 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/componentconfig
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta
package v1alpha1 package v1alpha1

2
pkg/apis/componentconfig/v1alpha1/register.go
View File

@ -37,6 +37,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&KubeProxyConfiguration{}, &KubeProxyConfiguration{},
&KubeSchedulerConfiguration{}, &KubeSchedulerConfiguration{},
&KubeletConfiguration{}, &KubeletConfiguration{},
&AdmissionConfiguration{},
) )
return nil return nil
} }
@ -44,3 +45,4 @@ func addKnownTypes(scheme *runtime.Scheme) error {
func (obj *KubeProxyConfiguration) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta } func (obj *KubeProxyConfiguration) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *KubeSchedulerConfiguration) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta } func (obj *KubeSchedulerConfiguration) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *KubeletConfiguration) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta } func (obj *KubeletConfiguration) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *AdmissionConfiguration) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

27
pkg/apis/componentconfig/v1alpha1/types.go
View File

@ -18,6 +18,7 @@ package v1alpha1
import ( import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
) )
@ -578,3 +579,29 @@ type KubeletAnonymousAuthentication struct {
// Anonymous requests have a username of system:anonymous, and a group name of system:unauthenticated. // Anonymous requests have a username of system:anonymous, and a group name of system:unauthenticated.
Enabled *bool `json:"enabled"` Enabled *bool `json:"enabled"`
} }
// AdmissionConfiguration provides versioned configuration for admission controllers.
type AdmissionConfiguration struct {
metav1.TypeMeta `json:",inline"`
// Plugins allows specifying a configuration per admission control plugin.
// +optional
Plugins []AdmissionPluginConfiguration `json:"plugins"`
}
// AdmissionPluginConfiguration provides the configuration for a single plug-in.
type AdmissionPluginConfiguration struct {
// Name is the name of the admission controller.
// It must match the registered admission plugin name.
Name string `json:"name"`
// Path is the path to a configuration file that contains the plugin's
// configuration
// +optional
Path string `json:"path"`
// Configuration is an embedded configuration object to be used as the plugin's
// configuration. If present, it will be used instead of the path to the configuration file.
// +optional
Configuration runtime.RawExtension `json:"configuration"`
}

68
pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go
View File

@ -38,6 +38,10 @@ func init() {
// Public to allow building arbitrary schemes. // Public to allow building arbitrary schemes.
func RegisterConversions(scheme *runtime.Scheme) error { func RegisterConversions(scheme *runtime.Scheme) error {
return scheme.AddGeneratedConversionFuncs( return scheme.AddGeneratedConversionFuncs(
Convert_v1alpha1_AdmissionConfiguration_To_componentconfig_AdmissionConfiguration,
Convert_componentconfig_AdmissionConfiguration_To_v1alpha1_AdmissionConfiguration,
Convert_v1alpha1_AdmissionPluginConfiguration_To_componentconfig_AdmissionPluginConfiguration,
Convert_componentconfig_AdmissionPluginConfiguration_To_v1alpha1_AdmissionPluginConfiguration,
Convert_v1alpha1_KubeProxyConfiguration_To_componentconfig_KubeProxyConfiguration, Convert_v1alpha1_KubeProxyConfiguration_To_componentconfig_KubeProxyConfiguration,
Convert_componentconfig_KubeProxyConfiguration_To_v1alpha1_KubeProxyConfiguration, Convert_componentconfig_KubeProxyConfiguration_To_v1alpha1_KubeProxyConfiguration,
Convert_v1alpha1_KubeSchedulerConfiguration_To_componentconfig_KubeSchedulerConfiguration, Convert_v1alpha1_KubeSchedulerConfiguration_To_componentconfig_KubeSchedulerConfiguration,
@ -61,6 +65,70 @@ func RegisterConversions(scheme *runtime.Scheme) error {
) )
} }
func autoConvert_v1alpha1_AdmissionConfiguration_To_componentconfig_AdmissionConfiguration(in *AdmissionConfiguration, out *componentconfig.AdmissionConfiguration, s conversion.Scope) error {
if in.Plugins != nil {
in, out := &in.Plugins, &out.Plugins
*out = make([]componentconfig.AdmissionPluginConfiguration, len(*in))
for i := range *in {
if err := Convert_v1alpha1_AdmissionPluginConfiguration_To_componentconfig_AdmissionPluginConfiguration(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
} else {
out.Plugins = nil
}
return nil
}
func Convert_v1alpha1_AdmissionConfiguration_To_componentconfig_AdmissionConfiguration(in *AdmissionConfiguration, out *componentconfig.AdmissionConfiguration, s conversion.Scope) error {
return autoConvert_v1alpha1_AdmissionConfiguration_To_componentconfig_AdmissionConfiguration(in, out, s)
}
func autoConvert_componentconfig_AdmissionConfiguration_To_v1alpha1_AdmissionConfiguration(in *componentconfig.AdmissionConfiguration, out *AdmissionConfiguration, s conversion.Scope) error {
if in.Plugins != nil {
in, out := &in.Plugins, &out.Plugins
*out = make([]AdmissionPluginConfiguration, len(*in))
for i := range *in {
if err := Convert_componentconfig_AdmissionPluginConfiguration_To_v1alpha1_AdmissionPluginConfiguration(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
} else {
out.Plugins = nil
}
return nil
}
func Convert_componentconfig_AdmissionConfiguration_To_v1alpha1_AdmissionConfiguration(in *componentconfig.AdmissionConfiguration, out *AdmissionConfiguration, s conversion.Scope) error {
return autoConvert_componentconfig_AdmissionConfiguration_To_v1alpha1_AdmissionConfiguration(in, out, s)
}
func autoConvert_v1alpha1_AdmissionPluginConfiguration_To_componentconfig_AdmissionPluginConfiguration(in *AdmissionPluginConfiguration, out *componentconfig.AdmissionPluginConfiguration, s conversion.Scope) error {
out.Name = in.Name
out.Path = in.Path
if err := runtime.Convert_runtime_RawExtension_To_runtime_Object(&in.Configuration, &out.Configuration, s); err != nil {
return err
}
return nil
}
func Convert_v1alpha1_AdmissionPluginConfiguration_To_componentconfig_AdmissionPluginConfiguration(in *AdmissionPluginConfiguration, out *componentconfig.AdmissionPluginConfiguration, s conversion.Scope) error {
return autoConvert_v1alpha1_AdmissionPluginConfiguration_To_componentconfig_AdmissionPluginConfiguration(in, out, s)
}
func autoConvert_componentconfig_AdmissionPluginConfiguration_To_v1alpha1_AdmissionPluginConfiguration(in *componentconfig.AdmissionPluginConfiguration, out *AdmissionPluginConfiguration, s conversion.Scope) error {
out.Name = in.Name
out.Path = in.Path
if err := runtime.Convert_runtime_Object_To_runtime_RawExtension(&in.Configuration, &out.Configuration, s); err != nil {
return err
}
return nil
}
func Convert_componentconfig_AdmissionPluginConfiguration_To_v1alpha1_AdmissionPluginConfiguration(in *componentconfig.AdmissionPluginConfiguration, out *AdmissionPluginConfiguration, s conversion.Scope) error {
return autoConvert_componentconfig_AdmissionPluginConfiguration_To_v1alpha1_AdmissionPluginConfiguration(in, out, s)
}
func autoConvert_v1alpha1_KubeProxyConfiguration_To_componentconfig_KubeProxyConfiguration(in *KubeProxyConfiguration, out *componentconfig.KubeProxyConfiguration, s conversion.Scope) error { func autoConvert_v1alpha1_KubeProxyConfiguration_To_componentconfig_KubeProxyConfiguration(in *KubeProxyConfiguration, out *componentconfig.KubeProxyConfiguration, s conversion.Scope) error {
out.BindAddress = in.BindAddress out.BindAddress = in.BindAddress
out.ClusterCIDR = in.ClusterCIDR out.ClusterCIDR = in.ClusterCIDR

34
pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go
View File

@ -35,6 +35,8 @@ func init() {
// to allow building arbitrary schemes. // to allow building arbitrary schemes.
func RegisterDeepCopies(scheme *runtime.Scheme) error { func RegisterDeepCopies(scheme *runtime.Scheme) error {
return scheme.AddGeneratedDeepCopyFuncs( return scheme.AddGeneratedDeepCopyFuncs(
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_AdmissionConfiguration, InType: reflect.TypeOf(&AdmissionConfiguration{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_AdmissionPluginConfiguration, InType: reflect.TypeOf(&AdmissionPluginConfiguration{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeProxyConfiguration, InType: reflect.TypeOf(&KubeProxyConfiguration{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeProxyConfiguration, InType: reflect.TypeOf(&KubeProxyConfiguration{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeSchedulerConfiguration, InType: reflect.TypeOf(&KubeSchedulerConfiguration{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeSchedulerConfiguration, InType: reflect.TypeOf(&KubeSchedulerConfiguration{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeletAnonymousAuthentication, InType: reflect.TypeOf(&KubeletAnonymousAuthentication{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeletAnonymousAuthentication, InType: reflect.TypeOf(&KubeletAnonymousAuthentication{})},
@ -48,6 +50,38 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
) )
} }
func DeepCopy_v1alpha1_AdmissionConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error {
{
in := in.(*AdmissionConfiguration)
out := out.(*AdmissionConfiguration)
*out = *in
if in.Plugins != nil {
in, out := &in.Plugins, &out.Plugins
*out = make([]AdmissionPluginConfiguration, len(*in))
for i := range *in {
if err := DeepCopy_v1alpha1_AdmissionPluginConfiguration(&(*in)[i], &(*out)[i], c); err != nil {
return err
}
}
}
return nil
}
}
func DeepCopy_v1alpha1_AdmissionPluginConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error {
{
in := in.(*AdmissionPluginConfiguration)
out := out.(*AdmissionPluginConfiguration)
*out = *in
if newVal, err := c.DeepCopy(&in.Configuration); err != nil {
return err
} else {
out.Configuration = *newVal.(*runtime.RawExtension)
}
return nil
}
}
func DeepCopy_v1alpha1_KubeProxyConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { func DeepCopy_v1alpha1_KubeProxyConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error {
{ {
in := in.(*KubeProxyConfiguration) in := in.(*KubeProxyConfiguration)

42
pkg/apis/componentconfig/zz_generated.deepcopy.go
View File

@ -36,6 +36,8 @@ func init() {
// to allow building arbitrary schemes. // to allow building arbitrary schemes.
func RegisterDeepCopies(scheme *runtime.Scheme) error { func RegisterDeepCopies(scheme *runtime.Scheme) error {
return scheme.AddGeneratedDeepCopyFuncs( return scheme.AddGeneratedDeepCopyFuncs(
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_AdmissionConfiguration, InType: reflect.TypeOf(&AdmissionConfiguration{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_AdmissionPluginConfiguration, InType: reflect.TypeOf(&AdmissionPluginConfiguration{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_IPVar, InType: reflect.TypeOf(&IPVar{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_IPVar, InType: reflect.TypeOf(&IPVar{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeControllerManagerConfiguration, InType: reflect.TypeOf(&KubeControllerManagerConfiguration{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeControllerManagerConfiguration, InType: reflect.TypeOf(&KubeControllerManagerConfiguration{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeProxyConfiguration, InType: reflect.TypeOf(&KubeProxyConfiguration{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeProxyConfiguration, InType: reflect.TypeOf(&KubeProxyConfiguration{})},
@ -54,6 +56,41 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
) )
} }
func DeepCopy_componentconfig_AdmissionConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error {
{
in := in.(*AdmissionConfiguration)
out := out.(*AdmissionConfiguration)
*out = *in
if in.Plugins != nil {
in, out := &in.Plugins, &out.Plugins
*out = make([]AdmissionPluginConfiguration, len(*in))
for i := range *in {
if err := DeepCopy_componentconfig_AdmissionPluginConfiguration(&(*in)[i], &(*out)[i], c); err != nil {
return err
}
}
}
return nil
}
}
func DeepCopy_componentconfig_AdmissionPluginConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error {
{
in := in.(*AdmissionPluginConfiguration)
out := out.(*AdmissionPluginConfiguration)
*out = *in
// in.Configuration is kind 'Interface'
if in.Configuration != nil {
if newVal, err := c.DeepCopy(&in.Configuration); err != nil {
return err
} else {
out.Configuration = *newVal.(*runtime.Object)
}
}
return nil
}
}
func DeepCopy_componentconfig_IPVar(in interface{}, out interface{}, c *conversion.Cloner) error { func DeepCopy_componentconfig_IPVar(in interface{}, out interface{}, c *conversion.Cloner) error {
{ {
in := in.(*IPVar) in := in.(*IPVar)
@ -73,6 +110,11 @@ func DeepCopy_componentconfig_KubeControllerManagerConfiguration(in interface{},
in := in.(*KubeControllerManagerConfiguration) in := in.(*KubeControllerManagerConfiguration)
out := out.(*KubeControllerManagerConfiguration) out := out.(*KubeControllerManagerConfiguration)
*out = *in *out = *in
if in.Controllers != nil {
in, out := &in.Controllers, &out.Controllers
*out = make([]string, len(*in))
copy(*out, *in)
}
return nil return nil
} }
} }

2
pkg/apis/extensions/doc.go
View File

@ -14,6 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
package extensions package extensions

7
pkg/apis/extensions/v1beta1/doc.go
View File

@ -14,11 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/extensions
// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/autoscaling
// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/batch
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta
package v1beta1 package v1beta1

1589
pkg/apis/extensions/v1beta1/generated.pb.go
View File

File diff suppressed because it is too large Load Diff

41
pkg/apis/extensions/v1beta1/generated.proto
View File

@ -71,8 +71,6 @@ message CustomMetricTargetList {
// DaemonSet represents the configuration of a daemon set. // DaemonSet represents the configuration of a daemon set.
message DaemonSet { message DaemonSet {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -94,8 +92,6 @@ message DaemonSet {
// DaemonSetList is a collection of daemon sets. // DaemonSetList is a collection of daemon sets.
message DaemonSetList { message DaemonSetList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -150,8 +146,6 @@ message DaemonSetStatus {
// Deployment enables declarative updates for Pods and ReplicaSets. // Deployment enables declarative updates for Pods and ReplicaSets.
message Deployment { message Deployment {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object metadata. // Standard object metadata.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
@ -188,8 +182,6 @@ message DeploymentCondition {
// DeploymentList is a list of Deployments. // DeploymentList is a list of Deployments.
message DeploymentList { message DeploymentList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// +optional // +optional
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1; optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
@ -200,8 +192,6 @@ message DeploymentList {
// DeploymentRollback stores the information required to rollback a deployment. // DeploymentRollback stores the information required to rollback a deployment.
message DeploymentRollback { message DeploymentRollback {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Required: This must match the Name of a deployment. // Required: This must match the Name of a deployment.
optional string name = 1; optional string name = 1;
@ -349,8 +339,6 @@ message HTTPIngressRuleValue {
// configuration of a horizontal pod autoscaler. // configuration of a horizontal pod autoscaler.
message HorizontalPodAutoscaler { message HorizontalPodAutoscaler {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // Standard object metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
@ -366,8 +354,6 @@ message HorizontalPodAutoscaler {
// list of horizontal pod autoscaler objects. // list of horizontal pod autoscaler objects.
message HorizontalPodAutoscalerList { message HorizontalPodAutoscalerList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// +optional // +optional
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1; optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
@ -442,8 +428,6 @@ message IDRange {
// externally-reachable urls, load balance traffic, terminate SSL, offer name // externally-reachable urls, load balance traffic, terminate SSL, offer name
// based virtual hosting etc. // based virtual hosting etc.
message Ingress { message Ingress {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -471,8 +455,6 @@ message IngressBackend {
// IngressList is a collection of Ingress. // IngressList is a collection of Ingress.
message IngressList { message IngressList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -568,8 +550,6 @@ message IngressTLS {
} }
message NetworkPolicy { message NetworkPolicy {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -605,8 +585,6 @@ message NetworkPolicyIngressRule {
// Network Policy List is a list of NetworkPolicy objects. // Network Policy List is a list of NetworkPolicy objects.
message NetworkPolicyList { message NetworkPolicyList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -671,8 +649,6 @@ message NetworkPolicySpec {
// Pod Security Policy governs the ability to make requests that affect the Security Context // Pod Security Policy governs the ability to make requests that affect the Security Context
// that will be applied to a pod and container. // that will be applied to a pod and container.
message PodSecurityPolicy { message PodSecurityPolicy {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -685,8 +661,6 @@ message PodSecurityPolicy {
// Pod Security Policy List is a list of PodSecurityPolicy objects. // Pod Security Policy List is a list of PodSecurityPolicy objects.
message PodSecurityPolicyList { message PodSecurityPolicyList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -763,8 +737,6 @@ message PodSecurityPolicySpec {
// ReplicaSet represents the configuration of a ReplicaSet. // ReplicaSet represents the configuration of a ReplicaSet.
message ReplicaSet { message ReplicaSet {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// If the Labels of a ReplicaSet are empty, they are defaulted to // If the Labels of a ReplicaSet are empty, they are defaulted to
// be the same as the Pod(s) that the ReplicaSet manages. // be the same as the Pod(s) that the ReplicaSet manages.
// Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
@ -808,8 +780,6 @@ message ReplicaSetCondition {
// ReplicaSetList is a collection of ReplicaSets. // ReplicaSetList is a collection of ReplicaSets.
message ReplicaSetList { message ReplicaSetList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
@ -878,7 +848,6 @@ message ReplicaSetStatus {
// Dummy definition // Dummy definition
message ReplicationControllerDummy { message ReplicationControllerDummy {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 1;
} }
message RollbackConfig { message RollbackConfig {
@ -940,8 +909,6 @@ message SELinuxStrategyOptions {
// represents a scaling request for a resource. // represents a scaling request for a resource.
message Scale { message Scale {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata. // Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
@ -1015,8 +982,6 @@ message SupplementalGroupsStrategyOptions {
// A ThirdPartyResource is a generic representation of a resource, it is used by add-ons and plugins to add new resource // A ThirdPartyResource is a generic representation of a resource, it is used by add-ons and plugins to add new resource
// types to the API. It consists of one or more Versions of the api. // types to the API. It consists of one or more Versions of the api.
message ThirdPartyResource { message ThirdPartyResource {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object metadata // Standard object metadata
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
@ -1032,8 +997,6 @@ message ThirdPartyResource {
// An internal object, used for versioned storage in etcd. Not exposed to the end user. // An internal object, used for versioned storage in etcd. Not exposed to the end user.
message ThirdPartyResourceData { message ThirdPartyResourceData {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard object metadata. // Standard object metadata.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
@ -1045,8 +1008,6 @@ message ThirdPartyResourceData {
// ThirdPartyResrouceDataList is a list of ThirdPartyResourceData. // ThirdPartyResrouceDataList is a list of ThirdPartyResourceData.
message ThirdPartyResourceDataList { message ThirdPartyResourceDataList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata // Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -1058,8 +1019,6 @@ message ThirdPartyResourceDataList {
// ThirdPartyResourceList is a list of ThirdPartyResources. // ThirdPartyResourceList is a list of ThirdPartyResources.
message ThirdPartyResourceList { message ThirdPartyResourceList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// +optional // +optional
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1; optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;

1
pkg/apis/imagepolicy/doc.go
View File

@ -14,6 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +groupName=imagepolicy.k8s.io // +groupName=imagepolicy.k8s.io
package imagepolicy package imagepolicy

5
pkg/apis/imagepolicy/v1alpha1/doc.go
View File

@ -14,10 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/imagepolicy
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta
// +groupName=imagepolicy.k8s.io // +groupName=imagepolicy.k8s.io
package v1alpha1 package v1alpha1

119
pkg/apis/imagepolicy/v1alpha1/generated.pb.go
View File

@ -114,14 +114,6 @@ func (m *ImageReview) MarshalTo(data []byte) (int, error) {
return 0, err return 0, err
} }
i += n3 i += n3
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n4, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n4
return i, nil return i, nil
} }
@ -264,8 +256,6 @@ func (m *ImageReview) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.Status.Size() l = m.Status.Size()
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -329,7 +319,6 @@ func (this *ImageReview) String() string {
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "ImageReviewSpec", "ImageReviewSpec", 1), `&`, ``, 1) + `,`, `Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "ImageReviewSpec", "ImageReviewSpec", 1), `&`, ``, 1) + `,`,
`Status:` + strings.Replace(strings.Replace(this.Status.String(), "ImageReviewStatus", "ImageReviewStatus", 1), `&`, ``, 1) + `,`, `Status:` + strings.Replace(strings.Replace(this.Status.String(), "ImageReviewStatus", "ImageReviewStatus", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -504,36 +493,6 @@ func (m *ImageReview) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -1060,44 +1019,42 @@ var (
) )
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 622 bytes of a gzipped FileDescriptorProto // 588 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x92, 0xbf, 0x6f, 0xd3, 0x40, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x92, 0xbf, 0x6f, 0x13, 0x31,
0x14, 0xc7, 0xe3, 0xa6, 0x3f, 0x92, 0x0b, 0xd0, 0xf6, 0x60, 0xb0, 0x32, 0xb8, 0x55, 0x90, 0x50, 0x14, 0xc7, 0x73, 0x49, 0x7f, 0xc5, 0x01, 0xda, 0x1a, 0x86, 0x28, 0xc3, 0xb5, 0x0a, 0x12, 0x2a,
0x41, 0x70, 0xa7, 0x54, 0x08, 0x55, 0x0c, 0x94, 0x1a, 0x31, 0x74, 0x00, 0xc4, 0xc1, 0x80, 0x10, 0x08, 0x6c, 0xa5, 0x42, 0xa8, 0x62, 0xa0, 0xf4, 0x10, 0x43, 0x07, 0x40, 0x98, 0x05, 0xb1, 0x39,
0xcb, 0xc5, 0x7d, 0x75, 0xdc, 0xd8, 0x77, 0x96, 0xef, 0x9c, 0x2a, 0x03, 0x12, 0x23, 0x03, 0x03, 0xd7, 0xd7, 0x8b, 0x9b, 0x3b, 0xfb, 0x74, 0xf6, 0xa5, 0xca, 0x80, 0xc4, 0xc8, 0xc0, 0xc0, 0x7f,
0x0b, 0xff, 0x53, 0xc7, 0x8e, 0x4c, 0x15, 0x0d, 0xff, 0x08, 0xf2, 0xd9, 0xae, 0x4d, 0xd3, 0x08, 0xc3, 0xbf, 0xd0, 0xb1, 0x23, 0x53, 0x45, 0xc3, 0x3f, 0x82, 0xce, 0x77, 0xe9, 0x1d, 0x4d, 0x23,
0xa1, 0x6e, 0xbe, 0xf7, 0xfc, 0xfd, 0x7c, 0xbf, 0xf7, 0xee, 0xa1, 0xdd, 0xd1, 0x8e, 0x22, 0x81, 0x84, 0xb2, 0xf9, 0xf9, 0xf9, 0x7d, 0xbe, 0x5f, 0xbf, 0xf7, 0xd0, 0xfe, 0x70, 0x4f, 0x13, 0xa1,
0xa4, 0xa3, 0x74, 0x00, 0x89, 0x00, 0x0d, 0x8a, 0xc6, 0x23, 0x9f, 0xf2, 0x38, 0x50, 0x34, 0x88, 0xe8, 0x30, 0xed, 0x43, 0x22, 0xc1, 0x80, 0xa6, 0xf1, 0x30, 0xa0, 0x3c, 0x16, 0x9a, 0x8a, 0x88,
0xb8, 0x0f, 0xb1, 0x0c, 0x03, 0x6f, 0x42, 0xc7, 0x7d, 0x1e, 0xc6, 0x43, 0xde, 0xa7, 0x3e, 0x08, 0x07, 0x10, 0xab, 0x50, 0xf8, 0x63, 0x3a, 0xea, 0xf1, 0x30, 0x1e, 0xf0, 0x1e, 0x0d, 0x40, 0x42,
0x48, 0xb8, 0x86, 0x03, 0x12, 0x27, 0x52, 0x4b, 0x4c, 0x73, 0x00, 0xa9, 0x00, 0x24, 0x1e, 0xf9, 0xc2, 0x0d, 0x1c, 0x91, 0x38, 0x51, 0x46, 0x61, 0x9a, 0x03, 0x48, 0x09, 0x20, 0xf1, 0x30, 0x20,
0x24, 0x03, 0x90, 0x1a, 0x80, 0x94, 0x80, 0xee, 0x23, 0x3f, 0xd0, 0xc3, 0x74, 0x40, 0x3c, 0x19, 0x19, 0x80, 0x54, 0x00, 0x64, 0x0a, 0xe8, 0x3c, 0x09, 0x84, 0x19, 0xa4, 0x7d, 0xe2, 0xab, 0x88,
0x51, 0x5f, 0xfa, 0x92, 0x1a, 0xce, 0x20, 0x3d, 0x34, 0x27, 0x73, 0x30, 0x5f, 0x39, 0xbf, 0xfb, 0x06, 0x2a, 0x50, 0xd4, 0x72, 0xfa, 0xe9, 0xb1, 0x8d, 0x6c, 0x60, 0x4f, 0x39, 0xbf, 0xf3, 0xb4,
0xb8, 0x08, 0xc8, 0xe3, 0x20, 0xe2, 0xde, 0x30, 0x10, 0x90, 0x4c, 0xaa, 0x88, 0x11, 0x68, 0x4e, 0x30, 0xc8, 0x63, 0x11, 0x71, 0x7f, 0x20, 0x24, 0x24, 0xe3, 0xd2, 0x62, 0x04, 0x86, 0xd3, 0xd1,
0xc7, 0x33, 0xa9, 0xba, 0x74, 0x9e, 0x2a, 0x49, 0x85, 0x0e, 0x22, 0x98, 0x11, 0x3c, 0xf9, 0x97, 0x8c, 0xab, 0x0e, 0x9d, 0x57, 0x95, 0xa4, 0xd2, 0x88, 0x08, 0x66, 0x0a, 0x9e, 0xfd, 0xab, 0x40,
0x40, 0x79, 0x43, 0x88, 0xf8, 0x8c, 0x6e, 0x7b, 0xee, 0xfc, 0x68, 0x02, 0x4a, 0xa6, 0x89, 0x37, 0xfb, 0x03, 0x88, 0xf8, 0x4c, 0xdd, 0xee, 0xdc, 0xfe, 0xd1, 0x04, 0xb4, 0x4a, 0x13, 0x7f, 0x56,
0xeb, 0xf5, 0x70, 0xbe, 0xe6, 0x8a, 0xab, 0xf4, 0xaf, 0xfe, 0x3b, 0xd5, 0x41, 0x48, 0x03, 0xa1, 0xeb, 0xf1, 0xfc, 0x9a, 0x1b, 0xbe, 0xd2, 0xbb, 0xf9, 0x75, 0x6a, 0x44, 0x48, 0x85, 0x34, 0xda,
0x95, 0x4e, 0x2e, 0x4b, 0x7a, 0x3f, 0x9a, 0xa8, 0xb3, 0x9f, 0xcd, 0x9e, 0xc1, 0x38, 0x80, 0x63, 0x24, 0xd7, 0x4b, 0xba, 0x3f, 0xea, 0xa8, 0x75, 0x98, 0xf5, 0x9e, 0xc1, 0x48, 0xc0, 0x29, 0xfe,
0xfc, 0x01, 0xb5, 0xb2, 0x41, 0x1d, 0x70, 0xcd, 0x6d, 0x6b, 0xd3, 0xda, 0xea, 0x6c, 0x6f, 0x91, 0x88, 0xd6, 0xb2, 0x46, 0x1d, 0x71, 0xc3, 0xdb, 0xce, 0xb6, 0xb3, 0xd3, 0xda, 0xdd, 0x21, 0x73,
0xb9, 0xcf, 0x46, 0xc6, 0x7d, 0xf2, 0x66, 0x70, 0x04, 0x9e, 0x7e, 0x05, 0x9a, 0xbb, 0xf8, 0xe4, 0xc7, 0x46, 0x46, 0x3d, 0xf2, 0xae, 0x7f, 0x02, 0xbe, 0x79, 0x03, 0x86, 0x7b, 0xf8, 0xec, 0x62,
0x6c, 0xa3, 0x31, 0x3d, 0xdb, 0x40, 0x55, 0x8d, 0x5d, 0xd0, 0xf0, 0x00, 0x2d, 0xaa, 0x18, 0x3c, 0xab, 0x36, 0xb9, 0xd8, 0x42, 0xe5, 0x1d, 0xbb, 0xa2, 0xe1, 0x3e, 0x5a, 0xd2, 0x31, 0xf8, 0xed,
0x7b, 0xc1, 0x50, 0x9f, 0x93, 0xff, 0x5c, 0x06, 0x52, 0x4b, 0xf9, 0x2e, 0x06, 0xcf, 0xbd, 0x51, 0xba, 0xa5, 0xbe, 0x24, 0xff, 0xb9, 0x0c, 0xa4, 0xe2, 0xf2, 0x43, 0x0c, 0xbe, 0x77, 0xab, 0x50,
0xb8, 0x2d, 0x66, 0x27, 0x66, 0xd8, 0xf8, 0x08, 0x2d, 0x2b, 0xcd, 0x75, 0xaa, 0xec, 0xa6, 0x71, 0x5b, 0xca, 0x22, 0x66, 0xd9, 0xf8, 0x04, 0xad, 0x68, 0xc3, 0x4d, 0xaa, 0xdb, 0x0d, 0xab, 0xe2,
0x71, 0xaf, 0xe5, 0x62, 0x48, 0xee, 0xad, 0xc2, 0x67, 0x39, 0x3f, 0xb3, 0xc2, 0x01, 0x7f, 0x42, 0x2d, 0xa4, 0x62, 0x49, 0xde, 0x9d, 0x42, 0x67, 0x25, 0x8f, 0x59, 0xa1, 0xd0, 0xdd, 0x47, 0xed,
0x2d, 0x3d, 0x89, 0x21, 0xbb, 0xa5, 0xbd, 0x68, 0xdc, 0x48, 0xe9, 0x56, 0xdf, 0x8c, 0xca, 0x2f, 0xca, 0xe3, 0x57, 0x4a, 0x1a, 0x9e, 0xad, 0x42, 0xe6, 0x06, 0xdf, 0x47, 0xcb, 0x96, 0x6e, 0x5b,
0x9b, 0x44, 0x36, 0xb1, 0xf7, 0x85, 0xca, 0x5d, 0x2b, 0xc8, 0xad, 0xb2, 0xc2, 0x2e, 0x88, 0xbd, 0xd8, 0xf4, 0x6e, 0x17, 0x88, 0xe5, 0xbc, 0x20, 0xcf, 0x75, 0xbf, 0x35, 0xd0, 0xfa, 0xb5, 0x4f,
0x5d, 0x64, 0xd7, 0xa2, 0xbc, 0x90, 0x42, 0xf3, 0x0c, 0x97, 0xdd, 0x15, 0xdf, 0x45, 0x4b, 0x26, 0xe1, 0xcf, 0x08, 0xf9, 0x53, 0x92, 0x6e, 0x3b, 0xdb, 0x8d, 0x9d, 0xd6, 0xee, 0xe1, 0x22, 0x9f,
0xbb, 0x79, 0xa0, 0xb6, 0x7b, 0xb3, 0xc0, 0x2c, 0xe5, 0x82, 0xbc, 0xd7, 0xfb, 0xd6, 0x44, 0xab, 0xf8, 0xcb, 0x57, 0x39, 0xa1, 0xab, 0x6b, 0xcd, 0x2a, 0x82, 0xf8, 0xab, 0x83, 0x5a, 0x5c, 0x4a,
0x97, 0x46, 0x86, 0x3f, 0x23, 0xe4, 0x95, 0x24, 0x65, 0x5b, 0x9b, 0xcd, 0xad, 0xce, 0xf6, 0xfe, 0x65, 0xb8, 0x11, 0x4a, 0xea, 0x76, 0xdd, 0x1a, 0x78, 0xbf, 0xe8, 0xac, 0xc8, 0x41, 0xc9, 0x7c,
0x75, 0x46, 0xf4, 0x57, 0xae, 0xea, 0xfd, 0x2f, 0xca, 0x8a, 0xd5, 0x0c, 0xf1, 0x57, 0x0b, 0x75, 0x2d, 0x4d, 0x32, 0xf6, 0xee, 0x16, 0x46, 0x5a, 0x95, 0x0c, 0xab, 0x4a, 0x63, 0x8a, 0x9a, 0x92,
0xb8, 0x10, 0x52, 0x73, 0x1d, 0x48, 0xa1, 0xec, 0x05, 0x13, 0xe0, 0xed, 0x75, 0x37, 0x81, 0xec, 0x47, 0xa0, 0x63, 0xee, 0x83, 0x9d, 0x66, 0xd3, 0xdb, 0x2c, 0x8a, 0x9a, 0x6f, 0xa7, 0x09, 0x56,
0x55, 0xcc, 0x97, 0x42, 0x27, 0x13, 0xf7, 0x76, 0x11, 0xa4, 0x53, 0xeb, 0xb0, 0xba, 0x35, 0xa6, 0xbe, 0xe9, 0xbc, 0x40, 0x1b, 0xd7, 0x65, 0xf0, 0x06, 0x6a, 0x0c, 0x61, 0x9c, 0x4f, 0x81, 0x65,
0xa8, 0x2d, 0x78, 0x04, 0x2a, 0xe6, 0x1e, 0x98, 0x5d, 0x69, 0xbb, 0xeb, 0x85, 0xa8, 0xfd, 0xba, 0x47, 0x7c, 0x0f, 0x2d, 0x8f, 0x78, 0x98, 0x82, 0x5d, 0xc3, 0x26, 0xcb, 0x83, 0xe7, 0xf5, 0x3d,
0x6c, 0xb0, 0xea, 0x9f, 0xee, 0x33, 0xb4, 0x76, 0xd9, 0x06, 0xaf, 0xa1, 0xe6, 0x08, 0x26, 0xf9, 0xa7, 0x7b, 0x8c, 0x36, 0x67, 0x86, 0x8f, 0x1f, 0xa2, 0x55, 0x1e, 0x86, 0xea, 0x14, 0x8e, 0x2c,
0x2b, 0xb0, 0xec, 0x13, 0xdf, 0x41, 0x4b, 0x63, 0x1e, 0xa6, 0x60, 0x96, 0xbc, 0xcd, 0xf2, 0xc3, 0x64, 0xcd, 0x5b, 0x2f, 0x3c, 0xac, 0x1e, 0xe4, 0xd7, 0x6c, 0x9a, 0xc7, 0x0f, 0xd0, 0x4a, 0x02,
0xd3, 0x85, 0x1d, 0xab, 0x77, 0x88, 0xd6, 0x67, 0x56, 0x0b, 0xdf, 0x47, 0x2b, 0x3c, 0x0c, 0xe5, 0x5c, 0x2b, 0x99, 0xa3, 0xcb, 0xbd, 0x61, 0xf6, 0x96, 0x15, 0x59, 0xef, 0xd1, 0xd9, 0xa5, 0x5b,
0x31, 0x1c, 0x18, 0x48, 0xcb, 0x5d, 0x2d, 0x32, 0xac, 0xec, 0xe5, 0x65, 0x56, 0xf6, 0xf1, 0x3d, 0x3b, 0xbf, 0x74, 0x6b, 0x3f, 0x2f, 0xdd, 0xda, 0x97, 0x89, 0xeb, 0x9c, 0x4d, 0x5c, 0xe7, 0x7c,
0xb4, 0x9c, 0x00, 0x57, 0x52, 0xe4, 0xe8, 0x6a, 0x2b, 0x99, 0xa9, 0xb2, 0xa2, 0xeb, 0x3e, 0x38, 0xe2, 0x3a, 0xbf, 0x26, 0xae, 0xf3, 0xfd, 0xb7, 0x5b, 0xfb, 0xb4, 0x36, 0xed, 0xe3, 0x9f, 0x00,
0x39, 0x77, 0x1a, 0xa7, 0xe7, 0x4e, 0xe3, 0xe7, 0xb9, 0xd3, 0xf8, 0x32, 0x75, 0xac, 0x93, 0xa9, 0x00, 0x00, 0xff, 0xff, 0x85, 0x95, 0xf8, 0x16, 0x73, 0x05, 0x00, 0x00,
0x63, 0x9d, 0x4e, 0x1d, 0xeb, 0xd7, 0xd4, 0xb1, 0xbe, 0xff, 0x76, 0x1a, 0x1f, 0x5b, 0xe5, 0x1c,
0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x46, 0xf3, 0x4f, 0x24, 0xd1, 0x05, 0x00, 0x00,
} }

2
pkg/apis/imagepolicy/v1alpha1/generated.proto
View File

@ -33,8 +33,6 @@ option go_package = "v1alpha1";
// ImageReview checks if the set of images in a pod are allowed. // ImageReview checks if the set of images in a pod are allowed.
message ImageReview { message ImageReview {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;

1
pkg/apis/kubeadm/v1alpha1/doc.go
View File

@ -14,6 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:defaulter-gen=TypeMeta
// +groupName=kubeadm.k8s.io // +groupName=kubeadm.k8s.io
package v1alpha1 package v1alpha1

2
pkg/apis/policy/doc.go
View File

@ -14,6 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
package policy package policy

4
pkg/apis/policy/v1beta1/doc.go
View File

@ -14,11 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/policy
// Package policy is for any kind of policy object. Suitable examples, even if // Package policy is for any kind of policy object. Suitable examples, even if
// they aren't all here, are PodDisruptionBudget, PodSecurityPolicy, // they aren't all here, are PodDisruptionBudget, PodSecurityPolicy,
// NetworkPolicy, etc. // NetworkPolicy, etc.
// +k8s:openapi-gen=true
package v1beta1 package v1beta1

265
pkg/apis/policy/v1beta1/generated.pb.go
View File

@ -118,14 +118,6 @@ func (m *Eviction) MarshalTo(data []byte) (int, error) {
} }
i += n2 i += n2
} }
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n3, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n3
return i, nil return i, nil
} }
@ -147,35 +139,27 @@ func (m *PodDisruptionBudget) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size()))
n4, err := m.ObjectMeta.MarshalTo(data[i:]) n3, err := m.ObjectMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n3
data[i] = 0x12
i++
i = encodeVarintGenerated(data, i, uint64(m.Spec.Size()))
n4, err := m.Spec.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n4 i += n4
data[i] = 0x12 data[i] = 0x1a
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.Spec.Size())) i = encodeVarintGenerated(data, i, uint64(m.Status.Size()))
n5, err := m.Spec.MarshalTo(data[i:]) n5, err := m.Status.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n5 i += n5
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.Status.Size()))
n6, err := m.Status.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n6
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n7, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n7
return i, nil return i, nil
} }
@ -197,11 +181,11 @@ func (m *PodDisruptionBudgetList) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size()))
n8, err := m.ListMeta.MarshalTo(data[i:]) n6, err := m.ListMeta.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n8 i += n6
if len(m.Items) > 0 { if len(m.Items) > 0 {
for _, msg := range m.Items { for _, msg := range m.Items {
data[i] = 0x12 data[i] = 0x12
@ -214,14 +198,6 @@ func (m *PodDisruptionBudgetList) MarshalTo(data []byte) (int, error) {
i += n i += n
} }
} }
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n9, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n9
return i, nil return i, nil
} }
@ -243,20 +219,20 @@ func (m *PodDisruptionBudgetSpec) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.MinAvailable.Size())) i = encodeVarintGenerated(data, i, uint64(m.MinAvailable.Size()))
n10, err := m.MinAvailable.MarshalTo(data[i:]) n7, err := m.MinAvailable.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n10 i += n7
if m.Selector != nil { if m.Selector != nil {
data[i] = 0x12 data[i] = 0x12
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.Selector.Size())) i = encodeVarintGenerated(data, i, uint64(m.Selector.Size()))
n11, err := m.Selector.MarshalTo(data[i:]) n8, err := m.Selector.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n11 i += n8
} }
return i, nil return i, nil
} }
@ -294,11 +270,11 @@ func (m *PodDisruptionBudgetStatus) MarshalTo(data []byte) (int, error) {
data[i] = 0x12 data[i] = 0x12
i++ i++
i = encodeVarintGenerated(data, i, uint64((&v).Size())) i = encodeVarintGenerated(data, i, uint64((&v).Size()))
n12, err := (&v).MarshalTo(data[i:]) n9, err := (&v).MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n12 i += n9
} }
} }
data[i] = 0x18 data[i] = 0x18
@ -352,8 +328,6 @@ func (m *Eviction) Size() (n int) {
l = m.DeleteOptions.Size() l = m.DeleteOptions.Size()
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
} }
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -366,8 +340,6 @@ func (m *PodDisruptionBudget) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.Status.Size() l = m.Status.Size()
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -382,8 +354,6 @@ func (m *PodDisruptionBudgetList) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
} }
} }
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -439,7 +409,6 @@ func (this *Eviction) String() string {
s := strings.Join([]string{`&Eviction{`, s := strings.Join([]string{`&Eviction{`,
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`DeleteOptions:` + strings.Replace(fmt.Sprintf("%v", this.DeleteOptions), "DeleteOptions", "k8s_io_kubernetes_pkg_api_v1.DeleteOptions", 1) + `,`, `DeleteOptions:` + strings.Replace(fmt.Sprintf("%v", this.DeleteOptions), "DeleteOptions", "k8s_io_kubernetes_pkg_api_v1.DeleteOptions", 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -452,7 +421,6 @@ func (this *PodDisruptionBudget) String() string {
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "PodDisruptionBudgetSpec", "PodDisruptionBudgetSpec", 1), `&`, ``, 1) + `,`, `Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "PodDisruptionBudgetSpec", "PodDisruptionBudgetSpec", 1), `&`, ``, 1) + `,`,
`Status:` + strings.Replace(strings.Replace(this.Status.String(), "PodDisruptionBudgetStatus", "PodDisruptionBudgetStatus", 1), `&`, ``, 1) + `,`, `Status:` + strings.Replace(strings.Replace(this.Status.String(), "PodDisruptionBudgetStatus", "PodDisruptionBudgetStatus", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -464,7 +432,6 @@ func (this *PodDisruptionBudgetList) String() string {
s := strings.Join([]string{`&PodDisruptionBudgetList{`, s := strings.Join([]string{`&PodDisruptionBudgetList{`,
`ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`,
`Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "PodDisruptionBudget", "PodDisruptionBudget", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "PodDisruptionBudget", "PodDisruptionBudget", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -605,36 +572,6 @@ func (m *Eviction) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -775,36 +712,6 @@ func (m *PodDisruptionBudget) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -916,36 +823,6 @@ func (m *PodDisruptionBudgetList) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -1447,56 +1324,54 @@ var (
) )
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 808 bytes of a gzipped FileDescriptorProto // 777 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x94, 0xcd, 0x6e, 0x23, 0x45, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x94, 0x4d, 0x6f, 0xe3, 0x44,
0x10, 0xc7, 0x3d, 0x71, 0x1c, 0x4c, 0xaf, 0x1d, 0x2d, 0x0d, 0x0b, 0xc1, 0x12, 0x13, 0x94, 0x53, 0x18, 0xc7, 0xe3, 0x26, 0x29, 0x61, 0x9a, 0x54, 0x65, 0xa0, 0x10, 0x22, 0xe1, 0xa2, 0x9c, 0x5a,
0x96, 0x8f, 0x1e, 0x39, 0x20, 0x14, 0x38, 0xac, 0xd8, 0xc1, 0x11, 0x2c, 0x22, 0xf2, 0xaa, 0x83, 0x5e, 0xc6, 0x4a, 0x41, 0xa8, 0x70, 0xa8, 0xa8, 0x49, 0x05, 0x45, 0x54, 0xa9, 0x5c, 0x24, 0x10,
0x04, 0x42, 0x70, 0xe8, 0x99, 0x29, 0xc6, 0x8d, 0xe7, 0x4b, 0xdd, 0x3d, 0x06, 0xdf, 0x78, 0x04, 0x82, 0xc3, 0xd8, 0x7e, 0x70, 0x86, 0xf8, 0x4d, 0x33, 0xe3, 0x40, 0x6e, 0x7c, 0x84, 0x3d, 0xec,
0x0e, 0xbc, 0x00, 0x37, 0x9e, 0x81, 0x27, 0xc8, 0x71, 0x8f, 0x9c, 0x22, 0x62, 0x9e, 0x81, 0x3b, 0x37, 0xda, 0x4b, 0xb5, 0xa7, 0x1e, 0xf7, 0xb0, 0xaa, 0xb6, 0xd9, 0xcf, 0xb0, 0xf7, 0x95, 0xed,
0xea, 0x99, 0x1e, 0xdb, 0xe3, 0x0f, 0xb0, 0xb4, 0xbb, 0xb7, 0xe9, 0xee, 0xfa, 0xfd, 0xff, 0xd5, 0xc9, 0x8b, 0xf3, 0xb2, 0x5b, 0xa9, 0xbb, 0x37, 0xcf, 0xcc, 0xf3, 0xfb, 0xff, 0x9f, 0xe7, 0x99,
0x55, 0xd5, 0x83, 0x3e, 0x1c, 0x9f, 0x4b, 0xc2, 0x53, 0x67, 0x9c, 0x7b, 0x20, 0x12, 0x50, 0x20, 0x67, 0x8c, 0xbe, 0x1d, 0x1c, 0x09, 0xc2, 0x22, 0x63, 0x90, 0xd8, 0xc0, 0x43, 0x90, 0x20, 0x8c,
0x9d, 0x6c, 0x1c, 0x3a, 0x2c, 0xe3, 0xd2, 0xc9, 0xd2, 0x88, 0xfb, 0x53, 0x67, 0xd2, 0xf7, 0x40, 0x78, 0xe0, 0x19, 0x34, 0x66, 0xc2, 0x88, 0x23, 0x9f, 0x39, 0x23, 0x63, 0xd8, 0xb1, 0x41, 0xd2,
0xb1, 0xbe, 0x13, 0x42, 0x02, 0x82, 0x29, 0x08, 0x48, 0x26, 0x52, 0x95, 0xe2, 0xfb, 0x25, 0x4a, 0x8e, 0xe1, 0x41, 0x08, 0x9c, 0x4a, 0x70, 0x49, 0xcc, 0x23, 0x19, 0xe1, 0x83, 0x1c, 0x25, 0x33,
0x16, 0x28, 0xc9, 0xc6, 0x21, 0xd1, 0x28, 0x29, 0x51, 0x62, 0xd0, 0xde, 0xbb, 0x21, 0x57, 0xa3, 0x94, 0xc4, 0x03, 0x8f, 0xa4, 0x28, 0xc9, 0x51, 0xa2, 0xd0, 0xd6, 0x97, 0x1e, 0x93, 0xfd, 0xc4,
0xdc, 0x23, 0x7e, 0x1a, 0x3b, 0x61, 0x1a, 0xa6, 0x4e, 0xa1, 0xe0, 0xe5, 0xdf, 0x17, 0xab, 0x62, 0x26, 0x4e, 0x14, 0x18, 0x5e, 0xe4, 0x45, 0x46, 0xa6, 0x60, 0x27, 0x7f, 0x67, 0xab, 0x6c, 0x91,
0x51, 0x7c, 0x95, 0xca, 0xbd, 0xf7, 0x4d, 0x52, 0x2c, 0xe3, 0x31, 0xf3, 0x47, 0x3c, 0x01, 0x31, 0x7d, 0xe5, 0xca, 0xad, 0xaf, 0x55, 0x52, 0x34, 0x66, 0x01, 0x75, 0xfa, 0x2c, 0x04, 0x3e, 0x9a,
0x5d, 0xa4, 0x15, 0x83, 0x62, 0xce, 0x64, 0x2d, 0x9f, 0x9e, 0xb3, 0x8d, 0x12, 0x79, 0xa2, 0x78, 0xa5, 0x15, 0x80, 0xa4, 0xc6, 0x70, 0x29, 0x9f, 0x96, 0xb1, 0x8e, 0xe2, 0x49, 0x28, 0x59, 0x00,
0x0c, 0x6b, 0xc0, 0x07, 0xff, 0x07, 0x48, 0x7f, 0x04, 0x31, 0x5b, 0xe3, 0xce, 0xb6, 0xd6, 0xcc, 0x4b, 0xc0, 0x37, 0xaf, 0x03, 0x84, 0xd3, 0x87, 0x80, 0x2e, 0x71, 0x87, 0x6b, 0x7b, 0x66, 0x70,
0x11, 0x20, 0xd3, 0x5c, 0xf8, 0xeb, 0x5e, 0xef, 0x6c, 0x67, 0x36, 0x5c, 0xa5, 0xbf, 0x39, 0x3a, 0x10, 0x51, 0xc2, 0x9d, 0x65, 0xaf, 0x2f, 0xd6, 0x33, 0x2b, 0x4a, 0xe9, 0xac, 0x8e, 0x4e, 0x24,
0x57, 0x3c, 0x72, 0x78, 0xa2, 0xa4, 0x12, 0xab, 0xc8, 0xc9, 0xef, 0x7b, 0xa8, 0x7d, 0x31, 0xe1, 0xf3, 0x0d, 0x16, 0x4a, 0x21, 0xf9, 0x22, 0xd2, 0x7e, 0xac, 0xa1, 0xda, 0xe9, 0x90, 0x39, 0x92,
0xbe, 0xe2, 0x69, 0x82, 0xbf, 0x46, 0x6d, 0x5d, 0xa5, 0x80, 0x29, 0x76, 0x64, 0xbd, 0x69, 0x9d, 0x45, 0x21, 0xfe, 0x1d, 0xd5, 0xd2, 0x2e, 0xb9, 0x54, 0xd2, 0xa6, 0xf6, 0xa9, 0xb6, 0xbf, 0x75,
0xde, 0x39, 0x3b, 0x25, 0x5b, 0xbb, 0x45, 0x26, 0x7d, 0x32, 0xf4, 0x7e, 0x00, 0x5f, 0x5d, 0x82, 0xb8, 0x4f, 0xd6, 0xde, 0x16, 0x19, 0x76, 0x48, 0xcf, 0xfe, 0x07, 0x1c, 0x79, 0x0e, 0x92, 0x9a,
0x62, 0x2e, 0xbe, 0xbe, 0x39, 0x6e, 0xcc, 0x6e, 0x8e, 0xd1, 0x62, 0x8f, 0xce, 0xd5, 0x70, 0x80, 0xf8, 0xea, 0x66, 0xaf, 0x34, 0xbe, 0xd9, 0x43, 0xb3, 0x3d, 0x6b, 0xaa, 0x86, 0x5d, 0xd4, 0x70,
0xba, 0x01, 0x44, 0xa0, 0x60, 0x98, 0x69, 0x27, 0x79, 0xb4, 0x57, 0xc8, 0xbf, 0xfd, 0xdf, 0xf2, 0xc1, 0x07, 0x09, 0xbd, 0x38, 0x75, 0x12, 0xcd, 0x8d, 0x4c, 0xfe, 0xf3, 0x57, 0xcb, 0x77, 0xe7,
0x83, 0x65, 0xc4, 0x7d, 0x69, 0x76, 0x73, 0xdc, 0xad, 0x6d, 0xd1, 0xba, 0x28, 0xfe, 0x16, 0xb5, 0x11, 0xf3, 0xbd, 0xf1, 0xcd, 0x5e, 0xa3, 0xb0, 0x65, 0x15, 0x45, 0xdb, 0x8f, 0x36, 0xd0, 0xfb,
0xd5, 0x34, 0x03, 0xed, 0x7d, 0xd4, 0x2c, 0x0c, 0x48, 0x65, 0xb0, 0xdc, 0xac, 0xc5, 0xbc, 0xe9, 0x17, 0x91, 0xdb, 0x65, 0x82, 0x27, 0xd9, 0x96, 0x99, 0xb8, 0x1e, 0xc8, 0xb7, 0x5a, 0x57, 0x45,
0xfc, 0xb4, 0xd1, 0x97, 0x86, 0x72, 0xef, 0x9a, 0x5b, 0xb4, 0xab, 0x1d, 0x3a, 0x57, 0x3c, 0xf9, 0xc4, 0xe0, 0xa8, 0x72, 0x4c, 0x72, 0xe7, 0xd9, 0x26, 0x2b, 0xf2, 0xbc, 0x8c, 0xc1, 0x31, 0xeb,
0xad, 0x89, 0x5e, 0x7e, 0x9c, 0x06, 0x03, 0x2e, 0x45, 0x5e, 0x18, 0xba, 0x79, 0x10, 0x82, 0x7a, 0xca, 0xaf, 0x92, 0xae, 0xac, 0x4c, 0x1d, 0xfb, 0x68, 0x53, 0x48, 0x2a, 0x13, 0xd1, 0x2c, 0x67,
0xae, 0x55, 0xdb, 0x97, 0x19, 0xf8, 0xa6, 0x58, 0x2e, 0xd9, 0xf9, 0xe5, 0x90, 0x0d, 0x79, 0x5e, 0x3e, 0xdd, 0x7b, 0xfa, 0x64, 0x5a, 0xe6, 0xb6, 0x72, 0xda, 0xcc, 0xd7, 0x96, 0xf2, 0x68, 0x3f,
0x65, 0xe0, 0xbb, 0x1d, 0xe3, 0xb7, 0xaf, 0x57, 0xb4, 0x50, 0xc7, 0x11, 0x3a, 0x90, 0x8a, 0xa9, 0xd5, 0xd0, 0x47, 0x2b, 0xa8, 0x5f, 0x98, 0x90, 0xf8, 0xcf, 0xa5, 0x4e, 0x92, 0x49, 0x2e, 0xf3,
0x5c, 0x9a, 0x9a, 0x0d, 0x9e, 0xd2, 0xa7, 0xd0, 0x72, 0x0f, 0x8d, 0xd3, 0x41, 0xb9, 0xa6, 0xc6, 0xcf, 0x61, 0x96, 0x4d, 0x1a, 0x9d, 0x76, 0x34, 0xa5, 0xb3, 0x7e, 0xee, 0x28, 0xd7, 0xda, 0x64,
0xa3, 0xd6, 0xa3, 0xfd, 0x67, 0xde, 0xa3, 0x3f, 0xf6, 0xd0, 0x6b, 0x1b, 0x72, 0xfa, 0x82, 0x4b, 0x67, 0xae, 0x9b, 0x0e, 0xaa, 0x32, 0x09, 0x41, 0x3a, 0x1d, 0xe5, 0xfd, 0xad, 0xc3, 0xe3, 0xfb,
0xa5, 0x9d, 0x57, 0xfa, 0xb4, 0xa3, 0xb3, 0xa6, 0xeb, 0xce, 0xd5, 0xce, 0x52, 0xaf, 0x7c, 0xd4, 0x95, 0x69, 0x36, 0x94, 0x55, 0xf5, 0x2c, 0x15, 0xb5, 0x72, 0xed, 0xf6, 0x78, 0x75, 0x79, 0x69,
0xe2, 0x0a, 0x62, 0x3d, 0xd9, 0xcd, 0xd3, 0x3b, 0x67, 0x0f, 0x9e, 0xae, 0x88, 0x6e, 0xd7, 0x58, 0xbb, 0x71, 0x1f, 0xd5, 0x03, 0x16, 0x9e, 0x0c, 0x29, 0xf3, 0xa9, 0xed, 0xc3, 0x62, 0x89, 0x0b,
0xb5, 0x1e, 0x69, 0x51, 0x5a, 0x6a, 0x3f, 0xe7, 0x01, 0x9f, 0x59, 0x1b, 0x8b, 0xa7, 0x47, 0x05, 0x79, 0xa4, 0xef, 0x8a, 0xe4, 0xef, 0x8a, 0x9c, 0x85, 0xb2, 0xc7, 0x2f, 0x25, 0x67, 0xa1, 0x67,
0x8f, 0x50, 0x27, 0xe6, 0xc9, 0xc3, 0x09, 0xe3, 0x11, 0xf3, 0x22, 0x58, 0x2d, 0xe0, 0xca, 0x2d, 0x7e, 0xa0, 0x7c, 0xeb, 0xe7, 0x73, 0x5a, 0x56, 0x41, 0x19, 0xff, 0x85, 0x6a, 0x02, 0x7c, 0x70,
0xf5, 0x1f, 0x87, 0x94, 0x7f, 0x1c, 0xf2, 0x28, 0x51, 0x43, 0x71, 0xa5, 0x04, 0x4f, 0x42, 0xf7, 0x64, 0xc4, 0xd5, 0xf0, 0x7c, 0x75, 0xc7, 0x46, 0x52, 0x1b, 0xfc, 0x4b, 0x85, 0x9a, 0xf5, 0xb4,
0x15, 0xe3, 0xde, 0xb9, 0x5c, 0xd2, 0xa2, 0x35, 0x65, 0xfc, 0x1d, 0x6a, 0x4b, 0x88, 0xc0, 0x57, 0x93, 0x93, 0x95, 0x35, 0x95, 0x6c, 0xbf, 0xa8, 0xa0, 0x8f, 0xd7, 0xde, 0x3c, 0xfe, 0x19, 0xe1,
0xa9, 0x30, 0x83, 0xff, 0xde, 0x8e, 0x6d, 0x62, 0x1e, 0x44, 0x57, 0x06, 0x75, 0x3b, 0xfa, 0x92, 0xc8, 0x16, 0xc0, 0x87, 0xe0, 0xfe, 0x98, 0xff, 0x0f, 0x58, 0x14, 0x66, 0xc5, 0x96, 0xcd, 0x96,
0xd5, 0x8a, 0xce, 0x25, 0x4f, 0xfe, 0xd9, 0x47, 0xaf, 0x6f, 0x9d, 0x5a, 0xfc, 0x39, 0xc2, 0xa9, 0x4a, 0x1e, 0xf7, 0x96, 0x22, 0xac, 0x15, 0x14, 0x7e, 0xa8, 0xa1, 0x86, 0x9b, 0xdb, 0x80, 0x7b,
0x27, 0x41, 0x4c, 0x20, 0xf8, 0xb4, 0xfc, 0x53, 0xf2, 0x34, 0x29, 0x2e, 0xdb, 0x74, 0x7b, 0x26, 0x11, 0xb9, 0x93, 0xcb, 0xfb, 0xed, 0x4d, 0xcc, 0x28, 0xe9, 0xce, 0x2b, 0x9f, 0x86, 0x92, 0x8f,
0x79, 0x3c, 0x5c, 0x8b, 0xa0, 0x1b, 0x28, 0xfc, 0xab, 0x85, 0xba, 0x41, 0x69, 0x03, 0xc1, 0xe3, 0xcc, 0x5d, 0x95, 0x60, 0xa3, 0x70, 0x66, 0x15, 0x93, 0xc0, 0xe7, 0x08, 0xbb, 0x53, 0x49, 0x71,
0x34, 0xa8, 0x46, 0xe3, 0xab, 0x67, 0xf1, 0xbe, 0xc8, 0x60, 0x59, 0xf9, 0x22, 0x51, 0x62, 0xea, 0xe2, 0xfb, 0xd1, 0xbf, 0xe0, 0x66, 0xcf, 0xa7, 0x6a, 0x7e, 0xa2, 0x14, 0x76, 0x0b, 0xbe, 0x93,
0xde, 0x33, 0x09, 0x76, 0x6b, 0x67, 0xb4, 0x9e, 0x04, 0xbe, 0x44, 0x38, 0x98, 0x4b, 0xca, 0x87, 0x20, 0x6b, 0x05, 0x88, 0x8f, 0xd1, 0xb6, 0x93, 0x70, 0x0e, 0xa1, 0xfc, 0x09, 0xa8, 0x2f, 0xfb,
0x51, 0x94, 0xfe, 0x08, 0x41, 0x31, 0x4d, 0x2d, 0xf7, 0x0d, 0xa3, 0x70, 0xaf, 0xe6, 0x5b, 0x05, 0xa3, 0x66, 0x25, 0x93, 0xfa, 0x50, 0x49, 0x6d, 0xff, 0x50, 0x38, 0xb5, 0x16, 0xa2, 0x53, 0xde,
0xd1, 0x0d, 0x20, 0x7e, 0x80, 0x0e, 0xfd, 0x5c, 0x08, 0x48, 0xd4, 0x67, 0xc0, 0x22, 0x35, 0x9a, 0x05, 0xc1, 0x38, 0xb8, 0x13, 0xbe, 0x5a, 0xe4, 0xbb, 0x85, 0x53, 0x6b, 0x21, 0x1a, 0x1f, 0xa1,
0x16, 0xaf, 0xba, 0xe5, 0xbe, 0x6a, 0xa4, 0x0e, 0x3f, 0xa9, 0x9d, 0xd2, 0x95, 0x68, 0xcd, 0x07, 0x3a, 0xfc, 0x17, 0x83, 0x33, 0xe9, 0xf1, 0x66, 0x46, 0x4f, 0x07, 0xed, 0x74, 0xee, 0xcc, 0x2a,
0x20, 0xb9, 0x80, 0xa0, 0xe2, 0x5b, 0x75, 0x7e, 0x50, 0x3b, 0xa5, 0x2b, 0xd1, 0xf8, 0x1c, 0x75, 0x44, 0xb6, 0x7c, 0x84, 0x97, 0x9b, 0x88, 0x77, 0x50, 0x79, 0x00, 0xa3, 0xec, 0xca, 0xdf, 0xb5,
0xe0, 0xa7, 0x0c, 0xfc, 0xaa, 0xc6, 0x07, 0x05, 0x3d, 0x1f, 0xb4, 0x8b, 0xa5, 0x33, 0x5a, 0x8b, 0xd2, 0x4f, 0xfc, 0x3d, 0xaa, 0x0e, 0xa9, 0x9f, 0x80, 0x9a, 0xc6, 0xcf, 0xee, 0x36, 0x8d, 0xbf,
0xec, 0x45, 0x08, 0xaf, 0x17, 0x11, 0xdf, 0x45, 0xcd, 0x31, 0x4c, 0x8b, 0x96, 0xbf, 0x48, 0xf5, 0xb2, 0x00, 0xac, 0x1c, 0xfc, 0x6e, 0xe3, 0x48, 0x33, 0x0f, 0xae, 0x6e, 0xf5, 0xd2, 0xf5, 0xad,
0x27, 0xfe, 0x18, 0xb5, 0x26, 0x2c, 0xca, 0xc1, 0x4c, 0xe3, 0x5b, 0x3b, 0xbe, 0x38, 0x1e, 0x03, 0x5e, 0x7a, 0x72, 0xab, 0x97, 0xfe, 0x1f, 0xeb, 0xda, 0xd5, 0x58, 0xd7, 0xae, 0xc7, 0xba, 0xf6,
0x2d, 0xc1, 0x8f, 0xf6, 0xce, 0x2d, 0xf7, 0xfe, 0xf5, 0xad, 0xdd, 0x78, 0x72, 0x6b, 0x37, 0xfe, 0x6c, 0xac, 0x6b, 0x0f, 0x9e, 0xeb, 0xa5, 0x3f, 0xde, 0x51, 0x97, 0xfe, 0x32, 0x00, 0x00, 0xff,
0xbc, 0xb5, 0x1b, 0x3f, 0xcf, 0x6c, 0xeb, 0x7a, 0x66, 0x5b, 0x4f, 0x66, 0xb6, 0xf5, 0xd7, 0xcc, 0xff, 0xf9, 0xf8, 0x35, 0x20, 0x43, 0x08, 0x00, 0x00,
0xb6, 0x7e, 0xf9, 0xdb, 0x6e, 0x7c, 0xf3, 0x82, 0x69, 0xfa, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff,
0x82, 0xa3, 0x73, 0x1c, 0x5d, 0x09, 0x00, 0x00,
} }

6
pkg/apis/policy/v1beta1/generated.proto
View File

@ -35,8 +35,6 @@ option go_package = "v1beta1";
// This is a subresource of Pod. A request to cause such an eviction is // This is a subresource of Pod. A request to cause such an eviction is
// created by POSTing to .../pods/<pod name>/evictions. // created by POSTing to .../pods/<pod name>/evictions.
message Eviction { message Eviction {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// ObjectMeta describes the pod that is being evicted. // ObjectMeta describes the pod that is being evicted.
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
@ -46,8 +44,6 @@ message Eviction {
// PodDisruptionBudget is an object to define the max disruption that can be caused to a collection of pods // PodDisruptionBudget is an object to define the max disruption that can be caused to a collection of pods
message PodDisruptionBudget { message PodDisruptionBudget {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
// Specification of the desired behavior of the PodDisruptionBudget. // Specification of the desired behavior of the PodDisruptionBudget.
@ -59,8 +55,6 @@ message PodDisruptionBudget {
// PodDisruptionBudgetList is a collection of PodDisruptionBudgets. // PodDisruptionBudgetList is a collection of PodDisruptionBudgets.
message PodDisruptionBudgetList { message PodDisruptionBudgetList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1; optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
repeated PodDisruptionBudget items = 2; repeated PodDisruptionBudget items = 2;

1
pkg/apis/rbac/doc.go
View File

@ -14,6 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +groupName=rbac.authorization.k8s.io // +groupName=rbac.authorization.k8s.io
package rbac package rbac

2
pkg/apis/rbac/helpers.go
View File

@ -124,7 +124,6 @@ func SubjectsStrings(subjects []Subject) ([]string, []string, []string, []string
return users, groups, sas, others return users, groups, sas, others
} }
// +k8s:deepcopy-gen=false
// PolicyRuleBuilder let's us attach methods. A no-no for API types. // PolicyRuleBuilder let's us attach methods. A no-no for API types.
// We use it to construct rules in code. It's more compact than trying to write them // We use it to construct rules in code. It's more compact than trying to write them
// out in a literal and allows us to perform some basic checking during construction // out in a literal and allows us to perform some basic checking during construction
@ -197,7 +196,6 @@ func (r *PolicyRuleBuilder) Rule() (PolicyRule, error) {
return r.PolicyRule, nil return r.PolicyRule, nil
} }
// +k8s:deepcopy-gen=false
// ClusterRoleBindingBuilder let's us attach methods. A no-no for API types. // ClusterRoleBindingBuilder let's us attach methods. A no-no for API types.
// We use it to construct bindings in code. It's more compact than trying to write them // We use it to construct bindings in code. It's more compact than trying to write them
// out in a literal. // out in a literal.

5
pkg/apis/rbac/v1alpha1/doc.go
View File

@ -14,10 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/rbac
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta
// +groupName=rbac.authorization.k8s.io // +groupName=rbac.authorization.k8s.io
package v1alpha1 package v1alpha1

492
pkg/apis/rbac/v1alpha1/generated.pb.go
View File

@ -163,14 +163,6 @@ func (m *ClusterRole) MarshalTo(data []byte) (int, error) {
i += n i += n
} }
} }
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n2, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n2
return i, nil return i, nil
} }
@ -192,11 +184,11 @@ func (m *ClusterRoleBinding) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size()))
n3, err := m.ObjectMeta.MarshalTo(data[i:]) n2, err := m.ObjectMeta.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n3 i += n2
if len(m.Subjects) > 0 { if len(m.Subjects) > 0 {
for _, msg := range m.Subjects { for _, msg := range m.Subjects {
data[i] = 0x12 data[i] = 0x12
@ -212,19 +204,11 @@ func (m *ClusterRoleBinding) MarshalTo(data []byte) (int, error) {
data[i] = 0x1a data[i] = 0x1a
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.RoleRef.Size())) i = encodeVarintGenerated(data, i, uint64(m.RoleRef.Size()))
n4, err := m.RoleRef.MarshalTo(data[i:]) n3, err := m.RoleRef.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n4 i += n3
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n5, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n5
return i, nil return i, nil
} }
@ -246,11 +230,11 @@ func (m *ClusterRoleBindingBuilder) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ClusterRoleBinding.Size())) i = encodeVarintGenerated(data, i, uint64(m.ClusterRoleBinding.Size()))
n6, err := m.ClusterRoleBinding.MarshalTo(data[i:]) n4, err := m.ClusterRoleBinding.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n6 i += n4
return i, nil return i, nil
} }
@ -272,11 +256,11 @@ func (m *ClusterRoleBindingList) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size()))
n7, err := m.ListMeta.MarshalTo(data[i:]) n5, err := m.ListMeta.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n7 i += n5
if len(m.Items) > 0 { if len(m.Items) > 0 {
for _, msg := range m.Items { for _, msg := range m.Items {
data[i] = 0x12 data[i] = 0x12
@ -289,14 +273,6 @@ func (m *ClusterRoleBindingList) MarshalTo(data []byte) (int, error) {
i += n i += n
} }
} }
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n8, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n8
return i, nil return i, nil
} }
@ -318,11 +294,11 @@ func (m *ClusterRoleList) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size()))
n9, err := m.ListMeta.MarshalTo(data[i:]) n6, err := m.ListMeta.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n9 i += n6
if len(m.Items) > 0 { if len(m.Items) > 0 {
for _, msg := range m.Items { for _, msg := range m.Items {
data[i] = 0x12 data[i] = 0x12
@ -335,14 +311,6 @@ func (m *ClusterRoleList) MarshalTo(data []byte) (int, error) {
i += n i += n
} }
} }
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n10, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n10
return i, nil return i, nil
} }
@ -379,11 +347,11 @@ func (m *PolicyRule) MarshalTo(data []byte) (int, error) {
data[i] = 0x12 data[i] = 0x12
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.AttributeRestrictions.Size())) i = encodeVarintGenerated(data, i, uint64(m.AttributeRestrictions.Size()))
n11, err := m.AttributeRestrictions.MarshalTo(data[i:]) n7, err := m.AttributeRestrictions.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n11 i += n7
if len(m.APIGroups) > 0 { if len(m.APIGroups) > 0 {
for _, s := range m.APIGroups { for _, s := range m.APIGroups {
data[i] = 0x1a data[i] = 0x1a
@ -465,11 +433,11 @@ func (m *PolicyRuleBuilder) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.PolicyRule.Size())) i = encodeVarintGenerated(data, i, uint64(m.PolicyRule.Size()))
n12, err := m.PolicyRule.MarshalTo(data[i:]) n8, err := m.PolicyRule.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n12 i += n8
return i, nil return i, nil
} }
@ -491,11 +459,11 @@ func (m *Role) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size()))
n13, err := m.ObjectMeta.MarshalTo(data[i:]) n9, err := m.ObjectMeta.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n13 i += n9
if len(m.Rules) > 0 { if len(m.Rules) > 0 {
for _, msg := range m.Rules { for _, msg := range m.Rules {
data[i] = 0x12 data[i] = 0x12
@ -508,14 +476,6 @@ func (m *Role) MarshalTo(data []byte) (int, error) {
i += n i += n
} }
} }
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n14, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n14
return i, nil return i, nil
} }
@ -537,11 +497,11 @@ func (m *RoleBinding) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ObjectMeta.Size()))
n15, err := m.ObjectMeta.MarshalTo(data[i:]) n10, err := m.ObjectMeta.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n15 i += n10
if len(m.Subjects) > 0 { if len(m.Subjects) > 0 {
for _, msg := range m.Subjects { for _, msg := range m.Subjects {
data[i] = 0x12 data[i] = 0x12
@ -557,19 +517,11 @@ func (m *RoleBinding) MarshalTo(data []byte) (int, error) {
data[i] = 0x1a data[i] = 0x1a
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.RoleRef.Size())) i = encodeVarintGenerated(data, i, uint64(m.RoleRef.Size()))
n16, err := m.RoleRef.MarshalTo(data[i:]) n11, err := m.RoleRef.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n16 i += n11
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n17, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n17
return i, nil return i, nil
} }
@ -591,11 +543,11 @@ func (m *RoleBindingList) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size()))
n18, err := m.ListMeta.MarshalTo(data[i:]) n12, err := m.ListMeta.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n18 i += n12
if len(m.Items) > 0 { if len(m.Items) > 0 {
for _, msg := range m.Items { for _, msg := range m.Items {
data[i] = 0x12 data[i] = 0x12
@ -608,14 +560,6 @@ func (m *RoleBindingList) MarshalTo(data []byte) (int, error) {
i += n i += n
} }
} }
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n19, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n19
return i, nil return i, nil
} }
@ -637,11 +581,11 @@ func (m *RoleList) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size()))
n20, err := m.ListMeta.MarshalTo(data[i:]) n13, err := m.ListMeta.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n20 i += n13
if len(m.Items) > 0 { if len(m.Items) > 0 {
for _, msg := range m.Items { for _, msg := range m.Items {
data[i] = 0x12 data[i] = 0x12
@ -654,14 +598,6 @@ func (m *RoleList) MarshalTo(data []byte) (int, error) {
i += n i += n
} }
} }
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n21, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n21
return i, nil return i, nil
} }
@ -767,8 +703,6 @@ func (m *ClusterRole) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
} }
} }
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -785,8 +719,6 @@ func (m *ClusterRoleBinding) Size() (n int) {
} }
l = m.RoleRef.Size() l = m.RoleRef.Size()
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -809,8 +741,6 @@ func (m *ClusterRoleBindingList) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
} }
} }
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -825,8 +755,6 @@ func (m *ClusterRoleList) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
} }
} }
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -887,8 +815,6 @@ func (m *Role) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
} }
} }
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -905,8 +831,6 @@ func (m *RoleBinding) Size() (n int) {
} }
l = m.RoleRef.Size() l = m.RoleRef.Size()
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -921,8 +845,6 @@ func (m *RoleBindingList) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
} }
} }
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -937,8 +859,6 @@ func (m *RoleList) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
} }
} }
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -988,7 +908,6 @@ func (this *ClusterRole) String() string {
s := strings.Join([]string{`&ClusterRole{`, s := strings.Join([]string{`&ClusterRole{`,
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Rules:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Rules), "PolicyRule", "PolicyRule", 1), `&`, ``, 1) + `,`, `Rules:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Rules), "PolicyRule", "PolicyRule", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -1001,7 +920,6 @@ func (this *ClusterRoleBinding) String() string {
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Subjects:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Subjects), "Subject", "Subject", 1), `&`, ``, 1) + `,`, `Subjects:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Subjects), "Subject", "Subject", 1), `&`, ``, 1) + `,`,
`RoleRef:` + strings.Replace(strings.Replace(this.RoleRef.String(), "RoleRef", "RoleRef", 1), `&`, ``, 1) + `,`, `RoleRef:` + strings.Replace(strings.Replace(this.RoleRef.String(), "RoleRef", "RoleRef", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -1023,7 +941,6 @@ func (this *ClusterRoleBindingList) String() string {
s := strings.Join([]string{`&ClusterRoleBindingList{`, s := strings.Join([]string{`&ClusterRoleBindingList{`,
`ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`,
`Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ClusterRoleBinding", "ClusterRoleBinding", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ClusterRoleBinding", "ClusterRoleBinding", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -1035,7 +952,6 @@ func (this *ClusterRoleList) String() string {
s := strings.Join([]string{`&ClusterRoleList{`, s := strings.Join([]string{`&ClusterRoleList{`,
`ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`,
`Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ClusterRole", "ClusterRole", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ClusterRole", "ClusterRole", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -1072,7 +988,6 @@ func (this *Role) String() string {
s := strings.Join([]string{`&Role{`, s := strings.Join([]string{`&Role{`,
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Rules:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Rules), "PolicyRule", "PolicyRule", 1), `&`, ``, 1) + `,`, `Rules:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Rules), "PolicyRule", "PolicyRule", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -1085,7 +1000,6 @@ func (this *RoleBinding) String() string {
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Subjects:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Subjects), "Subject", "Subject", 1), `&`, ``, 1) + `,`, `Subjects:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Subjects), "Subject", "Subject", 1), `&`, ``, 1) + `,`,
`RoleRef:` + strings.Replace(strings.Replace(this.RoleRef.String(), "RoleRef", "RoleRef", 1), `&`, ``, 1) + `,`, `RoleRef:` + strings.Replace(strings.Replace(this.RoleRef.String(), "RoleRef", "RoleRef", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -1097,7 +1011,6 @@ func (this *RoleBindingList) String() string {
s := strings.Join([]string{`&RoleBindingList{`, s := strings.Join([]string{`&RoleBindingList{`,
`ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`,
`Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "RoleBinding", "RoleBinding", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "RoleBinding", "RoleBinding", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -1109,7 +1022,6 @@ func (this *RoleList) String() string {
s := strings.Join([]string{`&RoleList{`, s := strings.Join([]string{`&RoleList{`,
`ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`,
`Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Role", "Role", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Role", "Role", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -1237,36 +1149,6 @@ func (m *ClusterRole) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -1408,36 +1290,6 @@ func (m *ClusterRoleBinding) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -1629,36 +1481,6 @@ func (m *ClusterRoleBindingList) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -1770,36 +1592,6 @@ func (m *ClusterRoleList) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -2216,36 +2008,6 @@ func (m *Role) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -2387,36 +2149,6 @@ func (m *RoleBinding) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -2528,36 +2260,6 @@ func (m *RoleBindingList) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -2669,36 +2371,6 @@ func (m *RoleList) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -3129,63 +2801,61 @@ var (
) )
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 928 bytes of a gzipped FileDescriptorProto // 895 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x55, 0xcf, 0x6f, 0x1b, 0x45, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x55, 0xcf, 0x8b, 0x23, 0x45,
0x14, 0xf6, 0xfa, 0x07, 0xf1, 0xbe, 0x10, 0x85, 0x0c, 0x2a, 0x32, 0x91, 0xb0, 0x23, 0x9f, 0x2c, 0x14, 0x4e, 0x4d, 0x12, 0x27, 0x79, 0xe3, 0x30, 0x4e, 0xc9, 0x4a, 0x3b, 0x60, 0x32, 0xe4, 0x14,
0x68, 0x77, 0xe5, 0xa8, 0x40, 0x0f, 0x70, 0xc8, 0x22, 0x84, 0x22, 0x4a, 0x88, 0xa6, 0x50, 0x41, 0x74, 0xb7, 0x9b, 0x0c, 0xab, 0xee, 0x41, 0x0f, 0xd3, 0x22, 0x32, 0xb8, 0x8e, 0x43, 0x2d, 0x2e,
0x55, 0x09, 0x8d, 0xd7, 0x53, 0x7b, 0xf0, 0x7a, 0x77, 0x35, 0x33, 0x1b, 0x88, 0x10, 0x12, 0x42, 0xba, 0x2c, 0x48, 0xa5, 0x53, 0x9b, 0x94, 0xe9, 0x74, 0x37, 0x55, 0xd5, 0xa3, 0x8b, 0x08, 0x22,
0x1c, 0x90, 0xb8, 0x70, 0x45, 0x5c, 0x38, 0x21, 0x71, 0xe5, 0xc2, 0xbf, 0x90, 0x63, 0x8f, 0x9c, 0x1e, 0x3c, 0xfa, 0x57, 0xec, 0xcd, 0x8b, 0x57, 0xf1, 0xe2, 0x69, 0xc0, 0xcb, 0x1e, 0xf5, 0x12,
0x2c, 0x62, 0xfe, 0x11, 0x34, 0xeb, 0x99, 0xdd, 0x75, 0x6c, 0xab, 0x69, 0x68, 0x93, 0x4b, 0x4e, 0x9c, 0xf8, 0x8f, 0x48, 0x75, 0xaa, 0x7f, 0xcc, 0x76, 0x87, 0xf9, 0x21, 0x0e, 0x08, 0x7b, 0x4a,
0xf6, 0xbe, 0xf7, 0xbe, 0x6f, 0xde, 0x7c, 0xf3, 0x66, 0x3e, 0xb8, 0x33, 0xba, 0x23, 0x1c, 0x16, 0xea, 0xbd, 0xef, 0x7b, 0xf5, 0xbd, 0x7a, 0x55, 0x5f, 0xc3, 0x9d, 0xe9, 0x1d, 0x69, 0xf3, 0xd0,
0xb9, 0xa3, 0xa4, 0x47, 0x79, 0x48, 0x25, 0x15, 0x6e, 0x3c, 0x1a, 0xb8, 0x24, 0x66, 0xc2, 0xe5, 0x99, 0xc6, 0x43, 0x26, 0x02, 0xa6, 0x98, 0x74, 0xa2, 0xe9, 0xd8, 0xa1, 0x11, 0x97, 0x8e, 0x18,
0x3d, 0xe2, 0xbb, 0x47, 0x5d, 0x12, 0xc4, 0x43, 0xd2, 0x75, 0x07, 0x34, 0xa4, 0x9c, 0x48, 0xda, 0x52, 0xcf, 0x39, 0x1e, 0x50, 0x3f, 0x9a, 0xd0, 0x81, 0x33, 0x66, 0x01, 0x13, 0x54, 0xb1, 0x91,
0x77, 0x62, 0x1e, 0xc9, 0x08, 0x75, 0x66, 0x48, 0x27, 0x47, 0x3a, 0xf1, 0x68, 0xe0, 0x28, 0xa4, 0x1d, 0x89, 0x50, 0x85, 0xb8, 0xbf, 0x64, 0xda, 0x39, 0xd3, 0x8e, 0xa6, 0x63, 0x5b, 0x33, 0x6d,
0xa3, 0x90, 0x8e, 0x41, 0x6e, 0xdf, 0x1a, 0x30, 0x39, 0x4c, 0x7a, 0x8e, 0x1f, 0x8d, 0xdd, 0x41, 0xcd, 0xb4, 0x53, 0xe6, 0xce, 0xad, 0x31, 0x57, 0x93, 0x78, 0x68, 0x7b, 0xe1, 0xcc, 0x19, 0x87,
0x34, 0x88, 0xdc, 0x94, 0xa0, 0x97, 0x3c, 0x4a, 0xbf, 0xd2, 0x8f, 0xf4, 0xdf, 0x8c, 0x78, 0xfb, 0xe3, 0xd0, 0x49, 0x0a, 0x0c, 0xe3, 0x47, 0xc9, 0x2a, 0x59, 0x24, 0xff, 0x96, 0x85, 0x77, 0x6e,
0xb6, 0x6e, 0x89, 0xc4, 0x6c, 0x4c, 0xfc, 0x21, 0x0b, 0x29, 0x3f, 0xce, 0x9b, 0x1a, 0x53, 0x49, 0x1b, 0x49, 0x34, 0xe2, 0x33, 0xea, 0x4d, 0x78, 0xc0, 0xc4, 0xe3, 0x5c, 0xd4, 0x8c, 0x29, 0xea,
0xdc, 0xa3, 0x85, 0x76, 0xb6, 0xdd, 0x55, 0x28, 0x9e, 0x84, 0x92, 0x8d, 0xe9, 0x02, 0xe0, 0xad, 0x1c, 0x97, 0xe4, 0xec, 0x38, 0xab, 0x58, 0x22, 0x0e, 0x14, 0x9f, 0xb1, 0x12, 0xe1, 0xad, 0xf3,
0x27, 0x01, 0x84, 0x3f, 0xa4, 0x63, 0xb2, 0x80, 0xdb, 0x5d, 0xa9, 0x98, 0xcb, 0xa9, 0x88, 0x12, 0x08, 0xd2, 0x9b, 0xb0, 0x19, 0x2d, 0xf1, 0xf6, 0x56, 0x9e, 0x98, 0x23, 0x98, 0x0c, 0x63, 0xe1,
0xee, 0x2f, 0xae, 0x75, 0x73, 0x35, 0x66, 0xc9, 0x56, 0xba, 0xcb, 0xab, 0x13, 0xc9, 0x02, 0x97, 0x95, 0xf7, 0xba, 0xb9, 0x9a, 0x53, 0xd1, 0xca, 0xa0, 0x1a, 0x1d, 0x2b, 0xee, 0x3b, 0x3c, 0x50,
0x85, 0x52, 0x48, 0x7e, 0x16, 0xd2, 0xfe, 0xad, 0x0c, 0xeb, 0xef, 0x05, 0x89, 0x90, 0x94, 0xe3, 0x52, 0x89, 0x67, 0x29, 0xbd, 0xdf, 0x10, 0x6c, 0xbc, 0xe7, 0xc7, 0x52, 0x31, 0x41, 0x42, 0x9f,
0x28, 0xa0, 0xe8, 0x33, 0xa8, 0x2b, 0xa1, 0xfa, 0x44, 0x92, 0x86, 0xb5, 0x63, 0x75, 0xd6, 0x77, 0xe1, 0x4f, 0xa1, 0xa5, 0x0f, 0x6a, 0x44, 0x15, 0xb5, 0xd0, 0x2e, 0xea, 0x6f, 0xec, 0xf5, 0xed,
0x3b, 0xce, 0xca, 0xf3, 0x72, 0x8e, 0xba, 0xce, 0xc7, 0xbd, 0x2f, 0xa9, 0x2f, 0x3f, 0xa2, 0x92, 0x95, 0xf3, 0xb2, 0x8f, 0x07, 0xf6, 0xc7, 0xc3, 0x2f, 0x98, 0xa7, 0x3e, 0x62, 0x8a, 0xba, 0xf8,
0x78, 0xe8, 0x64, 0xd2, 0x2a, 0x4d, 0x27, 0x2d, 0xc8, 0x63, 0x38, 0x63, 0x43, 0x9f, 0x43, 0x8d, 0x64, 0xde, 0xad, 0x2d, 0xe6, 0x5d, 0xc8, 0x63, 0x24, 0xab, 0x86, 0x3f, 0x83, 0xa6, 0x88, 0x7d,
0x27, 0x01, 0x15, 0x8d, 0xf2, 0x4e, 0xa5, 0xb3, 0xbe, 0x7b, 0xdb, 0x39, 0xef, 0x18, 0x38, 0x87, 0x26, 0xad, 0xb5, 0xdd, 0x7a, 0x7f, 0x63, 0xef, 0xb6, 0x7d, 0xd1, 0x6b, 0x60, 0x1f, 0x85, 0x3e,
0x51, 0xc0, 0xfc, 0x63, 0x9c, 0x04, 0xd4, 0xdb, 0xd0, 0x4b, 0xd4, 0xd4, 0x97, 0xc0, 0x33, 0x46, 0xf7, 0x1e, 0x93, 0xd8, 0x67, 0xee, 0xa6, 0xd9, 0xa2, 0xa9, 0x57, 0x92, 0x2c, 0x2b, 0xf6, 0x7e,
0xf4, 0x10, 0xea, 0xf2, 0x38, 0xa6, 0x6a, 0xc1, 0x46, 0x25, 0x6d, 0xda, 0x31, 0xec, 0xc5, 0x43, 0x5a, 0x03, 0x5c, 0x68, 0xc2, 0xe5, 0xc1, 0x88, 0x07, 0xe3, 0xff, 0xb0, 0x97, 0xcf, 0xa1, 0x25,
0xca, 0xf9, 0x55, 0x53, 0xaa, 0xf9, 0x4f, 0x34, 0xca, 0x7b, 0x49, 0xf3, 0xd6, 0x4d, 0x04, 0x67, 0xe3, 0x24, 0x91, 0xb6, 0x33, 0xb8, 0x78, 0x3b, 0xf7, 0x96, 0x4c, 0xf7, 0x25, 0xb3, 0x45, 0xcb,
0x8c, 0xed, 0x9f, 0x2a, 0x80, 0x0a, 0x12, 0x79, 0x2c, 0xec, 0xb3, 0x70, 0xf0, 0x1c, 0x95, 0xfa, 0x04, 0x24, 0xc9, 0x8a, 0xe2, 0x87, 0xb0, 0x2e, 0x42, 0x9f, 0x11, 0xf6, 0xc8, 0xaa, 0x27, 0xca,
0x02, 0xea, 0x22, 0x49, 0x13, 0x46, 0xac, 0xee, 0xf9, 0xc5, 0xba, 0x37, 0x43, 0xe6, 0x3b, 0xd2, 0x2f, 0x51, 0x9f, 0x2c, 0x89, 0xee, 0x96, 0xa9, 0xbf, 0x6e, 0x02, 0x24, 0x2d, 0xd9, 0x7b, 0x82,
0x01, 0x81, 0x33, 0x52, 0xf4, 0x10, 0xd6, 0x78, 0x14, 0x50, 0x4c, 0x1f, 0x69, 0xb9, 0x9e, 0x82, 0xe0, 0xd5, 0xf2, 0x79, 0xb9, 0x31, 0xf7, 0x47, 0x4c, 0xe0, 0x1f, 0x10, 0x60, 0xaf, 0x94, 0x35,
0x1f, 0xcf, 0x80, 0xde, 0xa6, 0xe6, 0x5f, 0xd3, 0x01, 0x6c, 0x28, 0xe7, 0x4e, 0xa3, 0xfa, 0xcc, 0x27, 0xf8, 0xce, 0xc5, 0x75, 0x54, 0xec, 0xb0, 0x63, 0x24, 0x55, 0x4c, 0x8b, 0x54, 0xec, 0xd9,
0x4f, 0xe3, 0x77, 0x0b, 0x5e, 0x5d, 0x3c, 0x0d, 0x2f, 0x61, 0x41, 0x9f, 0x72, 0xf4, 0xa3, 0x05, 0xfb, 0x13, 0xc1, 0x2b, 0x65, 0xe8, 0x5d, 0x2e, 0x15, 0x7e, 0x58, 0x1a, 0xae, 0x9d, 0x4a, 0x2b,
0xc8, 0x5f, 0xc8, 0xea, 0xf3, 0x79, 0xe7, 0xfc, 0xbb, 0x5c, 0xb2, 0xc2, 0xb6, 0x6e, 0x6a, 0xc9, 0x3e, 0xcc, 0x5c, 0x9c, 0x46, 0xeb, 0x21, 0x6b, 0x76, 0x32, 0xe2, 0xec, 0xfc, 0xd3, 0x48, 0x61,
0x2c, 0xe0, 0x25, 0x6b, 0xb6, 0xff, 0x2a, 0xc3, 0x2b, 0x8b, 0xa5, 0x77, 0x99, 0x90, 0x4a, 0xa1, 0xc0, 0x14, 0x9a, 0x5c, 0xb1, 0x59, 0x3a, 0xdd, 0x7f, 0xd7, 0x75, 0x76, 0x69, 0x0f, 0x74, 0x49,
0x33, 0xa3, 0x73, 0x4e, 0x85, 0x14, 0x7a, 0x5e, 0x21, 0x13, 0x29, 0x8c, 0x0f, 0x81, 0x1a, 0x93, 0xb2, 0xac, 0xdc, 0xfb, 0x1d, 0xc1, 0x56, 0x01, 0x7c, 0x0d, 0x4d, 0x3d, 0x38, 0xdb, 0xd4, 0x9b,
0x74, 0x6c, 0x66, 0xe7, 0xff, 0xed, 0x3a, 0xbb, 0x70, 0xfb, 0x8a, 0x12, 0xcf, 0x98, 0x9f, 0xf3, 0x57, 0x6b, 0xaa, 0xba, 0x9b, 0xef, 0xeb, 0x00, 0xf9, 0x3b, 0xc5, 0x5d, 0x68, 0x1e, 0x33, 0x31,
0x85, 0xfb, 0xa3, 0x0c, 0x9b, 0x85, 0x56, 0x2e, 0x41, 0xb2, 0x07, 0xf3, 0x92, 0xbd, 0x79, 0x31, 0x94, 0x16, 0xda, 0xad, 0xf7, 0xdb, 0x6e, 0x5b, 0xe3, 0xef, 0xeb, 0x00, 0x59, 0xc6, 0xf1, 0x77,
0xc9, 0xae, 0x42, 0xab, 0x1f, 0x2a, 0x00, 0xf9, 0xfb, 0x88, 0x5a, 0x50, 0x3b, 0xa2, 0xbc, 0x27, 0x08, 0x6e, 0x50, 0xa5, 0x04, 0x1f, 0xc6, 0x8a, 0x11, 0x26, 0x95, 0xe0, 0x9e, 0xe2, 0x61, 0xa0,
0x1a, 0xd6, 0x4e, 0xa5, 0x63, 0x7b, 0xb6, 0xea, 0xe6, 0xbe, 0x0a, 0xe0, 0x59, 0x1c, 0x7d, 0x6f, 0xc5, 0xe9, 0xbe, 0x6f, 0xad, 0xec, 0xdb, 0xb8, 0xac, 0x4d, 0xe8, 0x97, 0xef, 0x7f, 0xa5, 0x58,
0xc1, 0x0d, 0x22, 0x25, 0x67, 0xbd, 0x44, 0x52, 0x4c, 0x85, 0xe4, 0xcc, 0x97, 0x2c, 0x0a, 0xd5, 0x20, 0x79, 0x18, 0xb8, 0xaf, 0x19, 0x51, 0x37, 0xf6, 0xab, 0x6a, 0x92, 0xea, 0xad, 0xf0, 0x1b,
0xd6, 0x55, 0x6f, 0xb7, 0x56, 0xf6, 0xa6, 0xdd, 0xcd, 0xc1, 0xe4, 0xab, 0xf7, 0xbf, 0x96, 0x34, 0xd0, 0xa6, 0x11, 0xff, 0x40, 0x84, 0x71, 0x24, 0xad, 0x7a, 0xa2, 0x74, 0x73, 0x31, 0xef, 0xb6,
0x14, 0x2c, 0x0a, 0xbd, 0xd7, 0x74, 0x6b, 0x37, 0xf6, 0x96, 0x71, 0xe2, 0xe5, 0x4b, 0xa1, 0x37, 0xf7, 0x8f, 0x0e, 0x96, 0x41, 0x92, 0xe7, 0x35, 0x38, 0xb5, 0x69, 0x69, 0x35, 0x72, 0x30, 0x49,
0xc0, 0x26, 0x31, 0xfb, 0x80, 0x47, 0x49, 0x2c, 0x1a, 0x95, 0xb4, 0xd3, 0x8d, 0xe9, 0xa4, 0x65, 0x83, 0x24, 0xcf, 0xe3, 0xb7, 0x61, 0x33, 0x5d, 0x1c, 0xd2, 0x19, 0x93, 0x56, 0x33, 0x21, 0x6c,
0xef, 0x1d, 0xee, 0xcf, 0x82, 0x38, 0xcf, 0xab, 0x62, 0x63, 0x8f, 0xa2, 0x51, 0xcd, 0x8b, 0xb1, 0x2f, 0xe6, 0xdd, 0x4d, 0x52, 0x4c, 0x90, 0xb3, 0x38, 0xfc, 0x2e, 0x6c, 0x05, 0x61, 0x90, 0x42,
0x09, 0xe2, 0x3c, 0x8f, 0xde, 0x86, 0x0d, 0xf3, 0x71, 0x40, 0xc6, 0x54, 0x34, 0x6a, 0x29, 0x60, 0x3e, 0x21, 0x77, 0xa5, 0xf5, 0x42, 0x42, 0x7d, 0x79, 0x31, 0xef, 0x6e, 0x1d, 0x9e, 0x4d, 0x91,
0x6b, 0x3a, 0x69, 0x6d, 0xe0, 0x62, 0x02, 0xcf, 0xd7, 0xa1, 0x77, 0x61, 0x33, 0x8c, 0x42, 0x53, 0x67, 0xb1, 0xbd, 0x6f, 0x60, 0xbb, 0xe0, 0x96, 0xe6, 0x41, 0x4f, 0x00, 0xa2, 0x2c, 0x68, 0xee,
0xf2, 0x29, 0xbe, 0x2b, 0x1a, 0x2f, 0xa4, 0xd0, 0x97, 0xa7, 0x93, 0xd6, 0xe6, 0xc1, 0x7c, 0x0a, 0xd5, 0xd5, 0xec, 0x37, 0x73, 0xc5, 0x3c, 0x46, 0x0a, 0xb5, 0x7b, 0xbf, 0x20, 0x68, 0xfc, 0x7f,
0x9f, 0xad, 0x6d, 0x7f, 0x0b, 0x5b, 0x05, 0x97, 0xd2, 0x8f, 0xd1, 0x10, 0x20, 0xce, 0x82, 0x7a, 0x3f, 0x23, 0x4f, 0xd6, 0x60, 0xe3, 0xf9, 0xf7, 0xe3, 0x02, 0xdf, 0x0f, 0x6d, 0x5d, 0xd7, 0xeb,
0x6a, 0x2f, 0x66, 0x7b, 0x99, 0x5f, 0xe4, 0x31, 0x5c, 0xe0, 0x6e, 0xff, 0x52, 0x86, 0xea, 0xb5, 0xc7, 0x57, 0xb7, 0xae, 0xf3, 0x8d, 0xf8, 0x57, 0x04, 0xad, 0x6b, 0x72, 0xe0, 0x7b, 0x67, 0xdb,
0x7d, 0xaf, 0xbc, 0x21, 0xeb, 0xd7, 0xbe, 0x7d, 0xe5, 0xbe, 0xad, 0x1e, 0xf5, 0xcb, 0xf5, 0xc1, 0xb0, 0x2f, 0xd9, 0x46, 0xb5, 0xfe, 0xaf, 0x21, 0x9d, 0x10, 0xbe, 0x09, 0xad, 0xd4, 0xb0, 0x12,
0x8b, 0x3f, 0xea, 0x57, 0x6d, 0x80, 0xbf, 0x96, 0xa1, 0x7e, 0x49, 0xce, 0x77, 0x6f, 0x5e, 0x24, 0xf5, 0xed, 0x5c, 0x4d, 0xea, 0x69, 0x24, 0x43, 0xe0, 0x5d, 0x68, 0x4c, 0x79, 0x30, 0x4a, 0x1c,
0xe7, 0x29, 0x45, 0xba, 0x0a, 0x75, 0xbe, 0x01, 0x33, 0xbb, 0xe8, 0x26, 0xd4, 0x8d, 0x51, 0xa4, 0xb7, 0xed, 0xbe, 0x68, 0x90, 0x8d, 0x0f, 0x79, 0x30, 0x22, 0x49, 0x46, 0x23, 0x02, 0x3a, 0x63,
0xda, 0xd8, 0x39, 0xd0, 0x78, 0x09, 0xce, 0x2a, 0xd0, 0x0e, 0x54, 0x47, 0x2c, 0xec, 0xa7, 0x4e, 0xc9, 0x1d, 0x2a, 0x20, 0xb4, 0x55, 0x91, 0x24, 0xd3, 0xfb, 0x19, 0xc1, 0xba, 0xb9, 0x7f, 0x59,
0x67, 0x7b, 0x2f, 0xea, 0xca, 0xea, 0x87, 0x2c, 0xec, 0xe3, 0x34, 0xa3, 0x2a, 0x42, 0x32, 0xa6, 0x3d, 0xb4, 0xb2, 0xde, 0x1e, 0x00, 0x8d, 0xf8, 0x7d, 0x26, 0xb4, 0x69, 0x9b, 0x7d, 0xb3, 0x97,
0x69, 0xd3, 0x85, 0x0a, 0x65, 0x11, 0x38, 0xcd, 0xb4, 0xff, 0xb4, 0x60, 0x4d, 0xdf, 0xcc, 0x8c, 0xb2, 0x7f, 0x74, 0x60, 0x32, 0xa4, 0x80, 0x3a, 0x5f, 0x03, 0x76, 0xa0, 0xad, 0x7f, 0x65, 0x44,
0xcf, 0x5a, 0xc9, 0xb7, 0x0b, 0x40, 0x62, 0x76, 0x9f, 0x72, 0x65, 0x96, 0x7a, 0xdd, 0xec, 0x0d, 0x3d, 0x66, 0x35, 0x12, 0xd8, 0xb6, 0x81, 0xb5, 0x0f, 0xd3, 0x04, 0xc9, 0x31, 0xee, 0xeb, 0x27,
0xd9, 0x3b, 0xdc, 0xd7, 0x19, 0x5c, 0xa8, 0x7a, 0x72, 0x0f, 0xc8, 0x05, 0x5b, 0xfd, 0x8a, 0x98, 0xa7, 0x9d, 0xda, 0xd3, 0xd3, 0x4e, 0xed, 0x8f, 0xd3, 0x4e, 0xed, 0xdb, 0x45, 0x07, 0x9d, 0x2c,
0xf8, 0x34, 0xbd, 0xa9, 0xb6, 0xb7, 0xa5, 0xcb, 0xec, 0x03, 0x93, 0xc0, 0x79, 0x8d, 0xf7, 0xfa, 0x3a, 0xe8, 0xe9, 0xa2, 0x83, 0xfe, 0x5a, 0x74, 0xd0, 0x8f, 0x7f, 0x77, 0x6a, 0x0f, 0x5a, 0xe9,
0xc9, 0x69, 0xb3, 0xf4, 0xf8, 0xb4, 0x59, 0xfa, 0xfb, 0xb4, 0x59, 0xfa, 0x6e, 0xda, 0xb4, 0x4e, 0xc1, 0xff, 0x13, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x52, 0x01, 0xe6, 0xe8, 0x0c, 0x00, 0x00,
0xa6, 0x4d, 0xeb, 0xf1, 0xb4, 0x69, 0xfd, 0x33, 0x6d, 0x5a, 0x3f, 0xff, 0xdb, 0x2c, 0x3d, 0xa8,
0x9b, 0x63, 0xfd, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x42, 0x1b, 0xd1, 0x1c, 0xd8, 0x0f, 0x00, 0x00,
} }

16
pkg/apis/rbac/v1alpha1/generated.proto
View File

@ -33,8 +33,6 @@ option go_package = "v1alpha1";
// ClusterRole is a cluster level, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding or ClusterRoleBinding. // ClusterRole is a cluster level, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding or ClusterRoleBinding.
message ClusterRole { message ClusterRole {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard object's metadata. // Standard object's metadata.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
@ -46,8 +44,6 @@ message ClusterRole {
// ClusterRoleBinding references a ClusterRole, but not contain it. It can reference a ClusterRole in the global namespace, // ClusterRoleBinding references a ClusterRole, but not contain it. It can reference a ClusterRole in the global namespace,
// and adds who information via Subject. // and adds who information via Subject.
message ClusterRoleBinding { message ClusterRoleBinding {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object's metadata. // Standard object's metadata.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
@ -70,8 +66,6 @@ message ClusterRoleBindingBuilder {
// ClusterRoleBindingList is a collection of ClusterRoleBindings // ClusterRoleBindingList is a collection of ClusterRoleBindings
message ClusterRoleBindingList { message ClusterRoleBindingList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard object's metadata. // Standard object's metadata.
// +optional // +optional
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1; optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
@ -82,8 +76,6 @@ message ClusterRoleBindingList {
// ClusterRoleList is a collection of ClusterRoles // ClusterRoleList is a collection of ClusterRoles
message ClusterRoleList { message ClusterRoleList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard object's metadata. // Standard object's metadata.
// +optional // +optional
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1; optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
@ -134,8 +126,6 @@ message PolicyRuleBuilder {
// Role is a namespaced, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding. // Role is a namespaced, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding.
message Role { message Role {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard object's metadata. // Standard object's metadata.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
@ -148,8 +138,6 @@ message Role {
// It adds who information via Subjects and namespace information by which namespace it exists in. RoleBindings in a given // It adds who information via Subjects and namespace information by which namespace it exists in. RoleBindings in a given
// namespace only have effect in that namespace. // namespace only have effect in that namespace.
message RoleBinding { message RoleBinding {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object's metadata. // Standard object's metadata.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
@ -164,8 +152,6 @@ message RoleBinding {
// RoleBindingList is a collection of RoleBindings // RoleBindingList is a collection of RoleBindings
message RoleBindingList { message RoleBindingList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard object's metadata. // Standard object's metadata.
// +optional // +optional
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1; optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
@ -176,8 +162,6 @@ message RoleBindingList {
// RoleList is a collection of Roles // RoleList is a collection of Roles
message RoleList { message RoleList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard object's metadata. // Standard object's metadata.
// +optional // +optional
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1; optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;

2
pkg/apis/rbac/v1alpha1/helpers.go
View File

@ -22,7 +22,6 @@ import (
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
) )
// +k8s:deepcopy-gen=false
// PolicyRuleBuilder let's us attach methods. A no-no for API types. // PolicyRuleBuilder let's us attach methods. A no-no for API types.
// We use it to construct rules in code. It's more compact than trying to write them // We use it to construct rules in code. It's more compact than trying to write them
// out in a literal and allows us to perform some basic checking during construction // out in a literal and allows us to perform some basic checking during construction
@ -89,7 +88,6 @@ func (r *PolicyRuleBuilder) Rule() (PolicyRule, error) {
return r.PolicyRule, nil return r.PolicyRule, nil
} }
// +k8s:deepcopy-gen=false
// ClusterRoleBindingBuilder let's us attach methods. A no-no for API types. // ClusterRoleBindingBuilder let's us attach methods. A no-no for API types.
// We use it to construct bindings in code. It's more compact than trying to write them // We use it to construct bindings in code. It's more compact than trying to write them
// out in a literal. // out in a literal.

1
pkg/apis/storage/doc.go
View File

@ -14,6 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +groupName=storage.k8s.io // +groupName=storage.k8s.io
package storage package storage

4
pkg/apis/storage/v1beta1/doc.go
View File

@ -14,9 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/storage
// +groupName=storage.k8s.io // +groupName=storage.k8s.io
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta
package v1beta1 package v1beta1

152
pkg/apis/storage/v1beta1/generated.pb.go
View File

@ -105,14 +105,6 @@ func (m *StorageClass) MarshalTo(data []byte) (int, error) {
i += copy(data[i:], v) i += copy(data[i:], v)
} }
} }
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n2, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n2
return i, nil return i, nil
} }
@ -134,11 +126,11 @@ func (m *StorageClassList) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size()))
n3, err := m.ListMeta.MarshalTo(data[i:]) n2, err := m.ListMeta.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n3 i += n2
if len(m.Items) > 0 { if len(m.Items) > 0 {
for _, msg := range m.Items { for _, msg := range m.Items {
data[i] = 0x12 data[i] = 0x12
@ -151,14 +143,6 @@ func (m *StorageClassList) MarshalTo(data []byte) (int, error) {
i += n i += n
} }
} }
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n4, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n4
return i, nil return i, nil
} }
@ -204,8 +188,6 @@ func (m *StorageClass) Size() (n int) {
n += mapEntrySize + 1 + sovGenerated(uint64(mapEntrySize)) n += mapEntrySize + 1 + sovGenerated(uint64(mapEntrySize))
} }
} }
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -220,8 +202,6 @@ func (m *StorageClassList) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
} }
} }
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -256,7 +236,6 @@ func (this *StorageClass) String() string {
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Provisioner:` + fmt.Sprintf("%v", this.Provisioner) + `,`, `Provisioner:` + fmt.Sprintf("%v", this.Provisioner) + `,`,
`Parameters:` + mapStringForParameters + `,`, `Parameters:` + mapStringForParameters + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -268,7 +247,6 @@ func (this *StorageClassList) String() string {
s := strings.Join([]string{`&StorageClassList{`, s := strings.Join([]string{`&StorageClassList{`,
`ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`,
`Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "StorageClass", "StorageClass", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "StorageClass", "StorageClass", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -480,36 +458,6 @@ func (m *StorageClass) Unmarshal(data []byte) error {
} }
m.Parameters[mapkey] = mapvalue m.Parameters[mapkey] = mapvalue
iNdEx = postIndex iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -621,36 +569,6 @@ func (m *StorageClassList) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -778,38 +696,36 @@ var (
) )
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 518 bytes of a gzipped FileDescriptorProto // 483 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x92, 0x4f, 0x8b, 0xd3, 0x40, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x92, 0xcf, 0x8b, 0xd3, 0x40,
0x18, 0xc6, 0x9b, 0xc6, 0x62, 0x77, 0xaa, 0x58, 0xa2, 0x87, 0xd0, 0x43, 0xb6, 0xec, 0xa9, 0x8a, 0x14, 0xc7, 0x93, 0x96, 0xe2, 0xee, 0x54, 0xb1, 0x44, 0x0f, 0xa5, 0x87, 0x6c, 0xd9, 0x53, 0x15,
0xce, 0xd0, 0xa2, 0x52, 0x16, 0xbc, 0x44, 0x04, 0x05, 0xc5, 0x25, 0x7a, 0x10, 0xd1, 0xc3, 0x24, 0x9d, 0xa1, 0x45, 0xa5, 0x2c, 0x78, 0xa9, 0x08, 0x0a, 0x8a, 0x4b, 0xbc, 0x88, 0xe8, 0x61, 0x92,
0xfb, 0x9a, 0x8e, 0x69, 0x32, 0x61, 0x66, 0x12, 0x28, 0x78, 0xf0, 0x23, 0xf8, 0x45, 0xfc, 0x02, 0x7d, 0xa6, 0x63, 0x9a, 0x4c, 0x98, 0x79, 0x09, 0x14, 0x3c, 0xf8, 0x27, 0xf8, 0x67, 0xf5, 0xe6,
0x7e, 0x82, 0x1e, 0xf7, 0xe8, 0x69, 0xb1, 0xf1, 0x8b, 0x48, 0xfe, 0xb4, 0xc9, 0xb6, 0x5b, 0x5c, 0x1e, 0x3d, 0xc8, 0x62, 0xe3, 0x3f, 0x22, 0xf9, 0xb1, 0x9b, 0xb0, 0x69, 0x51, 0xbc, 0xe5, 0xcd,
0xc4, 0x5b, 0xe6, 0x9d, 0xf9, 0x3d, 0xef, 0xf3, 0x3e, 0x6f, 0xd0, 0x71, 0x30, 0x95, 0x98, 0x71, 0xbc, 0xcf, 0xf7, 0xbd, 0xef, 0x37, 0x43, 0x4e, 0x82, 0xb9, 0xa6, 0x42, 0xb2, 0x20, 0x71, 0x41,
0x12, 0x24, 0x2e, 0x88, 0x08, 0x14, 0x48, 0x12, 0x07, 0x3e, 0xa1, 0x31, 0x93, 0x44, 0x2a, 0x2e, 0x45, 0x80, 0xa0, 0x59, 0x1c, 0xf8, 0x8c, 0xc7, 0x42, 0x33, 0x8d, 0x52, 0x71, 0x1f, 0x58, 0x3a,
0xa8, 0x0f, 0x24, 0x1d, 0xbb, 0xa0, 0xe8, 0x98, 0xf8, 0x10, 0x81, 0xa0, 0x0a, 0x4e, 0x71, 0x2c, 0x75, 0x01, 0xf9, 0x94, 0xf9, 0x10, 0x81, 0xe2, 0x08, 0x67, 0x34, 0x56, 0x12, 0xa5, 0x75, 0xbf,
0xb8, 0xe2, 0xc6, 0xbd, 0x92, 0xc5, 0x35, 0x8b, 0xe3, 0xc0, 0xc7, 0x39, 0x8b, 0x2b, 0x16, 0x57, 0x64, 0x69, 0xcd, 0xd2, 0x38, 0xf0, 0x69, 0xce, 0xd2, 0x8a, 0xa5, 0x15, 0x3b, 0x7a, 0xe8, 0x0b,
0xec, 0xe0, 0x81, 0xcf, 0xd4, 0x2c, 0x71, 0xb1, 0xc7, 0x43, 0xe2, 0x73, 0x9f, 0x93, 0x42, 0xc2, 0x5c, 0x26, 0x2e, 0xf5, 0x64, 0xc8, 0x7c, 0xe9, 0x4b, 0x56, 0x48, 0xb8, 0xc9, 0xa7, 0xa2, 0x2a,
0x4d, 0x3e, 0x15, 0xa7, 0xe2, 0x50, 0x7c, 0x95, 0xd2, 0x83, 0x87, 0x95, 0x2d, 0x1a, 0xb3, 0x90, 0x8a, 0xe2, 0xab, 0x94, 0x1e, 0x3d, 0xaa, 0xd6, 0xe2, 0xb1, 0x08, 0xb9, 0xb7, 0x14, 0x11, 0xa8,
0x7a, 0x33, 0x16, 0x81, 0x58, 0xd4, 0xc6, 0x42, 0x50, 0x94, 0xa4, 0x3b, 0x86, 0x06, 0x64, 0x1f, 0x75, 0xbd, 0x58, 0x08, 0xc8, 0x59, 0xda, 0x5a, 0x68, 0xc4, 0xf6, 0x51, 0x2a, 0x89, 0x50, 0x84,
0x25, 0x92, 0x48, 0xb1, 0x10, 0x76, 0x80, 0xc7, 0x7f, 0x03, 0xa4, 0x37, 0x83, 0x90, 0xee, 0x70, 0xd0, 0x02, 0x9e, 0xfc, 0x0d, 0xd0, 0xde, 0x12, 0x42, 0xde, 0xe2, 0x66, 0x7b, 0x53, 0x63, 0x0a,
0x93, 0xbd, 0xa9, 0x11, 0x01, 0x92, 0x27, 0xc2, 0xdb, 0xed, 0x75, 0x7f, 0x3f, 0x73, 0xc9, 0x28, 0xb4, 0x4c, 0x94, 0xd7, 0x9e, 0xf5, 0x60, 0x3f, 0xb3, 0xc3, 0xca, 0x74, 0x77, 0x77, 0x82, 0x62,
0xe3, 0xcb, 0x5f, 0x27, 0x8a, 0xcd, 0x09, 0x8b, 0x94, 0x54, 0x62, 0x1b, 0x39, 0xfa, 0xa1, 0xa3, 0xc5, 0x44, 0x84, 0x1a, 0xd5, 0x75, 0xe4, 0xf8, 0x67, 0x87, 0xdc, 0x7c, 0x5b, 0xc6, 0xfe, 0x6c,
0x1b, 0x6f, 0xca, 0xd8, 0x9f, 0xce, 0xa9, 0x94, 0xc6, 0x3b, 0xd4, 0xcd, 0x93, 0x3a, 0xa5, 0x8a, 0xc5, 0xb5, 0xb6, 0xde, 0x91, 0x83, 0x3c, 0xa9, 0x33, 0x8e, 0x7c, 0x68, 0x8e, 0xcd, 0x49, 0x7f,
0x9a, 0xda, 0x50, 0x1b, 0xf5, 0x26, 0x23, 0xbc, 0x77, 0x65, 0x38, 0x1d, 0xe3, 0xd7, 0xee, 0x67, 0x36, 0xa1, 0x7b, 0x7f, 0x19, 0x4d, 0xa7, 0xf4, 0x8d, 0xfb, 0x19, 0x3c, 0x7c, 0x0d, 0xc8, 0x17,
0xf0, 0xd4, 0x2b, 0x50, 0xd4, 0x36, 0x96, 0xe7, 0x87, 0xad, 0xec, 0xfc, 0x10, 0xd5, 0x35, 0x67, 0xd6, 0xe6, 0xe2, 0xc8, 0xc8, 0x2e, 0x8e, 0x48, 0x7d, 0xe6, 0x5c, 0xa9, 0x59, 0x8f, 0x49, 0x3f,
0xa3, 0x66, 0x3c, 0x42, 0xbd, 0x58, 0xf0, 0x94, 0x49, 0xc6, 0x23, 0x10, 0x66, 0x7b, 0xa8, 0x8d, 0x56, 0x32, 0x15, 0x5a, 0xc8, 0x08, 0xd4, 0xb0, 0x33, 0x36, 0x27, 0x87, 0x8b, 0x3b, 0x15, 0xd2,
0x0e, 0xec, 0xdb, 0x15, 0xd2, 0x3b, 0xa9, 0xaf, 0x9c, 0xe6, 0x3b, 0xe3, 0x0b, 0x42, 0x31, 0x15, 0x3f, 0xad, 0xaf, 0x9c, 0x66, 0x9f, 0xf5, 0x85, 0x90, 0x98, 0x2b, 0x1e, 0x02, 0x82, 0xd2, 0xc3,
0x34, 0x04, 0x05, 0x42, 0x9a, 0xfa, 0x50, 0x1f, 0xf5, 0x26, 0xcf, 0xf1, 0xd5, 0xff, 0x22, 0xdc, 0xee, 0xb8, 0x3b, 0xe9, 0xcf, 0x5e, 0xd0, 0x7f, 0x7f, 0x45, 0xb4, 0x69, 0x8f, 0x9e, 0x5e, 0x49,
0x1c, 0x0f, 0x9f, 0x6c, 0xa4, 0x9e, 0x45, 0x4a, 0x2c, 0x6a, 0xcb, 0xf5, 0x85, 0xd3, 0xe8, 0x67, 0x3d, 0x8f, 0x50, 0xad, 0xeb, 0x95, 0xeb, 0x0b, 0xa7, 0x31, 0x6f, 0xf4, 0x94, 0xdc, 0xbe, 0x86,
0x7c, 0x40, 0x5d, 0xb5, 0x88, 0x21, 0x1f, 0xc5, 0xbc, 0x56, 0xc4, 0x81, 0xd7, 0xbd, 0x9b, 0xfb, 0x58, 0x03, 0xd2, 0x0d, 0x60, 0x5d, 0x84, 0x73, 0xe8, 0xe4, 0x9f, 0xd6, 0x5d, 0xd2, 0x4b, 0xf9,
0xaf, 0xbb, 0xe7, 0xe3, 0xe6, 0xb1, 0xbc, 0xad, 0x28, 0xbb, 0x5f, 0x75, 0xe8, 0xae, 0x2b, 0xce, 0x2a, 0x81, 0xd2, 0x93, 0x53, 0x16, 0x27, 0x9d, 0xb9, 0x79, 0xfc, 0xdd, 0x24, 0x83, 0xe6, 0xfc,
0x46, 0x71, 0xf0, 0x04, 0xdd, 0xda, 0x32, 0x64, 0xf4, 0x91, 0x1e, 0xc0, 0xa2, 0x88, 0xfe, 0xc0, 0x57, 0x42, 0xa3, 0xf5, 0xa1, 0x15, 0x31, 0xbd, 0xf4, 0xd3, 0x7c, 0x53, 0xb5, 0xa3, 0xbc, 0x3b,
0xc9, 0x3f, 0x8d, 0x3b, 0xa8, 0x93, 0xd2, 0x79, 0x02, 0x65, 0x62, 0x4e, 0x79, 0x38, 0x6e, 0x4f, 0x8f, 0x3a, 0xa7, 0x8b, 0xa0, 0x07, 0xd5, 0xd6, 0x07, 0x97, 0x27, 0x8d, 0x98, 0x3f, 0x92, 0x9e,
0xb5, 0xa3, 0xef, 0x6d, 0xd4, 0x6f, 0x4e, 0xf7, 0x92, 0x49, 0x95, 0x3b, 0xde, 0x5a, 0xe0, 0x15, 0x40, 0x08, 0xf5, 0xb0, 0x53, 0x44, 0x35, 0xff, 0xdf, 0xa8, 0x16, 0xb7, 0xaa, 0x21, 0xbd, 0x97,
0x1d, 0xe7, 0xf4, 0x45, 0xc7, 0xeb, 0x4a, 0x63, 0x89, 0x1f, 0x51, 0x87, 0x29, 0x08, 0xa5, 0xd9, 0xb9, 0x9c, 0x53, 0xaa, 0x2e, 0xee, 0x6d, 0xb6, 0xb6, 0x71, 0xbe, 0xb5, 0x8d, 0x1f, 0x5b, 0xdb,
0x2e, 0x16, 0x31, 0xfd, 0xd7, 0x45, 0xd8, 0x37, 0xab, 0x26, 0x9d, 0x17, 0xb9, 0x9c, 0x53, 0xaa, 0xf8, 0x9a, 0xd9, 0xe6, 0x26, 0xb3, 0xcd, 0xf3, 0xcc, 0x36, 0x7f, 0x65, 0xb6, 0xf9, 0xed, 0xb7,
0x5e, 0x88, 0x5b, 0xff, 0xdf, 0x71, 0xdb, 0x77, 0x97, 0x2b, 0xab, 0x75, 0xb6, 0xb2, 0x5a, 0x3f, 0x6d, 0xbc, 0xbf, 0x51, 0xa9, 0xfd, 0x09, 0x00, 0x00, 0xff, 0xff, 0x7c, 0x5e, 0x19, 0x8e, 0x27,
0x57, 0x56, 0xeb, 0x6b, 0x66, 0x69, 0xcb, 0xcc, 0xd2, 0xce, 0x32, 0x4b, 0xfb, 0x95, 0x59, 0xda, 0x04, 0x00, 0x00,
0xb7, 0xdf, 0x56, 0xeb, 0xfd, 0xf5, 0xca, 0xeb, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x27, 0xd0,
0x2e, 0x38, 0xe3, 0x04, 0x00, 0x00,
} }

4
pkg/apis/storage/v1beta1/generated.proto
View File

@ -37,8 +37,6 @@ option go_package = "v1beta1";
// StorageClasses are non-namespaced; the name of the storage class // StorageClasses are non-namespaced; the name of the storage class
// according to etcd is in ObjectMeta.Name. // according to etcd is in ObjectMeta.Name.
message StorageClass { message StorageClass {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -55,8 +53,6 @@ message StorageClass {
// StorageClassList is a collection of storage classes. // StorageClassList is a collection of storage classes.
message StorageClassList { message StorageClassList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata // Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional

2
pkg/federation/apis/federation/doc.go
View File

@ -14,6 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
package federation package federation

4
pkg/federation/apis/federation/v1beta1/doc.go
View File

@ -14,8 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/federation/apis/federation
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta
package v1beta1 package v1beta1

214
pkg/federation/apis/federation/v1beta1/generated.pb.go
View File

@ -127,14 +127,6 @@ func (m *Cluster) MarshalTo(data []byte) (int, error) {
return 0, err return 0, err
} }
i += n3 i += n3
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n4, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n4
return i, nil return i, nil
} }
@ -164,19 +156,19 @@ func (m *ClusterCondition) MarshalTo(data []byte) (int, error) {
data[i] = 0x1a data[i] = 0x1a
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.LastProbeTime.Size())) i = encodeVarintGenerated(data, i, uint64(m.LastProbeTime.Size()))
n5, err := m.LastProbeTime.MarshalTo(data[i:]) n4, err := m.LastProbeTime.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n4
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.LastTransitionTime.Size()))
n5, err := m.LastTransitionTime.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n5 i += n5
data[i] = 0x22
i++
i = encodeVarintGenerated(data, i, uint64(m.LastTransitionTime.Size()))
n6, err := m.LastTransitionTime.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n6
data[i] = 0x2a data[i] = 0x2a
i++ i++
i = encodeVarintGenerated(data, i, uint64(len(m.Reason))) i = encodeVarintGenerated(data, i, uint64(len(m.Reason)))
@ -206,11 +198,11 @@ func (m *ClusterList) MarshalTo(data []byte) (int, error) {
data[i] = 0xa data[i] = 0xa
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size()))
n7, err := m.ListMeta.MarshalTo(data[i:]) n6, err := m.ListMeta.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n7 i += n6
if len(m.Items) > 0 { if len(m.Items) > 0 {
for _, msg := range m.Items { for _, msg := range m.Items {
data[i] = 0x12 data[i] = 0x12
@ -223,14 +215,6 @@ func (m *ClusterList) MarshalTo(data []byte) (int, error) {
i += n i += n
} }
} }
data[i] = 0x1a
i++
i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
n8, err := m.TypeMeta.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n8
return i, nil return i, nil
} }
@ -265,11 +249,11 @@ func (m *ClusterSpec) MarshalTo(data []byte) (int, error) {
data[i] = 0x12 data[i] = 0x12
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.SecretRef.Size())) i = encodeVarintGenerated(data, i, uint64(m.SecretRef.Size()))
n9, err := m.SecretRef.MarshalTo(data[i:]) n7, err := m.SecretRef.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n9 i += n7
} }
return i, nil return i, nil
} }
@ -385,8 +369,6 @@ func (m *Cluster) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.Status.Size() l = m.Status.Size()
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -419,8 +401,6 @@ func (m *ClusterList) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
} }
} }
l = m.TypeMeta.Size()
n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@ -491,7 +471,6 @@ func (this *Cluster) String() string {
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "ClusterSpec", "ClusterSpec", 1), `&`, ``, 1) + `,`, `Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "ClusterSpec", "ClusterSpec", 1), `&`, ``, 1) + `,`,
`Status:` + strings.Replace(strings.Replace(this.Status.String(), "ClusterStatus", "ClusterStatus", 1), `&`, ``, 1) + `,`, `Status:` + strings.Replace(strings.Replace(this.Status.String(), "ClusterStatus", "ClusterStatus", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -518,7 +497,6 @@ func (this *ClusterList) String() string {
s := strings.Join([]string{`&ClusterList{`, s := strings.Join([]string{`&ClusterList{`,
`ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`,
`Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Cluster", "Cluster", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Cluster", "Cluster", 1), `&`, ``, 1) + `,`,
`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -684,36 +662,6 @@ func (m *Cluster) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -1051,36 +999,6 @@ func (m *ClusterList) Unmarshal(data []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipGenerated(data[iNdEx:]) skippy, err := skipGenerated(data[iNdEx:])
@ -1569,58 +1487,56 @@ var (
) )
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 833 bytes of a gzipped FileDescriptorProto // 806 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x54, 0xcd, 0x6a, 0xeb, 0x46, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0xcd, 0x6a, 0xeb, 0x46,
0x14, 0xb6, 0xe2, 0xbf, 0x78, 0x52, 0xb7, 0x97, 0xa1, 0x05, 0xd5, 0x0b, 0xf9, 0x62, 0x4a, 0xf1, 0x14, 0xb6, 0xfc, 0x7b, 0x3d, 0xa9, 0xdb, 0xcb, 0xd0, 0x82, 0xeb, 0x85, 0x7c, 0x31, 0xa5, 0xf8,
0x2d, 0xad, 0x84, 0x4d, 0x29, 0x81, 0xd2, 0x42, 0xe4, 0x50, 0x08, 0x38, 0xa4, 0x4c, 0x42, 0x29, 0x96, 0x56, 0xc2, 0xa6, 0x94, 0x0b, 0xa5, 0x85, 0x2b, 0x5f, 0x0a, 0x01, 0x87, 0x94, 0x49, 0x28,
0xa1, 0x50, 0x64, 0xf9, 0x58, 0x51, 0x6d, 0x49, 0x66, 0x66, 0x64, 0x48, 0x56, 0x7d, 0x80, 0x2e, 0x25, 0x14, 0x8a, 0x2c, 0x1f, 0x2b, 0xaa, 0xad, 0x1f, 0x66, 0x46, 0x06, 0x67, 0xd5, 0x07, 0xe8,
0x0a, 0x7d, 0x85, 0x6e, 0xbb, 0xea, 0x4b, 0x64, 0x99, 0x45, 0x17, 0x59, 0x99, 0xc6, 0x7d, 0x8b, 0xa2, 0x0f, 0xd1, 0x37, 0x28, 0x7d, 0x87, 0xec, 0x9a, 0x45, 0x17, 0x59, 0x99, 0xc6, 0x7d, 0x8b,
0xac, 0xca, 0x8c, 0x46, 0xb2, 0x65, 0xc7, 0x69, 0x9a, 0xdc, 0x9d, 0xce, 0xd1, 0x39, 0xdf, 0x77, 0xac, 0xca, 0x8c, 0x46, 0xb2, 0x15, 0xc5, 0x69, 0x6f, 0xb2, 0xd3, 0x39, 0x3a, 0xe7, 0xfb, 0xbe,
0xe6, 0x3b, 0x3f, 0xe8, 0x70, 0xbc, 0xcf, 0x4c, 0x3f, 0xb2, 0xc6, 0xf1, 0x00, 0x68, 0x08, 0x1c, 0x39, 0x7f, 0xe8, 0xcd, 0xfc, 0x15, 0x33, 0xbc, 0xd0, 0x9c, 0xc7, 0x13, 0xa0, 0x01, 0x70, 0x60,
0x98, 0x35, 0x82, 0x21, 0x50, 0x87, 0xfb, 0x51, 0x68, 0x39, 0x53, 0x3f, 0x67, 0xcf, 0x3a, 0x03, 0xe6, 0x0c, 0xa6, 0x40, 0x6d, 0xee, 0x85, 0x81, 0x69, 0x47, 0x5e, 0xce, 0x5e, 0x0e, 0x26, 0xc0,
0xe0, 0x4e, 0xc7, 0xf2, 0x20, 0x14, 0x2e, 0x18, 0x9a, 0x53, 0x1a, 0xf1, 0x08, 0x7f, 0x9e, 0xa0, 0xed, 0x81, 0xe9, 0x42, 0x20, 0x5c, 0x30, 0x35, 0x22, 0x1a, 0xf2, 0x10, 0x7f, 0x9e, 0xa0, 0x18,
0x98, 0x4b, 0x14, 0x73, 0x99, 0x65, 0x0a, 0x94, 0x55, 0x5b, 0xa1, 0x34, 0x3e, 0xf3, 0x7c, 0x7e, 0x5b, 0x14, 0x63, 0x9b, 0x65, 0x08, 0x94, 0x5d, 0x5b, 0xa1, 0x74, 0x3e, 0x73, 0x3d, 0x7e, 0x1e,
0x11, 0x0f, 0x4c, 0x37, 0x0a, 0x2c, 0x2f, 0xf2, 0x22, 0x4b, 0x82, 0x0d, 0xe2, 0x91, 0xb4, 0xa4, 0x4f, 0x0c, 0x27, 0xf4, 0x4d, 0x37, 0x74, 0x43, 0x53, 0x82, 0x4d, 0xe2, 0x99, 0xb4, 0xa4, 0x21,
0x21, 0xbf, 0x12, 0x92, 0x86, 0x22, 0x11, 0x45, 0x05, 0x8e, 0x7b, 0xe1, 0x87, 0x40, 0x2f, 0xad, 0xbf, 0x12, 0x92, 0x8e, 0x22, 0x11, 0xa2, 0x7c, 0xdb, 0x39, 0xf7, 0x02, 0xa0, 0x2b, 0x33, 0x9a,
0xe9, 0xd8, 0x4b, 0xaa, 0x0c, 0x80, 0x3b, 0xd6, 0x6c, 0xa3, 0xb4, 0x86, 0xb5, 0x2d, 0x8b, 0xc6, 0xbb, 0x89, 0x4a, 0x1f, 0xb8, 0x6d, 0x2e, 0x0b, 0xd2, 0x3a, 0xe6, 0xbe, 0x2c, 0x1a, 0x07, 0xdc,
0x21, 0xf7, 0x03, 0xd8, 0x48, 0xf8, 0xe2, 0xbf, 0x12, 0x98, 0x7b, 0x01, 0x81, 0xb3, 0x91, 0xd7, 0xf3, 0xa1, 0x90, 0xf0, 0xc5, 0x7f, 0x25, 0x30, 0xe7, 0x1c, 0x7c, 0xbb, 0x90, 0x37, 0x2c, 0x56,
0xdd, 0x54, 0x52, 0x15, 0x67, 0x51, 0x60, 0x51, 0x4c, 0xdd, 0x4d, 0xae, 0x4f, 0xb7, 0xe7, 0x3c, 0x52, 0x89, 0x33, 0x29, 0xb0, 0x30, 0xa6, 0x4e, 0x91, 0xeb, 0xd3, 0xfd, 0x39, 0xf7, 0x3c, 0x65,
0xf0, 0x94, 0xce, 0xc3, 0xd1, 0x31, 0xf7, 0x27, 0x96, 0x1f, 0x72, 0xc6, 0xe9, 0x7a, 0x4a, 0xeb, 0x70, 0x7f, 0x74, 0xcc, 0xbd, 0x85, 0xe9, 0x05, 0x9c, 0x71, 0x7a, 0x37, 0xa5, 0xf7, 0x47, 0x19,
0xb7, 0x22, 0xaa, 0xf6, 0x26, 0x31, 0xe3, 0x40, 0xf1, 0xf7, 0x68, 0x57, 0x88, 0x34, 0x74, 0xb8, 0x35, 0x46, 0x8b, 0x98, 0x71, 0xa0, 0xf8, 0x7b, 0xf4, 0x4c, 0x14, 0x69, 0x6a, 0x73, 0xbb, 0xad,
0xa3, 0x6b, 0xaf, 0xb5, 0xf6, 0x5e, 0xb7, 0x6d, 0x6e, 0xf6, 0x6d, 0x3a, 0xf6, 0x44, 0xc3, 0xcc, 0xbd, 0xd0, 0xfa, 0x07, 0xc3, 0xbe, 0x51, 0xec, 0x5b, 0x34, 0x77, 0x45, 0xc3, 0x8c, 0xe5, 0xc0,
0x59, 0xc7, 0x3c, 0x19, 0xfc, 0x04, 0x2e, 0x3f, 0x06, 0xee, 0xd8, 0xf8, 0x7a, 0xde, 0x2c, 0x2c, 0x38, 0x9e, 0xfc, 0x04, 0x0e, 0x3f, 0x02, 0x6e, 0x5b, 0xf8, 0x72, 0xdd, 0x2d, 0x6d, 0xd6, 0x5d,
0xe6, 0x4d, 0xb4, 0xf4, 0x91, 0x0c, 0x0d, 0xbb, 0xa8, 0xc4, 0xa6, 0xe0, 0xea, 0x3b, 0x12, 0xf5, 0xb4, 0xf5, 0x91, 0x0c, 0x0d, 0x3b, 0xa8, 0xca, 0x22, 0x70, 0xda, 0x65, 0x89, 0xfa, 0xda, 0x78,
0xc0, 0x7c, 0xce, 0x34, 0x98, 0xaa, 0xcc, 0xd3, 0x29, 0xb8, 0xf6, 0x3b, 0x8a, 0xae, 0x24, 0x2c, 0xcc, 0x34, 0x18, 0x4a, 0xe6, 0x49, 0x04, 0x8e, 0xf5, 0x8e, 0xa2, 0xab, 0x0a, 0x8b, 0x48, 0x70,
0x22, 0xc1, 0xf1, 0x18, 0x55, 0x18, 0x77, 0x78, 0xcc, 0xf4, 0xa2, 0xa4, 0xe9, 0xbd, 0x8c, 0x46, 0x3c, 0x47, 0x75, 0xc6, 0x6d, 0x1e, 0xb3, 0x76, 0x45, 0xd2, 0x8c, 0x9e, 0x46, 0x23, 0xa1, 0xac,
0x42, 0xd9, 0xef, 0x2a, 0xa2, 0x4a, 0x62, 0x13, 0x45, 0x81, 0x7f, 0x40, 0xbb, 0xfc, 0x72, 0x0a, 0x77, 0x15, 0x51, 0x3d, 0xb1, 0x89, 0xa2, 0xe8, 0x5d, 0x57, 0xd0, 0x73, 0x15, 0x39, 0x0a, 0x83,
0xe2, 0x9d, 0x7a, 0x49, 0xd2, 0x99, 0x29, 0xdd, 0xea, 0x5c, 0xa4, 0x6a, 0x31, 0x53, 0x68, 0x21, 0xa9, 0x27, 0x20, 0xf0, 0x2b, 0x54, 0xe5, 0xab, 0x08, 0x64, 0xf1, 0x9a, 0xd6, 0x47, 0xa9, 0xc6,
0x34, 0x3b, 0x53, 0x59, 0xf6, 0x2b, 0x85, 0xbc, 0x9b, 0x7a, 0x48, 0x86, 0xd8, 0xba, 0x2d, 0xa2, 0xd3, 0x55, 0x04, 0xb7, 0xeb, 0xee, 0xfb, 0x77, 0xe3, 0x85, 0x9f, 0xc8, 0x0c, 0xfc, 0x5d, 0xa6,
0x57, 0xaa, 0x8e, 0x5e, 0x14, 0x0e, 0x7d, 0x51, 0x20, 0xde, 0x47, 0x25, 0x11, 0x20, 0x5b, 0x53, 0xbd, 0x2c, 0x73, 0xbf, 0xce, 0xd3, 0xde, 0xae, 0xbb, 0x0f, 0x4e, 0x82, 0x91, 0x61, 0xe6, 0x65,
0xb3, 0x3f, 0x4a, 0x15, 0x10, 0xe9, 0xf7, 0xf3, 0xe6, 0xfb, 0xeb, 0xf1, 0xc2, 0x4f, 0x64, 0x06, 0x62, 0x17, 0xb5, 0x16, 0x36, 0xe3, 0xdf, 0xd2, 0x70, 0x02, 0xa7, 0x9e, 0x0f, 0xaa, 0x34, 0x9f,
0xfe, 0x2e, 0x53, 0x66, 0x47, 0xe6, 0x7e, 0x9d, 0x7f, 0xd4, 0xfd, 0xbc, 0xf9, 0xe8, 0x9c, 0x99, 0xa4, 0xa5, 0xd9, 0x9d, 0xe1, 0xb4, 0xb3, 0xcc, 0x10, 0x7d, 0x13, 0xfd, 0x15, 0x19, 0xd6, 0x07,
0x19, 0xe6, 0x9a, 0x08, 0x1e, 0xaa, 0x4f, 0x1c, 0xc6, 0xbf, 0xa5, 0xd1, 0x00, 0xce, 0xfc, 0x00, 0x4a, 0x4a, 0x6b, 0xbc, 0x0b, 0x44, 0xf2, 0xb8, 0x78, 0x89, 0xb0, 0x70, 0x9c, 0x52, 0x3b, 0x60,
0x94, 0xf0, 0x9f, 0x3c, 0x51, 0x09, 0x3f, 0x00, 0xfb, 0x03, 0x55, 0x4a, 0xbd, 0xbf, 0x0a, 0x44, 0xc9, 0xe3, 0x04, 0x5b, 0xf5, 0xad, 0xd9, 0x3a, 0x8a, 0x0d, 0x8f, 0x0b, 0x68, 0xe4, 0x1e, 0x06,
0xf2, 0xb8, 0x78, 0x86, 0xb0, 0x70, 0x9c, 0x51, 0x27, 0x64, 0xc9, 0xe3, 0x04, 0x5b, 0xe9, 0x7f, 0xfc, 0x31, 0xaa, 0x53, 0xb0, 0x59, 0x18, 0xb4, 0x6b, 0xb2, 0x70, 0x59, 0xbf, 0x88, 0xf4, 0x12,
0xb3, 0x35, 0x14, 0x1b, 0xee, 0x6f, 0xa0, 0x91, 0x07, 0x18, 0xf0, 0xc7, 0xa8, 0x42, 0xc1, 0x61, 0xf5, 0x17, 0xbf, 0x44, 0x0d, 0x1f, 0x18, 0xb3, 0x5d, 0x68, 0xd7, 0x65, 0xe0, 0x7b, 0x2a, 0xb0,
0x51, 0xa8, 0x97, 0xa5, 0x70, 0xd9, 0x34, 0x10, 0xe9, 0x25, 0xea, 0x2f, 0x7e, 0x83, 0xaa, 0x01, 0x71, 0x94, 0xb8, 0x49, 0xfa, 0xbf, 0xf7, 0xa7, 0x86, 0x0e, 0x54, 0xab, 0xc6, 0x1e, 0xe3, 0xf8,
0x30, 0xe6, 0x78, 0xa0, 0x57, 0x64, 0xe0, 0x7b, 0x2a, 0xb0, 0x7a, 0x9c, 0xb8, 0x49, 0xfa, 0xbf, 0x87, 0xc2, 0x5a, 0x18, 0xff, 0xef, 0x41, 0x22, 0x5b, 0x2e, 0xc7, 0x73, 0xc5, 0xf5, 0x2c, 0xf5,
0xf5, 0xc7, 0x0e, 0xda, 0x53, 0xad, 0xea, 0xfb, 0x8c, 0x8b, 0x41, 0x5a, 0x5b, 0xba, 0x27, 0x0e, 0xec, 0xac, 0xc6, 0x04, 0xd5, 0x3c, 0x0e, 0xbe, 0x68, 0x7c, 0xa5, 0x7f, 0x30, 0xfc, 0xea, 0x49,
0x92, 0xc8, 0xce, 0x0f, 0x52, 0xea, 0x59, 0x59, 0xbc, 0x01, 0x2a, 0xfb, 0x1c, 0x02, 0xd1, 0xf8, 0x43, 0x6b, 0xb5, 0x14, 0x53, 0xed, 0x50, 0x60, 0x92, 0x04, 0xba, 0xf7, 0x5b, 0x39, 0x7b, 0x91,
0x62, 0x7b, 0xaf, 0xfb, 0xd5, 0x8b, 0x56, 0xc2, 0xae, 0x2b, 0xa6, 0xf2, 0x91, 0xc0, 0x24, 0x09, 0xd8, 0x17, 0xfc, 0xbb, 0x86, 0x3a, 0x0c, 0xe8, 0x12, 0xe8, 0xeb, 0xe9, 0x94, 0x02, 0x63, 0xd6,
0x74, 0x6e, 0x15, 0x8a, 0x6f, 0x7d, 0x15, 0x7e, 0x5f, 0xea, 0x25, 0x76, 0x1d, 0xff, 0xa9, 0xa1, 0x6a, 0xb4, 0xf0, 0x20, 0xe0, 0xa3, 0xc3, 0x37, 0x84, 0xb5, 0x35, 0xa9, 0xe4, 0xf8, 0x71, 0x4a,
0x06, 0x03, 0x3a, 0x03, 0x7a, 0x30, 0x1c, 0x52, 0x60, 0xcc, 0xbe, 0xec, 0x4d, 0x7c, 0x08, 0x79, 0x4e, 0xf6, 0xe1, 0x5a, 0x3d, 0xa5, 0xad, 0xb3, 0x37, 0x84, 0x91, 0x07, 0x64, 0xe1, 0x1f, 0x51,
0xef, 0xe8, 0x90, 0x30, 0x5d, 0x93, 0xef, 0x3c, 0x79, 0xde, 0x3b, 0x4f, 0xb7, 0xe1, 0xda, 0x2d, 0x93, 0x81, 0x43, 0x81, 0x13, 0x98, 0xa9, 0x4b, 0x32, 0x7c, 0xf8, 0x3e, 0x8d, 0x43, 0xc7, 0x5e,
0x55, 0x61, 0x63, 0x6b, 0x08, 0x23, 0x8f, 0x94, 0x85, 0x7f, 0x44, 0x35, 0x06, 0x2e, 0x05, 0x4e, 0x24, 0x07, 0x89, 0xc0, 0x0c, 0x28, 0x04, 0x0e, 0x58, 0xad, 0xcd, 0xba, 0xdb, 0x3c, 0x49, 0x81,
0x60, 0xa4, 0xae, 0x60, 0xf7, 0xf1, 0xdb, 0xda, 0x8f, 0x5c, 0x67, 0x92, 0x1c, 0x53, 0x02, 0x23, 0xc8, 0x16, 0xb3, 0xf7, 0x97, 0x86, 0x5a, 0xb9, 0xed, 0xc7, 0x17, 0x08, 0x39, 0xe9, 0x66, 0xa5,
0xa0, 0x10, 0xba, 0x60, 0xd7, 0x17, 0xf3, 0x66, 0xed, 0x34, 0x05, 0x22, 0x4b, 0xcc, 0xd6, 0x5f, 0x75, 0xf9, 0xe6, 0x49, 0x1d, 0xca, 0x16, 0x75, 0x7b, 0x31, 0x33, 0x17, 0x23, 0x3b, 0x6c, 0xb8,
0x1a, 0xaa, 0xe7, 0x2e, 0x17, 0xbe, 0x42, 0xc8, 0x4d, 0xf7, 0x36, 0xd5, 0xe5, 0x9b, 0x17, 0xf5, 0x8b, 0x6a, 0x17, 0x61, 0x00, 0xac, 0x5d, 0x7b, 0x51, 0xe9, 0x37, 0xad, 0xa6, 0xe8, 0xea, 0x99,
0x3f, 0x3b, 0x03, 0xcb, 0x6b, 0x9f, 0xb9, 0x18, 0x59, 0x61, 0xc3, 0x4d, 0x54, 0xbe, 0x8a, 0x42, 0x70, 0x90, 0xc4, 0x9f, 0x8c, 0xbe, 0xeb, 0x85, 0x81, 0x9a, 0xe8, 0x9d, 0xd1, 0x17, 0x5e, 0xa2,
0x60, 0x7a, 0xf9, 0x75, 0xb1, 0x5d, 0xb3, 0x6b, 0x62, 0x66, 0xce, 0x85, 0x83, 0x24, 0xfe, 0x64, 0xfe, 0xf6, 0x7e, 0xd1, 0xd0, 0x87, 0x7b, 0x4b, 0x8e, 0x87, 0x08, 0x39, 0x99, 0xa5, 0x2e, 0xd7,
0xb1, 0x3c, 0x3f, 0x0a, 0xd5, 0xbe, 0xac, 0x2c, 0x96, 0xf0, 0x12, 0xf5, 0xb7, 0xf5, 0x8b, 0x86, 0x56, 0x5a, 0xf6, 0x87, 0xec, 0x44, 0xe1, 0x2f, 0x51, 0x2b, 0xd7, 0x27, 0x75, 0xb4, 0xb2, 0x4b,
0x3e, 0xdc, 0x2a, 0x39, 0xee, 0x22, 0xe4, 0x66, 0x96, 0xba, 0x8b, 0xcb, 0xd2, 0xb2, 0x3f, 0x64, 0x91, 0x63, 0x23, 0xf9, 0x58, 0xeb, 0xe5, 0xe5, 0x8d, 0x5e, 0xba, 0xba, 0xd1, 0x4b, 0xd7, 0x37,
0x25, 0x0a, 0x7f, 0x89, 0xea, 0xb9, 0x3e, 0xa9, 0x93, 0x98, 0xdd, 0xa1, 0x1c, 0x1b, 0xc9, 0xc7, 0x7a, 0xe9, 0xe7, 0x8d, 0xae, 0x5d, 0x6e, 0x74, 0xed, 0x6a, 0xa3, 0x6b, 0x7f, 0x6f, 0x74, 0xed,
0xda, 0x6f, 0xae, 0xef, 0x8c, 0xc2, 0xcd, 0x9d, 0x51, 0xb8, 0xbd, 0x33, 0x0a, 0x3f, 0x2f, 0x0c, 0xd7, 0x7f, 0xf4, 0xd2, 0x59, 0x43, 0xd5, 0xec, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x15, 0xe8,
0xed, 0x7a, 0x61, 0x68, 0x37, 0x0b, 0x43, 0xfb, 0x7b, 0x61, 0x68, 0xbf, 0xfe, 0x63, 0x14, 0xce, 0xc4, 0x9a, 0x7c, 0x08, 0x00, 0x00,
0xab, 0x4a, 0xb3, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xbe, 0x25, 0xcc, 0x27, 0x38, 0x09, 0x00,
0x00,
} }

4
pkg/federation/apis/federation/v1beta1/generated.proto
View File

@ -33,8 +33,6 @@ option go_package = "v1beta1";
// Information about a registered cluster in a federated kubernetes setup. Clusters are not namespaced and have unique names in the federation. // Information about a registered cluster in a federated kubernetes setup. Clusters are not namespaced and have unique names in the federation.
message Cluster { message Cluster {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -76,8 +74,6 @@ message ClusterCondition {
// A list of all the kubernetes clusters registered to the federation // A list of all the kubernetes clusters registered to the federation
message ClusterList { message ClusterList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional

7
pkg/util/intstr/intstr.go
View File

@ -24,7 +24,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"k8s.io/apimachinery/pkg/genericapiserver/openapi/common" "k8s.io/apimachinery/pkg/openapi"
"github.com/go-openapi/spec" "github.com/go-openapi/spec"
"github.com/golang/glog" "github.com/golang/glog"
@ -39,7 +39,6 @@ import (
// //
// +protobuf=true // +protobuf=true
// +protobuf.options.(gogoproto.goproto_stringer)=false // +protobuf.options.(gogoproto.goproto_stringer)=false
// +k8s:openapi-gen=true
type IntOrString struct { type IntOrString struct {
Type Type `protobuf:"varint,1,opt,name=type,casttype=Type"` Type Type `protobuf:"varint,1,opt,name=type,casttype=Type"`
IntVal int32 `protobuf:"varint,2,opt,name=intVal"` IntVal int32 `protobuf:"varint,2,opt,name=intVal"`
@ -120,8 +119,8 @@ func (intstr IntOrString) MarshalJSON() ([]byte, error) {
} }
} }
func (_ IntOrString) OpenAPIDefinition() common.OpenAPIDefinition { func (_ IntOrString) OpenAPIDefinition() openapi.OpenAPIDefinition {
return common.OpenAPIDefinition{ return openapi.OpenAPIDefinition{
Schema: spec.Schema{ Schema: spec.Schema{
SchemaProps: spec.SchemaProps{ SchemaProps: spec.SchemaProps{
Type: []string{"string"}, Type: []string{"string"},

14
pkg/util/labels/labels.go
View File

@ -17,14 +17,12 @@ limitations under the License.
package labels package labels
import ( import (
"fmt"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
) )
// Clones the given map and returns a new map with the given key and value added. // Clones the given map and returns a new map with the given key and value added.
// Returns the given map, if labelKey is empty. // Returns the given map, if labelKey is empty.
func CloneAndAddLabel(labels map[string]string, labelKey string, labelValue uint32) map[string]string { func CloneAndAddLabel(labels map[string]string, labelKey, labelValue string) map[string]string {
if labelKey == "" { if labelKey == "" {
// Don't need to add a label. // Don't need to add a label.
return labels return labels
@ -34,7 +32,7 @@ func CloneAndAddLabel(labels map[string]string, labelKey string, labelValue uint
for key, value := range labels { for key, value := range labels {
newLabels[key] = value newLabels[key] = value
} }
newLabels[labelKey] = fmt.Sprintf("%d", labelValue) newLabels[labelKey] = labelValue
return newLabels return newLabels
} }
@ -55,7 +53,7 @@ func CloneAndRemoveLabel(labels map[string]string, labelKey string) map[string]s
} }
// AddLabel returns a map with the given key and value added to the given map. // AddLabel returns a map with the given key and value added to the given map.
func AddLabel(labels map[string]string, labelKey string, labelValue string) map[string]string { func AddLabel(labels map[string]string, labelKey, labelValue string) map[string]string {
if labelKey == "" { if labelKey == "" {
// Don't need to add a label. // Don't need to add a label.
return labels return labels
@ -69,7 +67,7 @@ func AddLabel(labels map[string]string, labelKey string, labelValue string) map[
// Clones the given selector and returns a new selector with the given key and value added. // Clones the given selector and returns a new selector with the given key and value added.
// Returns the given selector, if labelKey is empty. // Returns the given selector, if labelKey is empty.
func CloneSelectorAndAddLabel(selector *metav1.LabelSelector, labelKey string, labelValue uint32) *metav1.LabelSelector { func CloneSelectorAndAddLabel(selector *metav1.LabelSelector, labelKey, labelValue string) *metav1.LabelSelector {
if labelKey == "" { if labelKey == "" {
// Don't need to add a label. // Don't need to add a label.
return selector return selector
@ -85,7 +83,7 @@ func CloneSelectorAndAddLabel(selector *metav1.LabelSelector, labelKey string, l
newSelector.MatchLabels[key] = val newSelector.MatchLabels[key] = val
} }
} }
newSelector.MatchLabels[labelKey] = fmt.Sprintf("%d", labelValue) newSelector.MatchLabels[labelKey] = labelValue
if selector.MatchExpressions != nil { if selector.MatchExpressions != nil {
newMExps := make([]metav1.LabelSelectorRequirement, len(selector.MatchExpressions)) newMExps := make([]metav1.LabelSelectorRequirement, len(selector.MatchExpressions))
@ -108,7 +106,7 @@ func CloneSelectorAndAddLabel(selector *metav1.LabelSelector, labelKey string, l
} }
// AddLabelToSelector returns a selector with the given key and value added to the given selector's MatchLabels. // AddLabelToSelector returns a selector with the given key and value added to the given selector's MatchLabels.
func AddLabelToSelector(selector *metav1.LabelSelector, labelKey string, labelValue string) *metav1.LabelSelector { func AddLabelToSelector(selector *metav1.LabelSelector, labelKey, labelValue string) *metav1.LabelSelector {
if labelKey == "" { if labelKey == "" {
// Don't need to add a label. // Don't need to add a label.
return selector return selector

215
pkg/util/strategicpatch/patch.go
View File

@ -20,6 +20,7 @@ import (
"fmt" "fmt"
"reflect" "reflect"
"sort" "sort"
"strings"
"k8s.io/apimachinery/pkg/util/json" "k8s.io/apimachinery/pkg/util/json"
forkedjson "k8s.io/client-go/pkg/third_party/forked/golang/json" forkedjson "k8s.io/client-go/pkg/third_party/forked/golang/json"
@ -43,6 +44,8 @@ const (
deleteDirective = "delete" deleteDirective = "delete"
replaceDirective = "replace" replaceDirective = "replace"
mergeDirective = "merge" mergeDirective = "merge"
deleteFromPrimitiveListDirectivePrefix = "$deleteFromPrimitiveList"
) )
// IsPreconditionFailed returns true if the provided error indicates // IsPreconditionFailed returns true if the provided error indicates
@ -87,6 +90,7 @@ func IsConflict(err error) bool {
var errBadJSONDoc = fmt.Errorf("Invalid JSON document") var errBadJSONDoc = fmt.Errorf("Invalid JSON document")
var errNoListOfLists = fmt.Errorf("Lists of lists are not supported") var errNoListOfLists = fmt.Errorf("Lists of lists are not supported")
var errBadPatchFormatForPrimitiveList = fmt.Errorf("Invalid patch format of primitive list")
// The following code is adapted from github.com/openshift/origin/pkg/util/jsonmerge. // The following code is adapted from github.com/openshift/origin/pkg/util/jsonmerge.
// Instead of defining a Delta that holds an original, a patch and a set of preconditions, // Instead of defining a Delta that holds an original, a patch and a set of preconditions,
@ -194,6 +198,7 @@ func diffMaps(original, modified map[string]interface{}, t reflect.Type, ignoreC
continue continue
} }
// The patch has a patch directive
if key == directiveMarker { if key == directiveMarker {
originalString, ok := originalValue.(string) originalString, ok := originalValue.(string)
if !ok { if !ok {
@ -248,13 +253,19 @@ func diffMaps(original, modified map[string]interface{}, t reflect.Type, ignoreC
} }
if fieldPatchStrategy == mergeDirective { if fieldPatchStrategy == mergeDirective {
patchValue, err := diffLists(originalValueTyped, modifiedValueTyped, fieldType.Elem(), fieldPatchMergeKey, ignoreChangesAndAdditions, ignoreDeletions) addList, deletionList, err := diffLists(originalValueTyped, modifiedValueTyped, fieldType.Elem(), fieldPatchMergeKey, ignoreChangesAndAdditions, ignoreDeletions)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if len(patchValue) > 0 { if len(addList) > 0 {
patch[key] = patchValue patch[key] = addList
}
// generate a parallel list for deletion
if len(deletionList) > 0 {
parallelDeletionListKey := fmt.Sprintf("%s/%s", deleteFromPrimitiveListDirectivePrefix, key)
patch[parallelDeletionListKey] = deletionList
} }
continue continue
@ -282,77 +293,99 @@ func diffMaps(original, modified map[string]interface{}, t reflect.Type, ignoreC
return patch, nil return patch, nil
} }
// Returns a (recursive) strategic merge patch that yields modified when applied to original, // Returns a (recursive) strategic merge patch and a parallel deletion list if necessary.
// for a pair of lists with merge semantics. // Only list of primitives with merge strategy will generate a parallel deletion list.
func diffLists(original, modified []interface{}, t reflect.Type, mergeKey string, ignoreChangesAndAdditions, ignoreDeletions bool) ([]interface{}, error) { // These two lists should yield modified when applied to original, for lists with merge semantics.
func diffLists(original, modified []interface{}, t reflect.Type, mergeKey string, ignoreChangesAndAdditions, ignoreDeletions bool) ([]interface{}, []interface{}, error) {
if len(original) == 0 { if len(original) == 0 {
// Both slices are empty - do nothing
if len(modified) == 0 || ignoreChangesAndAdditions { if len(modified) == 0 || ignoreChangesAndAdditions {
return nil, nil return nil, nil, nil
} }
return modified, nil // Old slice was empty - add all elements from the new slice
return modified, nil, nil
} }
elementType, err := sliceElementType(original, modified) elementType, err := sliceElementType(original, modified)
if err != nil { if err != nil {
return nil, err return nil, nil, err
} }
var patch []interface{} switch elementType.Kind() {
case reflect.Map:
if elementType.Kind() == reflect.Map { patchList, err := diffListsOfMaps(original, modified, t, mergeKey, ignoreChangesAndAdditions, ignoreDeletions)
patch, err = diffListsOfMaps(original, modified, t, mergeKey, ignoreChangesAndAdditions, ignoreDeletions) return patchList, nil, err
} else if !ignoreChangesAndAdditions { case reflect.Slice:
patch, err = diffListsOfScalars(original, modified) // Lists of Lists are not permitted by the api
return nil, nil, errNoListOfLists
default:
return diffListsOfScalars(original, modified, ignoreChangesAndAdditions, ignoreDeletions)
} }
if err != nil {
return nil, err
}
return patch, nil
} }
// Returns a (recursive) strategic merge patch that yields modified when applied to original, // diffListsOfScalars returns 2 lists, the first one is addList and the second one is deletionList.
// for a pair of lists of scalars with merge semantics. // Argument ignoreChangesAndAdditions controls if calculate addList. true means not calculate.
func diffListsOfScalars(original, modified []interface{}) ([]interface{}, error) { // Argument ignoreDeletions controls if calculate deletionList. true means not calculate.
if len(modified) == 0 { func diffListsOfScalars(original, modified []interface{}, ignoreChangesAndAdditions, ignoreDeletions bool) ([]interface{}, []interface{}, error) {
// There is no need to check the length of original because there is no way to create // Sort the scalars for easier calculating the diff
// a patch that deletes a scalar from a list of scalars with merge semantics. originalScalars := sortScalars(original)
return nil, nil modifiedScalars := sortScalars(modified)
}
patch := []interface{}{}
originalScalars := uniqifyAndSortScalars(original)
modifiedScalars := uniqifyAndSortScalars(modified)
originalIndex, modifiedIndex := 0, 0 originalIndex, modifiedIndex := 0, 0
addList := []interface{}{}
deletionList := []interface{}{}
loopB: originalInBounds := originalIndex < len(originalScalars)
for ; modifiedIndex < len(modifiedScalars); modifiedIndex++ { modifiedInBounds := modifiedIndex < len(modifiedScalars)
for ; originalIndex < len(originalScalars); originalIndex++ { bothInBounds := originalInBounds && modifiedInBounds
originalString := fmt.Sprintf("%v", original[originalIndex]) for originalInBounds || modifiedInBounds {
modifiedString := fmt.Sprintf("%v", modified[modifiedIndex])
if originalString >= modifiedString {
if originalString != modifiedString {
patch = append(patch, modified[modifiedIndex])
}
continue loopB // we need to compare the string representation of the scalar,
} // because the scalar is an interface which doesn't support neither < nor <
// There is no else clause because there is no way to create a patch that deletes // And that's how func sortScalars compare scalars.
// a scalar from a list of scalars with merge semantics. var originalString, modifiedString string
if originalInBounds {
originalString = fmt.Sprintf("%v", originalScalars[originalIndex])
} }
break if modifiedInBounds {
modifiedString = fmt.Sprintf("%v", modifiedScalars[modifiedIndex])
}
switch {
// scalars are identical
case bothInBounds && originalString == modifiedString:
originalIndex++
modifiedIndex++
// only modified is in bound
case !originalInBounds:
fallthrough
// modified has additional scalar
case bothInBounds && originalString > modifiedString:
if !ignoreChangesAndAdditions {
modifiedValue := modifiedScalars[modifiedIndex]
addList = append(addList, modifiedValue)
}
modifiedIndex++
// only original is in bound
case !modifiedInBounds:
fallthrough
// original has additional scalar
case bothInBounds && originalString < modifiedString:
if !ignoreDeletions {
originalValue := originalScalars[originalIndex]
deletionList = append(deletionList, originalValue)
}
originalIndex++
}
originalInBounds = originalIndex < len(originalScalars)
modifiedInBounds = modifiedIndex < len(modifiedScalars)
bothInBounds = originalInBounds && modifiedInBounds
} }
// Add any remaining items found only in modified return addList, deletionList, nil
for ; modifiedIndex < len(modifiedScalars); modifiedIndex++ {
patch = append(patch, modified[modifiedIndex])
}
return patch, nil
} }
var errNoMergeKeyFmt = "map: %v does not contain declared merge key: %s" var errNoMergeKeyFmt = "map: %v does not contain declared merge key: %s"
@ -496,7 +529,7 @@ func StrategicMergePatch(original, patch []byte, dataStruct interface{}) ([]byte
return nil, err return nil, err
} }
result, err := mergeMap(originalMap, patchMap, t) result, err := mergeMap(originalMap, patchMap, t, true)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -526,7 +559,8 @@ var errBadPatchTypeFmt = "unknown patch type: %s in map: %v"
// Merge fields from a patch map into the original map. Note: This may modify // Merge fields from a patch map into the original map. Note: This may modify
// both the original map and the patch because getting a deep copy of a map in // both the original map and the patch because getting a deep copy of a map in
// golang is highly non-trivial. // golang is highly non-trivial.
func mergeMap(original, patch map[string]interface{}, t reflect.Type) (map[string]interface{}, error) { // flag mergeDeleteList controls if using the parallel list to delete or keeping the list.
func mergeMap(original, patch map[string]interface{}, t reflect.Type, mergeDeleteList bool) (map[string]interface{}, error) {
if v, ok := patch[directiveMarker]; ok { if v, ok := patch[directiveMarker]; ok {
if v == replaceDirective { if v == replaceDirective {
// If the patch contains "$patch: replace", don't merge it, just use the // If the patch contains "$patch: replace", don't merge it, just use the
@ -553,6 +587,23 @@ func mergeMap(original, patch map[string]interface{}, t reflect.Type) (map[strin
// Start merging the patch into the original. // Start merging the patch into the original.
for k, patchV := range patch { for k, patchV := range patch {
// If found a parallel list for deletion and we are going to merge the list,
// overwrite the key to the original key and set flag isDeleteList
isDeleteList := false
foundParallelListPrefix := strings.HasPrefix(k, deleteFromPrimitiveListDirectivePrefix)
if foundParallelListPrefix {
if !mergeDeleteList {
original[k] = patchV
continue
}
substrings := strings.SplitN(k, "/", 2)
if len(substrings) <= 1 {
return nil, errBadPatchFormatForPrimitiveList
}
isDeleteList = true
k = substrings[1]
}
// If the value of this key is null, delete the key if it exists in the // If the value of this key is null, delete the key if it exists in the
// original. Otherwise, skip it. // original. Otherwise, skip it.
if patchV == nil { if patchV == nil {
@ -589,7 +640,7 @@ func mergeMap(original, patch map[string]interface{}, t reflect.Type) (map[strin
typedOriginal := original[k].(map[string]interface{}) typedOriginal := original[k].(map[string]interface{})
typedPatch := patchV.(map[string]interface{}) typedPatch := patchV.(map[string]interface{})
var err error var err error
original[k], err = mergeMap(typedOriginal, typedPatch, fieldType) original[k], err = mergeMap(typedOriginal, typedPatch, fieldType, mergeDeleteList)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -602,7 +653,7 @@ func mergeMap(original, patch map[string]interface{}, t reflect.Type) (map[strin
typedOriginal := original[k].([]interface{}) typedOriginal := original[k].([]interface{})
typedPatch := patchV.([]interface{}) typedPatch := patchV.([]interface{})
var err error var err error
original[k], err = mergeSlice(typedOriginal, typedPatch, elemType, fieldPatchMergeKey) original[k], err = mergeSlice(typedOriginal, typedPatch, elemType, fieldPatchMergeKey, mergeDeleteList, isDeleteList)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -623,7 +674,7 @@ func mergeMap(original, patch map[string]interface{}, t reflect.Type) (map[strin
// Merge two slices together. Note: This may modify both the original slice and // Merge two slices together. Note: This may modify both the original slice and
// the patch because getting a deep copy of a slice in golang is highly // the patch because getting a deep copy of a slice in golang is highly
// non-trivial. // non-trivial.
func mergeSlice(original, patch []interface{}, elemType reflect.Type, mergeKey string) ([]interface{}, error) { func mergeSlice(original, patch []interface{}, elemType reflect.Type, mergeKey string, mergeDeleteList, isDeleteList bool) ([]interface{}, error) {
if len(original) == 0 && len(patch) == 0 { if len(original) == 0 && len(patch) == 0 {
return original, nil return original, nil
} }
@ -636,6 +687,9 @@ func mergeSlice(original, patch []interface{}, elemType reflect.Type, mergeKey s
// If the elements are not maps, merge the slices of scalars. // If the elements are not maps, merge the slices of scalars.
if t.Kind() != reflect.Map { if t.Kind() != reflect.Map {
if mergeDeleteList && isDeleteList {
return deleteFromSlice(original, patch), nil
}
// Maybe in the future add a "concat" mode that doesn't // Maybe in the future add a "concat" mode that doesn't
// uniqify. // uniqify.
both := append(original, patch...) both := append(original, patch...)
@ -711,7 +765,7 @@ func mergeSlice(original, patch []interface{}, elemType reflect.Type, mergeKey s
var mergedMaps interface{} var mergedMaps interface{}
var err error var err error
// Merge into original. // Merge into original.
mergedMaps, err = mergeMap(originalMap, typedV, elemType) mergedMaps, err = mergeMap(originalMap, typedV, elemType, mergeDeleteList)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -725,6 +779,34 @@ func mergeSlice(original, patch []interface{}, elemType reflect.Type, mergeKey s
return original, nil return original, nil
} }
// deleteFromSlice uses the parallel list to delete the items in a list of scalars
func deleteFromSlice(current, toDelete []interface{}) []interface{} {
currentScalars := uniqifyAndSortScalars(current)
toDeleteScalars := uniqifyAndSortScalars(toDelete)
currentIndex, toDeleteIndex := 0, 0
mergedList := []interface{}{}
for currentIndex < len(currentScalars) && toDeleteIndex < len(toDeleteScalars) {
originalString := fmt.Sprintf("%v", currentScalars[currentIndex])
modifiedString := fmt.Sprintf("%v", toDeleteScalars[toDeleteIndex])
switch {
// found an item to delete
case originalString == modifiedString:
currentIndex++
// Request to delete an item that was not found in the current list
case originalString > modifiedString:
toDeleteIndex++
// Found an item that was not part of the deletion list, keep it
case originalString < modifiedString:
mergedList = append(mergedList, currentScalars[currentIndex])
currentIndex++
}
}
return append(mergedList, currentScalars[currentIndex:]...)
}
// This method no longer panics if any element of the slice is not a map. // This method no longer panics if any element of the slice is not a map.
func findMapInSliceBasedOnKeyValue(m []interface{}, key string, value interface{}) (map[string]interface{}, int, bool, error) { func findMapInSliceBasedOnKeyValue(m []interface{}, key string, value interface{}) (map[string]interface{}, int, bool, error) {
for k, v := range m { for k, v := range m {
@ -761,10 +843,17 @@ func sortMergeListsByName(mapJSON []byte, dataStruct interface{}) ([]byte, error
return json.Marshal(newM) return json.Marshal(newM)
} }
// Function sortMergeListsByNameMap recursively sorts the merge lists by its mergeKey in a map.
func sortMergeListsByNameMap(s map[string]interface{}, t reflect.Type) (map[string]interface{}, error) { func sortMergeListsByNameMap(s map[string]interface{}, t reflect.Type) (map[string]interface{}, error) {
newS := map[string]interface{}{} newS := map[string]interface{}{}
for k, v := range s { for k, v := range s {
if k != directiveMarker { if strings.HasPrefix(k, deleteFromPrimitiveListDirectivePrefix) {
typedV, ok := v.([]interface{})
if !ok {
return nil, errBadPatchFormatForPrimitiveList
}
v = uniqifyAndSortScalars(typedV)
} else if k != directiveMarker {
fieldType, fieldPatchStrategy, fieldPatchMergeKey, err := forkedjson.LookupPatchMetadata(t, k) fieldType, fieldPatchStrategy, fieldPatchMergeKey, err := forkedjson.LookupPatchMetadata(t, k)
if err != nil { if err != nil {
return nil, err return nil, err
@ -794,6 +883,7 @@ func sortMergeListsByNameMap(s map[string]interface{}, t reflect.Type) (map[stri
return newS, nil return newS, nil
} }
// Function sortMergeListsByNameMap recursively sorts the merge lists by its mergeKey in an array.
func sortMergeListsByNameArray(s []interface{}, elemType reflect.Type, mergeKey string, recurse bool) ([]interface{}, error) { func sortMergeListsByNameArray(s []interface{}, elemType reflect.Type, mergeKey string, recurse bool) ([]interface{}, error) {
if len(s) == 0 { if len(s) == 0 {
return s, nil return s, nil
@ -883,7 +973,10 @@ func (ss SortableSliceOfMaps) Swap(i, j int) {
func uniqifyAndSortScalars(s []interface{}) []interface{} { func uniqifyAndSortScalars(s []interface{}) []interface{} {
s = uniqifyScalars(s) s = uniqifyScalars(s)
return sortScalars(s)
}
func sortScalars(s []interface{}) []interface{} {
ss := SortableSliceOfScalars{s} ss := SortableSliceOfScalars{s}
sort.Sort(ss) sort.Sort(ss)
return ss.s return ss.s
@ -1217,7 +1310,7 @@ func CreateThreeWayMergePatch(original, modified, current []byte, dataStruct int
return nil, err return nil, err
} }
patchMap, err := mergeMap(deletionsMap, deltaMap, t) patchMap, err := mergeMap(deletionsMap, deltaMap, t, false)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
pkg/util/workqueue/doc.go
View File

@ -23,4 +23,4 @@ limitations under the License.
// * Multiple consumers and producers. In particular, it is allowed for an // * Multiple consumers and producers. In particular, it is allowed for an
// item to be reenqueued while it is being processed. // item to be reenqueued while it is being processed.
// * Shutdown notifications. // * Shutdown notifications.
package workqueue // import "k8s.io/client-go/pkg/util/workqueue" package workqueue

1
pkg/version/doc.go
View File

@ -16,5 +16,4 @@ limitations under the License.
// Package version supplies version information collected at build time to // Package version supplies version information collected at build time to
// kubernetes components. // kubernetes components.
// +k8s:openapi-gen=true
package version package version

1
tools/cache/controller.go vendored
View File

@ -70,6 +70,7 @@ type controller struct {
type Controller interface { type Controller interface {
Run(stopCh <-chan struct{}) Run(stopCh <-chan struct{})
HasSynced() bool HasSynced() bool
LastSyncResourceVersion() string
} }
// New makes a new Controller from the given Config. // New makes a new Controller from the given Config.

4
tools/cache/shared_informer.go vendored
View File

@ -211,10 +211,10 @@ func (s *sharedIndexInformer) LastSyncResourceVersion() string {
s.startedLock.Lock() s.startedLock.Lock()
defer s.startedLock.Unlock() defer s.startedLock.Unlock()
if s.controller == nil || s.controller.reflector == nil { if s.controller == nil {
return "" return ""
} }
return s.controller.reflector.LastSyncResourceVersion() return s.controller.LastSyncResourceVersion()
} }
func (s *sharedIndexInformer) GetStore() Store { func (s *sharedIndexInformer) GetStore() Store {

27
vendor/k8s.io/apimachinery/pkg/apimachinery/registered/registered.go generated vendored
View File

@ -19,7 +19,6 @@ package registered
import ( import (
"fmt" "fmt"
"os"
"sort" "sort"
"strings" "strings"
@ -31,10 +30,6 @@ import (
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
) )
var (
DefaultAPIRegistrationManager = NewOrDie(os.Getenv("KUBE_API_VERSIONS"))
)
// APIRegistrationManager provides the concept of what API groups are enabled. // APIRegistrationManager provides the concept of what API groups are enabled.
// //
// TODO: currently, it also provides a "registered" concept. But it's wrong to // TODO: currently, it also provides a "registered" concept. But it's wrong to
@ -99,28 +94,6 @@ func NewOrDie(kubeAPIVersions string) *APIRegistrationManager {
return m return m
} }
// People are calling global functions. Let them continue to do that (for now).
var (
ValidateEnvRequestedVersions = DefaultAPIRegistrationManager.ValidateEnvRequestedVersions
AllPreferredGroupVersions = DefaultAPIRegistrationManager.AllPreferredGroupVersions
RESTMapper = DefaultAPIRegistrationManager.RESTMapper
GroupOrDie = DefaultAPIRegistrationManager.GroupOrDie
AddThirdPartyAPIGroupVersions = DefaultAPIRegistrationManager.AddThirdPartyAPIGroupVersions
IsThirdPartyAPIGroupVersion = DefaultAPIRegistrationManager.IsThirdPartyAPIGroupVersion
RegisteredGroupVersions = DefaultAPIRegistrationManager.RegisteredGroupVersions
IsRegisteredVersion = DefaultAPIRegistrationManager.IsRegisteredVersion
IsRegistered = DefaultAPIRegistrationManager.IsRegistered
Group = DefaultAPIRegistrationManager.Group
EnabledVersionsForGroup = DefaultAPIRegistrationManager.EnabledVersionsForGroup
EnabledVersions = DefaultAPIRegistrationManager.EnabledVersions
IsEnabledVersion = DefaultAPIRegistrationManager.IsEnabledVersion
IsAllowedVersion = DefaultAPIRegistrationManager.IsAllowedVersion
EnableVersions = DefaultAPIRegistrationManager.EnableVersions
RegisterGroup = DefaultAPIRegistrationManager.RegisterGroup
RegisterVersions = DefaultAPIRegistrationManager.RegisterVersions
InterfacesFor = DefaultAPIRegistrationManager.InterfacesFor
)
// RegisterVersions adds the given group versions to the list of registered group versions. // RegisterVersions adds the given group versions to the list of registered group versions.
func (m *APIRegistrationManager) RegisterVersions(availableVersions []schema.GroupVersion) { func (m *APIRegistrationManager) RegisterVersions(availableVersions []schema.GroupVersion) {
for _, v := range availableVersions { for _, v := range availableVersions {

4
vendor/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go generated vendored
View File

@ -14,9 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:deepcopy-gen=package
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta
// +groupName=meta.k8s.io // +groupName=meta.k8s.io
package v1 package v1

270
vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go generated vendored
View File

@ -15,14 +15,14 @@ limitations under the License.
*/ */
// Code generated by protoc-gen-gogo. // Code generated by protoc-gen-gogo.
// source: k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto // source: k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
// DO NOT EDIT! // DO NOT EDIT!
/* /*
Package v1 is a generated protocol buffer package. Package v1 is a generated protocol buffer package.
It is generated from these files: It is generated from these files:
k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
It has these top-level messages: It has these top-level messages:
APIGroup APIGroup
@ -61,7 +61,7 @@ import fmt "fmt"
import math "math" import math "math"
import time "time" import time "time"
import k8s_io_kubernetes_pkg_types "k8s.io/apimachinery/pkg/types" import k8s_io_apimachinery_pkg_types "k8s.io/apimachinery/pkg/types"
import strings "strings" import strings "strings"
import reflect "reflect" import reflect "reflect"
@ -197,34 +197,34 @@ func (*WatchEvent) ProtoMessage() {}
func (*WatchEvent) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{27} } func (*WatchEvent) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{27} }
func init() { func init() {
proto.RegisterType((*APIGroup)(nil), "k8s.io.client-go.pkg.apis.meta.v1.APIGroup") proto.RegisterType((*APIGroup)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.APIGroup")
proto.RegisterType((*APIGroupList)(nil), "k8s.io.client-go.pkg.apis.meta.v1.APIGroupList") proto.RegisterType((*APIGroupList)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.APIGroupList")
proto.RegisterType((*APIResource)(nil), "k8s.io.client-go.pkg.apis.meta.v1.APIResource") proto.RegisterType((*APIResource)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.APIResource")
proto.RegisterType((*APIResourceList)(nil), "k8s.io.client-go.pkg.apis.meta.v1.APIResourceList") proto.RegisterType((*APIResourceList)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.APIResourceList")
proto.RegisterType((*APIVersions)(nil), "k8s.io.client-go.pkg.apis.meta.v1.APIVersions") proto.RegisterType((*APIVersions)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.APIVersions")
proto.RegisterType((*Duration)(nil), "k8s.io.client-go.pkg.apis.meta.v1.Duration") proto.RegisterType((*Duration)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.Duration")
proto.RegisterType((*ExportOptions)(nil), "k8s.io.client-go.pkg.apis.meta.v1.ExportOptions") proto.RegisterType((*ExportOptions)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.ExportOptions")
proto.RegisterType((*GetOptions)(nil), "k8s.io.client-go.pkg.apis.meta.v1.GetOptions") proto.RegisterType((*GetOptions)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.GetOptions")
proto.RegisterType((*GroupKind)(nil), "k8s.io.client-go.pkg.apis.meta.v1.GroupKind") proto.RegisterType((*GroupKind)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.GroupKind")
proto.RegisterType((*GroupResource)(nil), "k8s.io.client-go.pkg.apis.meta.v1.GroupResource") proto.RegisterType((*GroupResource)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.GroupResource")
proto.RegisterType((*GroupVersion)(nil), "k8s.io.client-go.pkg.apis.meta.v1.GroupVersion") proto.RegisterType((*GroupVersion)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.GroupVersion")
proto.RegisterType((*GroupVersionForDiscovery)(nil), "k8s.io.client-go.pkg.apis.meta.v1.GroupVersionForDiscovery") proto.RegisterType((*GroupVersionForDiscovery)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.GroupVersionForDiscovery")
proto.RegisterType((*GroupVersionKind)(nil), "k8s.io.client-go.pkg.apis.meta.v1.GroupVersionKind") proto.RegisterType((*GroupVersionKind)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.GroupVersionKind")
proto.RegisterType((*GroupVersionResource)(nil), "k8s.io.client-go.pkg.apis.meta.v1.GroupVersionResource") proto.RegisterType((*GroupVersionResource)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.GroupVersionResource")
proto.RegisterType((*LabelSelector)(nil), "k8s.io.client-go.pkg.apis.meta.v1.LabelSelector") proto.RegisterType((*LabelSelector)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.LabelSelector")
proto.RegisterType((*LabelSelectorRequirement)(nil), "k8s.io.client-go.pkg.apis.meta.v1.LabelSelectorRequirement") proto.RegisterType((*LabelSelectorRequirement)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.LabelSelectorRequirement")
proto.RegisterType((*ListMeta)(nil), "k8s.io.client-go.pkg.apis.meta.v1.ListMeta") proto.RegisterType((*ListMeta)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta")
proto.RegisterType((*OwnerReference)(nil), "k8s.io.client-go.pkg.apis.meta.v1.OwnerReference") proto.RegisterType((*OwnerReference)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.OwnerReference")
proto.RegisterType((*RootPaths)(nil), "k8s.io.client-go.pkg.apis.meta.v1.RootPaths") proto.RegisterType((*RootPaths)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.RootPaths")
proto.RegisterType((*ServerAddressByClientCIDR)(nil), "k8s.io.client-go.pkg.apis.meta.v1.ServerAddressByClientCIDR") proto.RegisterType((*ServerAddressByClientCIDR)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.ServerAddressByClientCIDR")
proto.RegisterType((*Status)(nil), "k8s.io.client-go.pkg.apis.meta.v1.Status") proto.RegisterType((*Status)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.Status")
proto.RegisterType((*StatusCause)(nil), "k8s.io.client-go.pkg.apis.meta.v1.StatusCause") proto.RegisterType((*StatusCause)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.StatusCause")
proto.RegisterType((*StatusDetails)(nil), "k8s.io.client-go.pkg.apis.meta.v1.StatusDetails") proto.RegisterType((*StatusDetails)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.StatusDetails")
proto.RegisterType((*Time)(nil), "k8s.io.client-go.pkg.apis.meta.v1.Time") proto.RegisterType((*Time)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.Time")
proto.RegisterType((*Timestamp)(nil), "k8s.io.client-go.pkg.apis.meta.v1.Timestamp") proto.RegisterType((*Timestamp)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.Timestamp")
proto.RegisterType((*TypeMeta)(nil), "k8s.io.client-go.pkg.apis.meta.v1.TypeMeta") proto.RegisterType((*TypeMeta)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta")
proto.RegisterType((*Verbs)(nil), "k8s.io.client-go.pkg.apis.meta.v1.Verbs") proto.RegisterType((*Verbs)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.Verbs")
proto.RegisterType((*WatchEvent)(nil), "k8s.io.client-go.pkg.apis.meta.v1.WatchEvent") proto.RegisterType((*WatchEvent)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.WatchEvent")
} }
func (m *APIGroup) Marshal() (data []byte, err error) { func (m *APIGroup) Marshal() (data []byte, err error) {
size := m.Size() size := m.Size()
@ -1750,7 +1750,7 @@ func (this *WatchEvent) String() string {
} }
s := strings.Join([]string{`&WatchEvent{`, s := strings.Join([]string{`&WatchEvent{`,
`Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`,
`Object:` + strings.Replace(strings.Replace(this.Object.String(), "RawExtension", "k8s_io_kubernetes_pkg_runtime.RawExtension", 1), `&`, ``, 1) + `,`, `Object:` + strings.Replace(strings.Replace(this.Object.String(), "RawExtension", "k8s_io_apimachinery_pkg_runtime.RawExtension", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -3891,7 +3891,7 @@ func (m *OwnerReference) Unmarshal(data []byte) error {
if postIndex > l { if postIndex > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
m.UID = k8s_io_kubernetes_pkg_types.UID(data[iNdEx:postIndex]) m.UID = k8s_io_apimachinery_pkg_types.UID(data[iNdEx:postIndex])
iNdEx = postIndex iNdEx = postIndex
case 5: case 5:
if wireType != 2 { if wireType != 2 {
@ -5184,105 +5184,107 @@ var (
) )
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 1598 bytes of a gzipped FileDescriptorProto // 1628 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x58, 0x4f, 0x6f, 0x1b, 0x45, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x58, 0xcf, 0x6f, 0x1b, 0xc5,
0x14, 0xf7, 0xda, 0xb1, 0x6b, 0x3f, 0xc7, 0x4d, 0xba, 0xa4, 0xc2, 0x8d, 0x84, 0x1d, 0xb6, 0x08, 0x17, 0xf7, 0xda, 0xb1, 0x6b, 0x3f, 0xc7, 0x4d, 0xba, 0xdf, 0x54, 0x5f, 0x37, 0xd2, 0xd7, 0x4e,
0xa5, 0xa2, 0x5d, 0x2b, 0x11, 0x42, 0x55, 0xa1, 0x88, 0x6c, 0x92, 0x56, 0xa1, 0x4d, 0x13, 0x4d, 0xb7, 0xd5, 0x57, 0xa9, 0x68, 0xd7, 0x24, 0x48, 0x55, 0x55, 0x44, 0x51, 0x36, 0x49, 0xab, 0xa8,
0xfa, 0x07, 0x95, 0x1e, 0xd8, 0x78, 0x27, 0xce, 0x36, 0xf6, 0xee, 0x32, 0x33, 0x76, 0x63, 0x71, 0x49, 0x13, 0x4d, 0xda, 0x20, 0x4a, 0x0f, 0x6c, 0xbc, 0x13, 0x67, 0x89, 0xbd, 0xbb, 0xcc, 0x8c,
0xa0, 0x82, 0x0b, 0x07, 0x84, 0x7a, 0x44, 0x1c, 0x50, 0x23, 0xf1, 0x01, 0xf8, 0x0a, 0xdc, 0x7a, 0xdd, 0x58, 0x3d, 0xd0, 0x03, 0x48, 0x1c, 0x10, 0xea, 0x91, 0x03, 0x42, 0xad, 0xe0, 0x2f, 0xe0,
0xa3, 0xdc, 0x38, 0x20, 0x8b, 0x06, 0x71, 0xe2, 0x1b, 0xe4, 0x84, 0x66, 0x76, 0x66, 0xbd, 0x76, 0x9f, 0xa0, 0xc7, 0x4a, 0xbd, 0x70, 0x40, 0x16, 0x0d, 0x07, 0x8e, 0xdc, 0x23, 0x0e, 0x68, 0x66,
0xe2, 0x66, 0xa3, 0x72, 0xe0, 0x14, 0xcf, 0xfb, 0xf3, 0x7b, 0x6f, 0xde, 0xfc, 0xe6, 0xcd, 0xdb, 0x67, 0xd6, 0x6b, 0xa7, 0x26, 0x1b, 0xd1, 0x03, 0xa7, 0x78, 0xde, 0x8f, 0xcf, 0x7b, 0xf3, 0xe6,
0xc0, 0xfc, 0xce, 0x65, 0x6a, 0xba, 0x7e, 0x6d, 0xa7, 0xbd, 0x89, 0x89, 0x87, 0x19, 0xa6, 0xb5, 0x33, 0x6f, 0xde, 0x06, 0xd6, 0xf6, 0xae, 0x51, 0xd3, 0xf5, 0x6b, 0x7b, 0xed, 0x6d, 0x4c, 0x3c,
0x60, 0xa7, 0x51, 0xb3, 0x03, 0x97, 0xd6, 0x5a, 0x98, 0xd9, 0xb5, 0xce, 0x5c, 0xad, 0x81, 0x3d, 0xcc, 0x30, 0xad, 0x75, 0xb0, 0xe7, 0xf8, 0xa4, 0x26, 0x15, 0x76, 0xe0, 0xb6, 0xec, 0xfa, 0xae,
0x4c, 0x6c, 0x86, 0x1d, 0x33, 0x20, 0x3e, 0xf3, 0x75, 0x23, 0xf4, 0x31, 0xfb, 0x3e, 0x66, 0xb0, 0xeb, 0x61, 0xd2, 0xad, 0x05, 0x7b, 0x0d, 0x2e, 0xa0, 0xb5, 0x16, 0x66, 0x76, 0xad, 0x33, 0x57,
0xd3, 0x30, 0xb9, 0x8f, 0xc9, 0x7d, 0xcc, 0xce, 0xdc, 0xf4, 0xa5, 0x86, 0xcb, 0xb6, 0xdb, 0x9b, 0x6b, 0x60, 0x0f, 0x13, 0x9b, 0x61, 0xc7, 0x0c, 0x88, 0xcf, 0x7c, 0xfd, 0x62, 0xe8, 0x65, 0xc6,
0x66, 0xdd, 0x6f, 0xd5, 0x1a, 0x7e, 0xc3, 0xaf, 0x09, 0xd7, 0xcd, 0xf6, 0x96, 0x58, 0x89, 0x85, 0xbd, 0xcc, 0x60, 0xaf, 0xc1, 0x05, 0xd4, 0xe4, 0x5e, 0x66, 0x67, 0x6e, 0xfa, 0x4a, 0xc3, 0x65,
0xf8, 0x15, 0x42, 0x4e, 0x5f, 0x3a, 0x3a, 0x0d, 0xd2, 0xf6, 0x98, 0xdb, 0xc2, 0xc3, 0x19, 0x4c, 0xbb, 0xed, 0x6d, 0xb3, 0xee, 0xb7, 0x6a, 0x0d, 0xbf, 0xe1, 0xd7, 0x84, 0xf3, 0x76, 0x7b, 0x47,
0xbf, 0xfb, 0x72, 0x73, 0x5a, 0xdf, 0xc6, 0x2d, 0xfb, 0x90, 0xd7, 0xdc, 0xd1, 0x5e, 0x6d, 0xe6, 0xac, 0xc4, 0x42, 0xfc, 0x0a, 0x41, 0xa7, 0x47, 0xa6, 0x42, 0xda, 0x1e, 0x73, 0x5b, 0x78, 0x38,
0x36, 0x6b, 0xae, 0xc7, 0x28, 0x23, 0xc3, 0x2e, 0xc6, 0x2f, 0x19, 0xc8, 0x2f, 0xac, 0xaf, 0x5c, 0x8b, 0xe9, 0xab, 0xc7, 0x39, 0xd0, 0xfa, 0x2e, 0x6e, 0xd9, 0x47, 0xfc, 0xe6, 0x8f, 0x16, 0x43,
0x27, 0x7e, 0x3b, 0xd0, 0x67, 0x60, 0xcc, 0xb3, 0x5b, 0xb8, 0xac, 0xcd, 0x68, 0xb3, 0x05, 0x6b, 0xee, 0xb8, 0x46, 0x30, 0xf5, 0xdb, 0xa4, 0x7e, 0x34, 0xd6, 0xdc, 0xeb, 0x7d, 0xda, 0xcc, 0x6d,
0xfc, 0x59, 0xaf, 0x9a, 0xda, 0xef, 0x55, 0xc7, 0x6e, 0xd9, 0x2d, 0x8c, 0x84, 0x46, 0x7f, 0x08, 0xd6, 0x5c, 0x8f, 0x51, 0x46, 0x86, 0x5d, 0x8c, 0x9f, 0x32, 0x90, 0x5f, 0xd8, 0x58, 0xb9, 0x45,
0xf9, 0x0e, 0x26, 0xd4, 0xf5, 0x3d, 0x5a, 0x4e, 0xcf, 0x64, 0x66, 0x8b, 0xf3, 0x1f, 0x98, 0xc7, 0xfc, 0x76, 0xa0, 0xcf, 0xc0, 0x98, 0x67, 0xb7, 0x70, 0x59, 0x9b, 0xd1, 0x66, 0x0b, 0xd6, 0xf8,
0x17, 0xcb, 0x14, 0xf0, 0x77, 0x43, 0xc7, 0x6b, 0x3e, 0x59, 0x72, 0x69, 0xdd, 0xef, 0x60, 0xd2, 0xf3, 0x5e, 0x35, 0x75, 0xd0, 0xab, 0x8e, 0xdd, 0xb1, 0x5b, 0x18, 0x09, 0x8d, 0xde, 0x84, 0x7c,
0xb5, 0x26, 0x65, 0x8c, 0xbc, 0x54, 0x52, 0x14, 0xe1, 0xeb, 0x5f, 0x69, 0x30, 0x19, 0x10, 0xbc, 0x07, 0x13, 0xea, 0xfa, 0x1e, 0x2d, 0xa7, 0x67, 0x32, 0xb3, 0xc5, 0xf9, 0x1b, 0x66, 0x92, 0x32,
0x85, 0x09, 0xc1, 0x8e, 0xd4, 0x97, 0x33, 0x33, 0xda, 0x2b, 0x07, 0x2d, 0xcb, 0xa0, 0x93, 0xeb, 0x9b, 0x22, 0xc0, 0x56, 0xe8, 0x7a, 0xd3, 0x27, 0x4b, 0x2e, 0xad, 0xfb, 0x1d, 0x4c, 0xba, 0xd6,
0x43, 0xe8, 0xe8, 0x50, 0x3c, 0x7d, 0x4f, 0x83, 0x69, 0x8a, 0x49, 0x07, 0x93, 0x05, 0xc7, 0x21, 0xa4, 0x8c, 0x92, 0x97, 0x4a, 0x8a, 0xa2, 0x08, 0xfa, 0xe7, 0x1a, 0x4c, 0x06, 0x04, 0xef, 0x60,
0x98, 0x52, 0xab, 0xbb, 0xd8, 0x74, 0xb1, 0xc7, 0x16, 0x57, 0x96, 0x10, 0x2d, 0x8f, 0x89, 0x1a, 0x42, 0xb0, 0x23, 0xf5, 0xe5, 0xcc, 0x8c, 0xf6, 0x06, 0xc2, 0x96, 0x65, 0xd8, 0xc9, 0x8d, 0x21,
0x5c, 0x4d, 0x92, 0xce, 0xc6, 0x28, 0x14, 0xcb, 0x90, 0xf9, 0x4c, 0x8f, 0x34, 0xa1, 0xe8, 0x25, 0x7c, 0x74, 0x24, 0xa2, 0xfe, 0xbd, 0x06, 0xd3, 0x14, 0x93, 0x0e, 0x26, 0x0b, 0x8e, 0x43, 0x30,
0x49, 0x18, 0x0e, 0x8c, 0xab, 0x23, 0xbc, 0xe9, 0x52, 0xa6, 0xdf, 0x86, 0x5c, 0x83, 0x2f, 0x68, 0xa5, 0x56, 0x77, 0xb1, 0xe9, 0x62, 0x8f, 0x2d, 0xae, 0x2c, 0x21, 0x5a, 0x1e, 0x13, 0x75, 0x78,
0x59, 0x13, 0xe9, 0x5d, 0x4c, 0x92, 0x9e, 0x42, 0xb0, 0x4e, 0xcb, 0x6c, 0x72, 0x62, 0x49, 0x91, 0x3f, 0x59, 0x42, 0x9b, 0xa3, 0x70, 0x2c, 0x43, 0x66, 0x34, 0x3d, 0xd2, 0x84, 0xa2, 0xbf, 0x49,
0xc4, 0x32, 0x7e, 0xd3, 0xa0, 0xb8, 0xb0, 0xbe, 0x82, 0x30, 0xf5, 0xdb, 0xa4, 0x8e, 0x13, 0x90, 0xc3, 0xd8, 0x81, 0x71, 0x75, 0x90, 0xab, 0x2e, 0x65, 0xfa, 0x16, 0xe4, 0x1a, 0x7c, 0x41, 0xcb,
0x65, 0x1e, 0x80, 0xff, 0xa5, 0x81, 0x5d, 0xc7, 0x4e, 0x39, 0x3d, 0xa3, 0xcd, 0xe6, 0x2d, 0x5d, 0x9a, 0x48, 0xd0, 0x4c, 0x96, 0xa0, 0xc2, 0xb0, 0x4e, 0xcb, 0x7c, 0x72, 0x62, 0x49, 0x91, 0x44,
0xda, 0xc1, 0xad, 0x48, 0x83, 0x62, 0x56, 0x1c, 0x75, 0xc7, 0xf5, 0x1c, 0x71, 0xce, 0x31, 0xd4, 0x33, 0x5e, 0x6a, 0x50, 0x5c, 0xd8, 0x58, 0x41, 0x92, 0x84, 0x09, 0x48, 0x33, 0x0f, 0xc0, 0xff,
0x1b, 0xae, 0xe7, 0x20, 0xa1, 0xd1, 0x3f, 0x86, 0x6c, 0x07, 0x93, 0x4d, 0x5e, 0x7b, 0x4e, 0x85, 0xd2, 0xc0, 0xae, 0x63, 0xa7, 0x9c, 0x9e, 0xd1, 0x66, 0xf3, 0x96, 0x2e, 0xed, 0xe0, 0x4e, 0xa4,
0x0b, 0x49, 0x36, 0x77, 0x97, 0x3b, 0x58, 0x85, 0xfd, 0x5e, 0x35, 0x2b, 0x7e, 0xa2, 0x10, 0xc2, 0x41, 0x31, 0x2b, 0x8e, 0xba, 0xe7, 0x7a, 0x8e, 0x38, 0xed, 0x18, 0xea, 0x6d, 0xd7, 0x73, 0x90,
0xf8, 0x59, 0x83, 0x89, 0xd8, 0x9e, 0x44, 0xf5, 0x2e, 0xc3, 0x78, 0x23, 0xc6, 0x1c, 0xb9, 0xbf, 0xd0, 0xe8, 0xab, 0x90, 0xed, 0x60, 0xb2, 0xcd, 0xeb, 0xcf, 0x09, 0xf1, 0x56, 0xb2, 0xed, 0x6d,
0x29, 0x99, 0xc9, 0x78, 0x9c, 0x55, 0x68, 0xc0, 0x52, 0xaf, 0x43, 0x81, 0x48, 0x24, 0x75, 0x3b, 0x71, 0x17, 0xab, 0x70, 0xd0, 0xab, 0x66, 0xc5, 0x4f, 0x14, 0x82, 0x18, 0x3f, 0x6a, 0x30, 0x11,
0x6a, 0x09, 0x4b, 0xaf, 0x32, 0xe8, 0xc7, 0x89, 0x09, 0x29, 0xea, 0xe3, 0x1a, 0x7f, 0x87, 0xc7, 0xdb, 0x95, 0xa8, 0xe0, 0x35, 0x18, 0x6f, 0xc4, 0xf8, 0x23, 0x77, 0x38, 0x25, 0x73, 0x19, 0x8f,
0xa0, 0xee, 0x8b, 0x3e, 0x1b, 0xbb, 0x91, 0xfc, 0xb8, 0x0b, 0xd6, 0xf8, 0x88, 0xfb, 0x74, 0x0c, 0x73, 0x0b, 0x0d, 0x58, 0xea, 0x18, 0x0a, 0xea, 0x92, 0xaa, 0x7b, 0x32, 0x97, 0xb8, 0xfc, 0x2a,
0x95, 0xd3, 0xff, 0x03, 0x2a, 0x5f, 0xc9, 0x7f, 0xff, 0xb4, 0x9a, 0x7a, 0xfc, 0xc7, 0x4c, 0xca, 0x87, 0x7e, 0xa4, 0x98, 0x90, 0xa2, 0x3e, 0xb2, 0xf1, 0x7b, 0x78, 0x14, 0xea, 0xe6, 0xe8, 0xb3,
0x58, 0x81, 0xfc, 0x52, 0x9b, 0xd8, 0x8c, 0x17, 0xf6, 0x2a, 0xe4, 0x1d, 0xf9, 0x5b, 0x1c, 0x47, 0xb1, 0xdb, 0xc9, 0x0f, 0xbd, 0x60, 0x8d, 0x8f, 0xb8, 0x59, 0xc7, 0x50, 0x3a, 0xfd, 0xaf, 0xa0,
0xc6, 0x7a, 0x53, 0xf5, 0x0d, 0x65, 0x73, 0xd0, 0xab, 0x96, 0x78, 0x6b, 0x34, 0x95, 0x00, 0x45, 0xf4, 0xf5, 0xfc, 0x37, 0x4f, 0xab, 0xa9, 0xc7, 0xbf, 0xcc, 0xa4, 0x8c, 0x15, 0xc8, 0x2f, 0xb5,
0x2e, 0xc6, 0x03, 0x28, 0x2d, 0xef, 0x06, 0x3e, 0x61, 0x6b, 0x01, 0x13, 0x95, 0x78, 0x1b, 0x72, 0x89, 0xcd, 0x78, 0x71, 0xdf, 0x83, 0xbc, 0x23, 0x7f, 0x8b, 0x23, 0xc9, 0x58, 0xe7, 0x55, 0x0f,
0x58, 0x08, 0x04, 0x5a, 0xbe, 0x4f, 0xf9, 0xd0, 0x0c, 0x49, 0xad, 0x7e, 0x1e, 0xb2, 0x78, 0xd7, 0x51, 0x36, 0x87, 0xbd, 0x6a, 0x89, 0x37, 0x57, 0x53, 0x09, 0x50, 0xe4, 0x62, 0x3c, 0x80, 0xd2,
0xae, 0x33, 0xc9, 0xdd, 0x92, 0x34, 0xcb, 0x2e, 0x73, 0x21, 0x0a, 0x75, 0xc6, 0x1a, 0xc0, 0x75, 0xf2, 0x7e, 0xe0, 0x13, 0xb6, 0x1e, 0x30, 0x51, 0x8b, 0xff, 0x43, 0x0e, 0x0b, 0x81, 0x40, 0xcb,
0x1c, 0x41, 0x2f, 0xc0, 0x84, 0x3a, 0xab, 0x41, 0x02, 0xbd, 0x2e, 0x9d, 0x27, 0xd0, 0xa0, 0x1a, 0xf7, 0x89, 0x1f, 0x9a, 0x21, 0xa9, 0xd5, 0x2f, 0x40, 0x16, 0xef, 0xdb, 0x75, 0x26, 0x19, 0x5c,
0x0d, 0xdb, 0x1b, 0x0f, 0xa0, 0x20, 0x48, 0xc6, 0x39, 0xcf, 0x53, 0x10, 0x1c, 0x93, 0x28, 0x51, 0x92, 0x66, 0xd9, 0x65, 0x2e, 0x44, 0xa1, 0xce, 0x58, 0x07, 0xb8, 0x85, 0x23, 0xe8, 0x05, 0x98,
0x0a, 0xc2, 0x02, 0x85, 0xba, 0xe8, 0xd2, 0xa4, 0x47, 0x5d, 0x9a, 0x58, 0x5d, 0x9b, 0x50, 0x0a, 0x50, 0xa7, 0x35, 0x48, 0xa2, 0xff, 0x4a, 0xe7, 0x09, 0x34, 0xa8, 0x46, 0xc3, 0xf6, 0xc6, 0x03,
0x7d, 0xd5, 0x3d, 0x4e, 0x14, 0xe1, 0x22, 0xe4, 0x55, 0x9a, 0x32, 0x4a, 0xd4, 0xb9, 0x15, 0x10, 0x28, 0x08, 0xa2, 0x71, 0xe6, 0xf3, 0x14, 0x04, 0xcf, 0x24, 0x4a, 0x94, 0x82, 0xb0, 0x40, 0xa1,
0x8a, 0x2c, 0x62, 0xd1, 0xb6, 0x61, 0xe0, 0xc2, 0x24, 0x0b, 0x76, 0x01, 0x4e, 0x49, 0xd2, 0xca, 0x2e, 0xba, 0x3a, 0xe9, 0x51, 0x57, 0x27, 0x56, 0xd7, 0x26, 0x94, 0x42, 0x5f, 0x75, 0x9b, 0x13,
0x58, 0x13, 0xd2, 0xec, 0x94, 0xaa, 0x99, 0xd2, 0xc7, 0x22, 0x7d, 0x09, 0xe5, 0x51, 0x0d, 0xff, 0x45, 0xb8, 0x0c, 0x79, 0x95, 0xa6, 0x8c, 0x12, 0x75, 0x71, 0x05, 0x84, 0x22, 0x8b, 0x58, 0xb4,
0x15, 0xae, 0x74, 0xf2, 0x54, 0x8c, 0xef, 0x34, 0x98, 0x8c, 0x23, 0x25, 0x3f, 0xbe, 0xe4, 0x41, 0x5d, 0x18, 0xb8, 0x34, 0xc9, 0x82, 0x5d, 0x82, 0x53, 0x92, 0xb6, 0x32, 0xd6, 0x84, 0x34, 0x3b,
0x8e, 0x6f, 0x8f, 0xb1, 0x8a, 0xfc, 0xa8, 0xc1, 0xd4, 0xc0, 0xd6, 0x4e, 0x74, 0xe2, 0x27, 0x48, 0xa5, 0x6a, 0xa6, 0xf4, 0xb1, 0x48, 0x9f, 0x41, 0x79, 0x54, 0xeb, 0xff, 0x07, 0xd7, 0x3a, 0x79,
0x2a, 0x4e, 0x8e, 0xcc, 0x09, 0xc8, 0xf1, 0x6b, 0x1a, 0x4a, 0x37, 0xed, 0x4d, 0xdc, 0xdc, 0xc0, 0x2a, 0xc6, 0xd7, 0x1a, 0x4c, 0xc6, 0x91, 0x92, 0x1f, 0x5f, 0xf2, 0x20, 0xc7, 0x37, 0xc9, 0x58,
0x4d, 0x5c, 0x67, 0x3e, 0xd1, 0xbb, 0x50, 0x6c, 0xd9, 0xac, 0xbe, 0x2d, 0xa4, 0xea, 0xf9, 0xb2, 0x45, 0xbe, 0xd3, 0x60, 0x6a, 0x60, 0x6b, 0x27, 0x3a, 0xf1, 0x13, 0x24, 0x15, 0x27, 0x47, 0xe6,
0x92, 0xb4, 0xa4, 0x01, 0x1c, 0x73, 0xb5, 0x0f, 0xb2, 0xec, 0x31, 0xd2, 0xb5, 0x5e, 0x93, 0x09, 0x04, 0xe4, 0x78, 0x99, 0x86, 0xd2, 0xaa, 0xbd, 0x8d, 0x9b, 0x9b, 0xb8, 0x89, 0xeb, 0xcc, 0x27,
0x15, 0x63, 0x1a, 0x14, 0x8f, 0x25, 0xa6, 0x0d, 0xb1, 0x5e, 0xde, 0x0d, 0x78, 0x5f, 0x3a, 0xe9, 0xfa, 0x23, 0x28, 0xb6, 0x6c, 0x56, 0xdf, 0x15, 0x52, 0xf5, 0x8c, 0x2d, 0x25, 0x6b, 0x4a, 0x03,
0x88, 0x33, 0x90, 0x00, 0xc2, 0x9f, 0xb7, 0x5d, 0x82, 0x5b, 0xd8, 0x63, 0xfd, 0x69, 0x63, 0x75, 0x48, 0xe6, 0x5a, 0x1f, 0x66, 0xd9, 0x63, 0xa4, 0x6b, 0xfd, 0x47, 0xa6, 0x54, 0x8c, 0x69, 0x50,
0x08, 0x1d, 0x1d, 0x8a, 0x37, 0xfd, 0x21, 0x4c, 0x0e, 0xa7, 0xae, 0x4f, 0x42, 0x66, 0x07, 0x77, 0x3c, 0x9a, 0x98, 0x3d, 0xc4, 0x7a, 0x79, 0x3f, 0xe0, 0x9d, 0xe9, 0xe4, 0x23, 0xcf, 0x40, 0x0a,
0xc3, 0xb3, 0x42, 0xfc, 0xa7, 0x3e, 0x05, 0xd9, 0x8e, 0xdd, 0x6c, 0xcb, 0x9b, 0x88, 0xc2, 0xc5, 0x08, 0x7f, 0xda, 0x76, 0x09, 0x6e, 0x61, 0x8f, 0xf5, 0x67, 0x8f, 0xb5, 0x21, 0x7c, 0x74, 0x24,
0x95, 0xf4, 0x65, 0xcd, 0xf8, 0x49, 0x83, 0xf2, 0xa8, 0x44, 0xf4, 0x37, 0x62, 0x40, 0x56, 0x51, 0xe2, 0xf4, 0x0d, 0x98, 0x1c, 0x4e, 0x5e, 0x9f, 0x84, 0xcc, 0x1e, 0xee, 0x86, 0xe7, 0x85, 0xf8,
0x66, 0x95, 0xb9, 0x81, 0xbb, 0x21, 0xea, 0x32, 0xe4, 0xfd, 0x80, 0xcf, 0x86, 0x3e, 0x91, 0x27, 0x4f, 0x7d, 0x0a, 0xb2, 0x1d, 0xbb, 0xd9, 0x96, 0xb7, 0x11, 0x85, 0x8b, 0xeb, 0xe9, 0x6b, 0x9a,
0x7e, 0x41, 0x9d, 0xe2, 0x9a, 0x94, 0x1f, 0xf4, 0xaa, 0x67, 0x07, 0xe0, 0x95, 0x02, 0x45, 0xae, 0xf1, 0x83, 0x06, 0xe5, 0x51, 0x89, 0xe8, 0xff, 0x8b, 0x01, 0x59, 0x45, 0x99, 0x55, 0xe6, 0x36,
0xba, 0x01, 0x39, 0x91, 0x0f, 0x2d, 0x67, 0xc4, 0x6b, 0x04, 0xbc, 0xaf, 0xde, 0x15, 0x12, 0x24, 0xee, 0x86, 0xa8, 0xcb, 0x90, 0xf7, 0x03, 0x3e, 0x2d, 0xfa, 0x44, 0x9e, 0xfa, 0x25, 0x75, 0x92,
0x35, 0xc6, 0x17, 0x90, 0xe7, 0x4f, 0xed, 0x2a, 0x66, 0x36, 0x27, 0x0f, 0xc5, 0xcd, 0xad, 0x9b, 0xeb, 0x52, 0x7e, 0xd8, 0xab, 0x9e, 0x1d, 0x80, 0x57, 0x0a, 0x14, 0xb9, 0xea, 0x06, 0xe4, 0x44,
0xae, 0xb7, 0x23, 0x53, 0x8b, 0xc8, 0xb3, 0x21, 0xe5, 0x28, 0xb2, 0x38, 0xaa, 0xbd, 0xa6, 0x4f, 0x3e, 0xb4, 0x9c, 0x11, 0x6f, 0x12, 0xf0, 0xde, 0xba, 0x25, 0x24, 0x48, 0x6a, 0x8c, 0x47, 0x90,
0xd8, 0x5e, 0x0f, 0x34, 0x38, 0xbd, 0xf6, 0xc8, 0xc3, 0x04, 0xf1, 0x51, 0x0f, 0x7b, 0xe1, 0x28, 0xe7, 0x4f, 0xee, 0x1a, 0x66, 0x36, 0x27, 0x10, 0xc5, 0xcd, 0x9d, 0x55, 0xd7, 0xdb, 0x93, 0xa9,
0x23, 0x6e, 0x95, 0x36, 0x72, 0xe8, 0x50, 0xc3, 0x4e, 0x66, 0xe4, 0xb0, 0xf3, 0x11, 0x64, 0xda, 0x45, 0x04, 0xda, 0x94, 0x72, 0x14, 0x59, 0xbc, 0xae, 0xc5, 0xa6, 0x4f, 0xd8, 0x62, 0xff, 0xd4,
0xae, 0x23, 0x86, 0x92, 0x82, 0x65, 0xaa, 0xea, 0xde, 0x59, 0x59, 0x3a, 0xe8, 0x55, 0xab, 0x47, 0xe0, 0xf4, 0xfa, 0x43, 0x0f, 0x13, 0xc4, 0x07, 0x3f, 0xec, 0x85, 0x43, 0x8d, 0xb8, 0x59, 0xda,
0xcf, 0xe5, 0xac, 0x1b, 0x60, 0x6a, 0xde, 0x59, 0x59, 0x42, 0xdc, 0x95, 0x8f, 0x4b, 0x76, 0xe0, 0xc8, 0xf1, 0x43, 0x8d, 0x3d, 0x99, 0x91, 0x63, 0x8f, 0x05, 0x99, 0xb6, 0xeb, 0x88, 0xf1, 0xa4,
0xaa, 0x6d, 0x65, 0x05, 0x50, 0x34, 0x2e, 0xf5, 0x9f, 0x7c, 0x14, 0xb3, 0xd2, 0x4d, 0x80, 0xba, 0x60, 0xbd, 0xad, 0xaa, 0x7b, 0x6f, 0x65, 0xe9, 0xb0, 0x57, 0x3d, 0x3f, 0xea, 0xab, 0x80, 0x75,
0xef, 0x31, 0xe2, 0x37, 0x9b, 0x98, 0x94, 0x73, 0xe1, 0x6b, 0xc6, 0xed, 0x17, 0x23, 0x29, 0x8a, 0x03, 0x4c, 0xcd, 0x7b, 0x2b, 0x4b, 0x88, 0x3b, 0xf3, 0xd1, 0xc9, 0x0e, 0x5c, 0xb5, 0xb1, 0xac,
0x59, 0x18, 0x17, 0xa1, 0x80, 0x7c, 0x9f, 0xad, 0xdb, 0x6c, 0x9b, 0xea, 0x55, 0xc8, 0x06, 0xfc, 0x80, 0x8a, 0x46, 0xa7, 0xfe, 0xd3, 0x8f, 0x62, 0x56, 0xba, 0x09, 0x50, 0xf7, 0x3d, 0x46, 0xfc,
0x87, 0x9c, 0x1b, 0xc4, 0x78, 0x24, 0x34, 0x28, 0x94, 0x1b, 0xdf, 0x6a, 0x70, 0x6e, 0xe4, 0x43, 0x66, 0x13, 0x93, 0x72, 0x2e, 0x7c, 0xd3, 0xb8, 0xfd, 0x62, 0x24, 0x45, 0x31, 0x0b, 0xe3, 0x32,
0xce, 0xf3, 0xad, 0x47, 0x2b, 0x59, 0xbb, 0x28, 0xdf, 0xbe, 0x1d, 0x8a, 0x59, 0xe9, 0xef, 0x43, 0x14, 0x90, 0xef, 0xb3, 0x0d, 0x9b, 0xed, 0x52, 0xbd, 0x0a, 0xd9, 0x80, 0xff, 0x90, 0xf3, 0x83,
0x69, 0xe0, 0xf5, 0x97, 0xa7, 0x77, 0x56, 0xba, 0x95, 0x06, 0xa2, 0xa1, 0x41, 0x5b, 0xe3, 0x9f, 0x18, 0x94, 0x84, 0x06, 0x85, 0x72, 0xe3, 0x2b, 0x0d, 0xce, 0x8d, 0x7c, 0xce, 0x79, 0xbe, 0xf5,
0x34, 0xe4, 0x36, 0x98, 0xcd, 0xda, 0x54, 0xbf, 0x0f, 0x79, 0x7e, 0xf1, 0x1c, 0x9b, 0xd9, 0x22, 0x68, 0x25, 0xab, 0x17, 0xe5, 0xdb, 0xb7, 0x43, 0x31, 0x2b, 0xfd, 0x5d, 0x28, 0x0d, 0xcc, 0x00,
0x72, 0xc2, 0x21, 0x57, 0xb1, 0xae, 0xcf, 0x31, 0x25, 0x41, 0x11, 0x1e, 0x9f, 0x0e, 0xa8, 0x88, 0xf2, 0xfc, 0xce, 0x4a, 0xb7, 0xd2, 0x40, 0x34, 0x34, 0x68, 0x6b, 0xfc, 0x91, 0x86, 0xdc, 0x26,
0x22, 0x93, 0x8b, 0xa6, 0x83, 0x30, 0x36, 0x92, 0x5a, 0xde, 0x21, 0x5b, 0x98, 0x52, 0xbb, 0xa1, 0xb3, 0x59, 0x9b, 0xea, 0x0f, 0x20, 0xcf, 0xaf, 0x9e, 0x63, 0x33, 0x5b, 0x44, 0x4e, 0x3c, 0xf2,
0x68, 0x11, 0x75, 0xc8, 0xd5, 0x50, 0x8c, 0x94, 0x5e, 0x7f, 0x0f, 0x72, 0x04, 0xdb, 0xd4, 0xf7, 0x2a, 0xe6, 0xf5, 0x79, 0xa6, 0x24, 0x28, 0x42, 0xe4, 0x53, 0x02, 0x15, 0x71, 0x64, 0x7a, 0xd1,
0x24, 0x3f, 0x2a, 0x0a, 0x12, 0x09, 0xe9, 0x41, 0xaf, 0x3a, 0x2e, 0xc1, 0xc5, 0x1a, 0x49, 0x6b, 0x94, 0x10, 0x46, 0x47, 0x52, 0xcb, 0x3b, 0x65, 0x0b, 0x53, 0x6a, 0x37, 0x14, 0x35, 0xa2, 0x4e,
0xfd, 0x13, 0x38, 0xe5, 0x60, 0x66, 0xbb, 0x4d, 0x2a, 0xf8, 0x50, 0x9c, 0x9f, 0x4b, 0x34, 0x9e, 0xb9, 0x16, 0x8a, 0x91, 0xd2, 0xeb, 0x57, 0x21, 0x47, 0xb0, 0x4d, 0x7d, 0x4f, 0x72, 0xa4, 0xa2,
0x09, 0xa8, 0xa5, 0xd0, 0xd1, 0x2a, 0xf2, 0x8c, 0xe4, 0x02, 0x29, 0x38, 0x4e, 0xe8, 0xba, 0xef, 0x20, 0x91, 0x90, 0x1e, 0xf6, 0xaa, 0xe3, 0x12, 0x5c, 0xac, 0x91, 0xb4, 0xd6, 0xef, 0xc3, 0x29,
0x60, 0x41, 0x99, 0x6c, 0x9f, 0xd0, 0x8b, 0xbe, 0x83, 0x91, 0xd0, 0x18, 0x4f, 0x34, 0x28, 0x86, 0x07, 0x33, 0xdb, 0x6d, 0x52, 0xc1, 0x88, 0xe2, 0xfc, 0x3b, 0x09, 0x07, 0x35, 0x01, 0xb6, 0x14,
0x48, 0x8b, 0x76, 0x9b, 0x62, 0x7d, 0x2e, 0xda, 0x43, 0x78, 0xd4, 0xe7, 0x94, 0xcf, 0xed, 0x6e, 0xba, 0x5a, 0x45, 0x9e, 0x93, 0x5c, 0x20, 0x05, 0xc8, 0x69, 0x5d, 0xf7, 0x1d, 0x2c, 0x68, 0x93,
0x80, 0x0f, 0x7a, 0xd5, 0x82, 0x30, 0xe3, 0x8b, 0x28, 0xfd, 0x58, 0x85, 0xd2, 0xc7, 0x54, 0xe8, 0xed, 0xd3, 0x7a, 0xd1, 0x77, 0x30, 0x12, 0x1a, 0xe3, 0x89, 0x06, 0xc5, 0x10, 0x69, 0xd1, 0x6e,
0x3c, 0x64, 0xb7, 0x5c, 0xdc, 0x54, 0x2f, 0x5b, 0xf4, 0x26, 0x5d, 0xe3, 0x42, 0x14, 0xea, 0x8c, 0x53, 0xac, 0xcf, 0x45, 0xbb, 0x08, 0x8f, 0xfb, 0x9c, 0xf2, 0xb9, 0xdb, 0x0d, 0xf0, 0x61, 0xaf,
0x1f, 0xd2, 0x50, 0x1a, 0xd8, 0x5c, 0x82, 0x8f, 0x90, 0xe8, 0xb1, 0x4b, 0x27, 0x18, 0xa0, 0x46, 0x5a, 0x10, 0x66, 0x7c, 0x11, 0x6d, 0x20, 0x56, 0xa3, 0xf4, 0x31, 0x35, 0xba, 0x00, 0xd9, 0x1d,
0x7f, 0x75, 0xdc, 0x83, 0x5c, 0x9d, 0xef, 0x4f, 0x7d, 0xf2, 0xd5, 0x92, 0x1f, 0x84, 0xa8, 0x4b, 0x17, 0x37, 0xd5, 0x1b, 0x17, 0xbd, 0x4e, 0x37, 0xb9, 0x10, 0x85, 0x3a, 0xe3, 0xdb, 0x34, 0x94,
0x9f, 0x45, 0x62, 0x49, 0x91, 0x84, 0xd3, 0xaf, 0xc3, 0x19, 0x82, 0x19, 0xe9, 0x2e, 0x6c, 0x31, 0x06, 0x36, 0x97, 0xe0, 0xa3, 0x24, 0x7a, 0xf6, 0xd2, 0x09, 0x46, 0xa9, 0xd1, 0x5f, 0x21, 0x1f,
0x4c, 0x36, 0x70, 0xdd, 0xf7, 0x9c, 0xf0, 0xb0, 0xb3, 0x51, 0x85, 0xcf, 0xa0, 0x61, 0x03, 0x74, 0x42, 0xae, 0xce, 0xf7, 0xa7, 0x3e, 0x03, 0xe7, 0x4e, 0x72, 0x14, 0xa2, 0x32, 0x7d, 0x26, 0x89,
0xd8, 0xc7, 0x68, 0xc2, 0xd8, 0x6d, 0xb7, 0x85, 0x79, 0xd1, 0xa9, 0x84, 0x09, 0x67, 0xe5, 0xa8, 0x25, 0x45, 0x12, 0x50, 0xbf, 0x05, 0x67, 0x08, 0x66, 0xa4, 0xbb, 0xb0, 0xc3, 0x30, 0xd9, 0xc4,
0xe8, 0xca, 0x59, 0xe9, 0x79, 0x6d, 0x3c, 0xdb, 0xf3, 0x43, 0xa2, 0x67, 0xfb, 0xb5, 0xb9, 0xc5, 0x75, 0xdf, 0x73, 0xc2, 0x03, 0xcf, 0x46, 0x35, 0x3e, 0x83, 0x86, 0x0d, 0xd0, 0x51, 0x1f, 0xa3,
0x85, 0x28, 0xd4, 0x5d, 0x99, 0xe2, 0xef, 0xf5, 0x37, 0x7b, 0xd5, 0xd4, 0x93, 0xbd, 0x6a, 0xea, 0x09, 0x63, 0x77, 0xdd, 0x16, 0xe6, 0x65, 0xa7, 0x12, 0x26, 0x9c, 0x9b, 0xa3, 0xb2, 0x2b, 0x67,
0xe9, 0x9e, 0x7c, 0xbb, 0x3f, 0x85, 0x02, 0x8f, 0x46, 0x99, 0xdd, 0x0a, 0xfe, 0xeb, 0x90, 0xc6, 0xa5, 0xe7, 0xd5, 0xf1, 0x6c, 0xcf, 0x0f, 0xc9, 0x9e, 0xed, 0x57, 0xe7, 0x0e, 0x17, 0xa2, 0x50,
0x67, 0x90, 0xe7, 0x3c, 0x12, 0xef, 0xc3, 0xf1, 0xbd, 0x79, 0xb0, 0x6f, 0xa6, 0x93, 0xf4, 0x4d, 0x77, 0x7d, 0x8a, 0xbf, 0xdd, 0x5f, 0x3e, 0xab, 0xa6, 0x9e, 0x3c, 0xab, 0xa6, 0x9e, 0x3e, 0x93,
0x63, 0x1e, 0xc2, 0x0f, 0x41, 0xde, 0x03, 0x5d, 0x86, 0x5b, 0x03, 0x3d, 0x70, 0x85, 0x0b, 0x50, 0xef, 0xf8, 0x47, 0x50, 0xe0, 0xd1, 0x28, 0xb3, 0x5b, 0xc1, 0x9b, 0x0e, 0x69, 0x7c, 0x0c, 0x79,
0x28, 0x8f, 0x8d, 0x2b, 0x5f, 0x6b, 0x00, 0xf7, 0xc4, 0x8b, 0xdd, 0xe1, 0xcf, 0xe9, 0x0c, 0x8c, 0xce, 0x24, 0xf1, 0x4e, 0x1c, 0xdf, 0xa3, 0x07, 0xbb, 0x67, 0x3a, 0x49, 0xf7, 0x34, 0xe6, 0x21,
0xf1, 0x06, 0x3e, 0x9c, 0x98, 0xb8, 0x00, 0x42, 0xa3, 0x6f, 0x40, 0xce, 0xdf, 0x7c, 0x88, 0xe5, 0xfc, 0x30, 0xe4, 0x9d, 0xd0, 0x65, 0xb8, 0x35, 0xd0, 0x09, 0x57, 0xb8, 0x00, 0x85, 0xf2, 0xd8,
0xf7, 0x43, 0x71, 0xfe, 0x9d, 0x11, 0x9c, 0x91, 0xff, 0xd5, 0x31, 0x91, 0xfd, 0x68, 0x79, 0x97, 0xe8, 0xf2, 0x85, 0x06, 0xf0, 0x81, 0x78, 0xb9, 0x3b, 0xfc, 0x59, 0x9d, 0x81, 0x31, 0xde, 0xc6,
0x61, 0x8f, 0x67, 0xd8, 0xe7, 0xcb, 0x9a, 0x80, 0x40, 0x12, 0xca, 0x7a, 0xeb, 0xd9, 0x8b, 0x4a, 0x87, 0x13, 0x13, 0x57, 0x40, 0x68, 0xf4, 0x7b, 0x90, 0xf3, 0xb7, 0x3f, 0xc1, 0xf2, 0x5b, 0xa2,
0xea, 0xf9, 0x8b, 0x4a, 0xea, 0xf7, 0x17, 0x95, 0xd4, 0xe3, 0xfd, 0x8a, 0xf6, 0x6c, 0xbf, 0xa2, 0x38, 0x7f, 0x65, 0x24, 0x6b, 0xe4, 0x7f, 0x89, 0x4c, 0x64, 0x3f, 0x5c, 0xde, 0x67, 0xd8, 0xe3,
0x3d, 0xdf, 0xaf, 0x68, 0x7f, 0xee, 0x57, 0xb4, 0x27, 0x7f, 0x55, 0x52, 0xf7, 0xd3, 0x9d, 0xb9, 0x39, 0xf6, 0x19, 0xb3, 0x2e, 0x40, 0x90, 0x04, 0xb3, 0x2e, 0x3e, 0x7f, 0x55, 0x49, 0xbd, 0x78,
0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x94, 0x53, 0x56, 0x06, 0xf6, 0x12, 0x00, 0x00, 0x55, 0x49, 0xfd, 0xfc, 0xaa, 0x92, 0x7a, 0x7c, 0x50, 0xd1, 0x9e, 0x1f, 0x54, 0xb4, 0x17, 0x07,
0x15, 0xed, 0xd7, 0x83, 0x8a, 0xf6, 0xe4, 0xb7, 0x4a, 0xea, 0x7e, 0xba, 0x33, 0xf7, 0x57, 0x00,
0x00, 0x00, 0xff, 0xff, 0x1f, 0xa7, 0xfc, 0x28, 0x67, 0x13, 0x00, 0x00,
} }

9
vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto generated vendored
View File

@ -19,10 +19,11 @@ limitations under the License.
syntax = 'proto2'; syntax = 'proto2';
package k8s.io.kubernetes.pkg.apis.meta.v1; package k8s.io.apimachinery.pkg.apis.meta.v1;
import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/generated.proto";
import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
import "k8s.io/kubernetes/pkg/api/resource/generated.proto";
import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
// Package-wide variables from generator "generated". // Package-wide variables from generator "generated".
@ -457,6 +458,6 @@ message WatchEvent {
// * If Type is Deleted: the state of the object immediately before deletion. // * If Type is Deleted: the state of the object immediately before deletion.
// * If Type is Error: *Status is recommended; other types may make sense // * If Type is Error: *Status is recommended; other types may make sense
// depending on context. // depending on context.
optional k8s.io.kubernetes.pkg.runtime.RawExtension object = 2; optional k8s.io.apimachinery.pkg.runtime.RawExtension object = 2;
} }

2
vendor/k8s.io/apimachinery/pkg/apis/meta/v1/time.go generated vendored
View File

@ -20,7 +20,7 @@ import (
"encoding/json" "encoding/json"
"time" "time"
"k8s.io/apimachinery/pkg/genericapiserver/openapi/common" "k8s.io/apimachinery/pkg/openapi"
"github.com/go-openapi/spec" "github.com/go-openapi/spec"
"github.com/google/gofuzz" "github.com/google/gofuzz"

23
vendor/k8s.io/apimachinery/pkg/apis/meta/v1/types.go generated vendored
View File

@ -29,8 +29,6 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/ugorji/go/codec"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
) )
@ -445,27 +443,6 @@ func (vs Verbs) String() string {
return fmt.Sprintf("%v", []string(vs)) return fmt.Sprintf("%v", []string(vs))
} }
// CodecEncodeSelf is part of the codec.Selfer interface.
func (vs *Verbs) CodecEncodeSelf(encoder *codec.Encoder) {
encoder.Encode(vs)
}
// CodecDecodeSelf is part of the codec.Selfer interface. It is overwritten here to make sure
// that an empty verbs list is not decoded as nil. On the other hand, an undefined verbs list
// will lead to nil because this decoding for Verbs is not invoked.
//
// TODO(sttts): this is due to a ugorji regression: https://github.com/ugorji/go/issues/119. Remove the
// workaround when the regression is fixed.
func (vs *Verbs) CodecDecodeSelf(decoder *codec.Decoder) {
m := []string{}
decoder.Decode(&m)
if len(m) == 0 {
*vs = []string{}
} else {
*vs = m
}
}
// APIResourceList is a list of APIResource, it is used to expose the name of the // APIResourceList is a list of APIResource, it is used to expose the name of the
// resources supported in a specific group and version, and if the resource // resources supported in a specific group and version, and if the resource
// is namespaced. // is namespaced.

63
vendor/k8s.io/apimachinery/pkg/runtime/generated.pb.go generated vendored
View File

@ -15,14 +15,14 @@ limitations under the License.
*/ */
// Code generated by protoc-gen-gogo. // Code generated by protoc-gen-gogo.
// source: k8s.io/apimachinery/pkg/runtime/generated.proto // source: k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/runtime/generated.proto
// DO NOT EDIT! // DO NOT EDIT!
/* /*
Package runtime is a generated protocol buffer package. Package runtime is a generated protocol buffer package.
It is generated from these files: It is generated from these files:
k8s.io/apimachinery/pkg/runtime/generated.proto k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/runtime/generated.proto
It has these top-level messages: It has these top-level messages:
RawExtension RawExtension
@ -62,9 +62,9 @@ func (*Unknown) ProtoMessage() {}
func (*Unknown) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{2} } func (*Unknown) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{2} }
func init() { func init() {
proto.RegisterType((*RawExtension)(nil), "k8s.io.client-go.pkg.runtime.RawExtension") proto.RegisterType((*RawExtension)(nil), "k8s.io.apimachinery.pkg.runtime.RawExtension")
proto.RegisterType((*TypeMeta)(nil), "k8s.io.client-go.pkg.runtime.TypeMeta") proto.RegisterType((*TypeMeta)(nil), "k8s.io.apimachinery.pkg.runtime.TypeMeta")
proto.RegisterType((*Unknown)(nil), "k8s.io.client-go.pkg.runtime.Unknown") proto.RegisterType((*Unknown)(nil), "k8s.io.apimachinery.pkg.runtime.Unknown")
} }
func (m *RawExtension) Marshal() (data []byte, err error) { func (m *RawExtension) Marshal() (data []byte, err error) {
size := m.Size() size := m.Size()
@ -738,30 +738,31 @@ var (
) )
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 388 bytes of a gzipped FileDescriptorProto // 406 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x90, 0x3f, 0x8f, 0xda, 0x30, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x90, 0x4f, 0x8b, 0xd3, 0x40,
0x18, 0xc6, 0x13, 0x40, 0x82, 0x1a, 0x24, 0x2a, 0x77, 0x68, 0x8a, 0x54, 0x83, 0x58, 0x5a, 0x06, 0x18, 0xc6, 0x93, 0x6d, 0xa1, 0xeb, 0xb4, 0xb0, 0x32, 0x1e, 0x8c, 0x3d, 0x4c, 0x96, 0x9e, 0xec,
0x6c, 0x15, 0xa9, 0x52, 0x57, 0x82, 0x18, 0xaa, 0xaa, 0x52, 0x65, 0x95, 0x0e, 0x9d, 0x1a, 0x12, 0xc1, 0x19, 0x2c, 0x08, 0x5e, 0x37, 0xcb, 0x82, 0x22, 0x82, 0x0c, 0xfe, 0x01, 0x4f, 0x4e, 0x93,
0x37, 0xb5, 0x52, 0xec, 0xc8, 0x71, 0x94, 0x76, 0xeb, 0x47, 0xe8, 0xc7, 0x62, 0x64, 0xbc, 0x09, 0x31, 0x3b, 0xc4, 0xbe, 0x13, 0x26, 0x13, 0xe3, 0xde, 0xfc, 0x08, 0x7e, 0xac, 0x1e, 0xf7, 0xe8,
0x1d, 0xb9, 0xcf, 0x70, 0xfb, 0x09, 0x63, 0xfe, 0x1c, 0xa0, 0xdb, 0xe2, 0xf7, 0xf9, 0x3d, 0xcf, 0xa9, 0xd8, 0xf8, 0x21, 0xbc, 0x4a, 0xa6, 0xd3, 0x5a, 0x5b, 0xc1, 0x5b, 0xe6, 0x7d, 0x9e, 0xdf,
0xfb, 0xbc, 0x01, 0xc3, 0xe4, 0x43, 0x86, 0xb9, 0x24, 0x49, 0x3e, 0x67, 0x4a, 0x30, 0xcd, 0x32, 0xf3, 0x3e, 0x6f, 0xd0, 0xb3, 0xe2, 0x69, 0x45, 0x95, 0x66, 0x45, 0x3d, 0x97, 0x06, 0xa4, 0x95,
0x92, 0x26, 0x31, 0x51, 0xb9, 0xd0, 0x7c, 0xc1, 0x48, 0xcc, 0x04, 0x53, 0x81, 0x66, 0x11, 0x4e, 0x15, 0xfb, 0x2c, 0x21, 0xd3, 0x86, 0x79, 0x41, 0x94, 0x6a, 0x21, 0xd2, 0x6b, 0x05, 0xd2, 0xdc,
0x95, 0xd4, 0x12, 0xbe, 0xde, 0xe1, 0xf8, 0x88, 0xe3, 0x34, 0x89, 0xb1, 0xc5, 0x3b, 0xc3, 0x98, 0xb0, 0xb2, 0xc8, 0x99, 0xa9, 0xc1, 0xaa, 0x85, 0x64, 0xb9, 0x04, 0x69, 0x84, 0x95, 0x19, 0x2d,
0xeb, 0x5f, 0xf9, 0x1c, 0x87, 0x72, 0x41, 0x62, 0x19, 0x4b, 0x62, 0x5c, 0xf3, 0xfc, 0xa7, 0x79, 0x8d, 0xb6, 0x1a, 0xc7, 0x1b, 0x80, 0xee, 0x03, 0xb4, 0x2c, 0x72, 0xea, 0x81, 0xf1, 0xa3, 0x5c,
0x99, 0x87, 0xf9, 0xda, 0xa5, 0x75, 0x46, 0xd7, 0x97, 0x07, 0x29, 0x27, 0x8a, 0x65, 0x32, 0x57, 0xd9, 0xeb, 0x7a, 0x4e, 0x53, 0xbd, 0x60, 0xb9, 0xce, 0x35, 0x73, 0xdc, 0xbc, 0xfe, 0xe8, 0x5e,
0xe1, 0x45, 0x83, 0xce, 0xbb, 0xeb, 0x9e, 0x5c, 0xf3, 0xdf, 0x84, 0x0b, 0x9d, 0x69, 0x75, 0x6e, 0xee, 0xe1, 0xbe, 0x36, 0x79, 0xe3, 0xd9, 0x71, 0xb3, 0x6e, 0xbd, 0x28, 0x15, 0x33, 0xb2, 0xd2,
0xe9, 0x0f, 0x40, 0x8b, 0x06, 0xc5, 0xf4, 0x8f, 0x66, 0x22, 0xe3, 0x52, 0xc0, 0x57, 0xa0, 0xaa, 0xb5, 0x49, 0x8f, 0x3a, 0x8c, 0x1f, 0xff, 0x9b, 0xa9, 0xad, 0xfa, 0xc4, 0x14, 0xd8, 0xca, 0x9a,
0x82, 0xc2, 0x73, 0x7b, 0xee, 0xdb, 0x96, 0x5f, 0x2f, 0xd7, 0xdd, 0x2a, 0x0d, 0x0a, 0xba, 0x9d, 0x43, 0x64, 0x32, 0x45, 0x23, 0x2e, 0x9a, 0xab, 0x2f, 0x56, 0x42, 0xa5, 0x34, 0xe0, 0x07, 0xa8,
0xf5, 0x7f, 0x80, 0xc6, 0xd7, 0xbf, 0x29, 0xfb, 0xcc, 0x74, 0x00, 0x47, 0x00, 0x04, 0x29, 0xff, 0x67, 0x44, 0x13, 0x85, 0xe7, 0xe1, 0xc3, 0x51, 0x32, 0x68, 0x57, 0x71, 0x8f, 0x8b, 0x86, 0x77,
0xc6, 0xd4, 0xd6, 0x64, 0xe8, 0x67, 0x3e, 0x5c, 0xae, 0xbb, 0x4e, 0xb9, 0xee, 0x82, 0xf1, 0x97, 0xb3, 0xc9, 0x07, 0x74, 0xfa, 0xfa, 0xa6, 0x94, 0x2f, 0xa5, 0x15, 0x78, 0x86, 0x90, 0x28, 0xd5,
0x8f, 0x56, 0xa1, 0x27, 0x14, 0xec, 0x81, 0x5a, 0xc2, 0x45, 0xe4, 0x55, 0x0c, 0xdd, 0xb2, 0x74, 0x5b, 0x69, 0x3a, 0xc8, 0xb9, 0xef, 0x24, 0x78, 0xb9, 0x8a, 0x83, 0x76, 0x15, 0xa3, 0x8b, 0x57,
0xed, 0x13, 0x17, 0x11, 0x35, 0x4a, 0xff, 0xde, 0x05, 0xf5, 0x99, 0x48, 0x84, 0x2c, 0x04, 0x9c, 0xcf, 0xbd, 0xc2, 0xf7, 0x5c, 0xf8, 0x1c, 0xf5, 0x0b, 0x05, 0x59, 0x74, 0xe2, 0xdc, 0x23, 0xef,
0x81, 0x86, 0xb6, 0xdb, 0x4c, 0x7e, 0x73, 0xf4, 0x06, 0x3f, 0xf9, 0x83, 0xf1, 0xbe, 0x9c, 0xff, 0xee, 0xbf, 0x50, 0x90, 0x71, 0xa7, 0x4c, 0x7e, 0x85, 0x68, 0xf0, 0x06, 0x0a, 0xd0, 0x0d, 0xe0,
0xdc, 0x46, 0x1f, 0xea, 0xd2, 0x43, 0xd4, 0xfe, 0xbe, 0xca, 0xe5, 0x7d, 0x70, 0x0c, 0xda, 0xa1, 0x77, 0xe8, 0xd4, 0xfa, 0x6d, 0x2e, 0x7f, 0x38, 0x9b, 0xd2, 0xff, 0xfc, 0x62, 0xba, 0xad, 0x97,
0x14, 0x9a, 0x09, 0x3d, 0x15, 0xa1, 0x8c, 0xb8, 0x88, 0xbd, 0xaa, 0xa9, 0xfa, 0xd2, 0xe6, 0xb5, 0xdc, 0xf5, 0xe1, 0xbb, 0xc2, 0x7c, 0x17, 0xb6, 0xbd, 0xf0, 0xe4, 0xf8, 0x42, 0x7c, 0x81, 0xce,
0x27, 0x8f, 0x65, 0x7a, 0xce, 0xc3, 0xf7, 0xa0, 0x69, 0x47, 0xdb, 0xd5, 0x5e, 0xcd, 0xd8, 0x5f, 0x52, 0x0d, 0x56, 0x82, 0xbd, 0x82, 0x54, 0x67, 0x0a, 0xf2, 0xa8, 0xe7, 0xca, 0xde, 0xf7, 0x79,
0x58, 0x7b, 0x73, 0x72, 0x94, 0xe8, 0x29, 0xe7, 0x0f, 0x96, 0x1b, 0xe4, 0xac, 0x36, 0xc8, 0xb9, 0x67, 0x97, 0x7f, 0xcb, 0xfc, 0xd0, 0x8f, 0x9f, 0xa0, 0xa1, 0x1f, 0x75, 0xab, 0xa3, 0xbe, 0xc3,
0xd9, 0x20, 0xe7, 0x5f, 0x89, 0xdc, 0x65, 0x89, 0xdc, 0x55, 0x89, 0xdc, 0xdb, 0x12, 0xb9, 0xff, 0xef, 0x79, 0x7c, 0x78, 0xf9, 0x47, 0xe2, 0xfb, 0xbe, 0x64, 0xba, 0x5c, 0x93, 0xe0, 0x76, 0x4d,
0xef, 0x90, 0xf3, 0xbd, 0x6e, 0x8f, 0x7c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x32, 0xc1, 0x73, 0x2d, 0x82, 0xef, 0x6b, 0x12, 0x7c, 0x6d, 0x49, 0xb8, 0x6c, 0x49, 0x78, 0xdb, 0x92, 0xf0, 0x47, 0x4b,
0x94, 0x02, 0x00, 0x00, 0xc2, 0x6f, 0x3f, 0x49, 0xf0, 0x7e, 0xe0, 0x8f, 0xfc, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xa5, 0x26,
0x55, 0x0f, 0xb3, 0x02, 0x00, 0x00,
} }

2
vendor/k8s.io/apimachinery/pkg/runtime/generated.proto generated vendored
View File

@ -19,7 +19,7 @@ limitations under the License.
syntax = 'proto2'; syntax = 'proto2';
package k8s.io.kubernetes.pkg.runtime; package k8s.io.apimachinery.pkg.runtime;
import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; import "k8s.io/kubernetes/pkg/api/resource/generated.proto";
import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";

32
vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.pb.go generated vendored
View File

@ -15,14 +15,14 @@ limitations under the License.
*/ */
// Code generated by protoc-gen-gogo. // Code generated by protoc-gen-gogo.
// source: k8s.io/apimachinery/pkg/runtime/schema/generated.proto // source: k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.proto
// DO NOT EDIT! // DO NOT EDIT!
/* /*
Package schema is a generated protocol buffer package. Package schema is a generated protocol buffer package.
It is generated from these files: It is generated from these files:
k8s.io/apimachinery/pkg/runtime/schema/generated.proto k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.proto
It has these top-level messages: It has these top-level messages:
*/ */
@ -42,17 +42,19 @@ var _ = math.Inf
const _ = proto.GoGoProtoPackageIsVersion1 const _ = proto.GoGoProtoPackageIsVersion1
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 183 bytes of a gzipped FileDescriptorProto // 215 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x32, 0xc9, 0xb6, 0x28, 0xd6, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0xce, 0xb1, 0x4e, 0xc4, 0x30,
0xcb, 0xcc, 0xd7, 0xcf, 0x2e, 0x4d, 0x4a, 0x2d, 0xca, 0x4b, 0x2d, 0x49, 0x2d, 0xd6, 0x2f, 0xc8, 0x0c, 0xc6, 0xf1, 0x76, 0x61, 0x60, 0x64, 0xec, 0xe0, 0x11, 0xb1, 0x10, 0x0b, 0x26, 0x66, 0x5e,
0x4e, 0xd7, 0x2f, 0x2a, 0xcd, 0x2b, 0xc9, 0xcc, 0x4d, 0xd5, 0x2f, 0x4e, 0xce, 0x48, 0xcd, 0x4d, 0x80, 0x9d, 0x2d, 0xed, 0x99, 0xd4, 0x2a, 0x8d, 0x23, 0xc7, 0x41, 0x62, 0xe3, 0x11, 0x78, 0xac,
0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0x4a, 0x2c, 0x49, 0x4d, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x1b, 0x6f, 0x64, 0xa4, 0xe5, 0x45, 0x10, 0xcd, 0x0d, 0xe8, 0x60, 0xcb, 0xa7, 0xe8, 0x67, 0xfd,
0x17, 0x52, 0x81, 0xe8, 0xd2, 0x43, 0xe8, 0xd2, 0x2b, 0xc8, 0x4e, 0xd7, 0x83, 0xea, 0xd2, 0x83, 0xcf, 0x1f, 0xa6, 0xbb, 0xec, 0x58, 0x70, 0x2a, 0x3d, 0x69, 0x24, 0xa3, 0x8c, 0x2f, 0x14, 0x77,
0xe8, 0x92, 0xd2, 0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0xa2, 0x78, 0xfc, 0xf0, 0x89, 0x67, 0x3f, 0x8c, 0x1c, 0x49, 0x5f, 0x31, 0x4d, 0x01, 0xb5, 0x44,
0x4f, 0xcf, 0xd7, 0x07, 0x6b, 0x4e, 0x2a, 0x4d, 0x03, 0xf3, 0xc0, 0x1c, 0x30, 0x0b, 0x62, 0xa8, 0xe3, 0x99, 0x30, 0x0f, 0x23, 0xcd, 0x1e, 0x03, 0x45, 0x52, 0x6f, 0xb4, 0x73, 0x49, 0xc5, 0xe4,
0x94, 0x21, 0x76, 0xa7, 0x94, 0x96, 0x64, 0xe6, 0xe8, 0x67, 0xe6, 0x95, 0x14, 0x97, 0x14, 0xa1, 0xe2, 0xb2, 0x3a, 0xf7, 0xdb, 0xb9, 0x34, 0x05, 0x77, 0x74, 0xae, 0xba, 0xee, 0x3a, 0xb0, 0x8d,
0xbb, 0xc3, 0x49, 0xe3, 0xc4, 0x43, 0x39, 0x86, 0x0b, 0x0f, 0xe5, 0x18, 0x6e, 0x3c, 0x94, 0x63, 0xa5, 0x77, 0x83, 0xcc, 0x18, 0x24, 0x08, 0x6e, 0xbc, 0x2f, 0x4f, 0xdb, 0xda, 0xc6, 0xf6, 0xaa,
0x68, 0x78, 0x24, 0xc7, 0x78, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x67, 0xbb, 0xdb, 0xbf, 0x9d, 0x3f, 0x31, 0x3e, 0x31, 0x2a, 0x65, 0x29, 0x3a, 0xd0, 0x69, 0x4a,
0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x10, 0xc5, 0x06, 0x71, 0x0b, 0x20, 0x00, 0x00, 0xff, 0xff, 0x8d, 0x77, 0xf3, 0xbf, 0x29, 0xc6, 0xcf, 0xc8, 0xd1, 0xb2, 0xe9, 0x29, 0xb9, 0xbf, 0xda, 0x2f, 0xd0,
0x74, 0x75, 0xa7, 0xe8, 0x00, 0x00, 0x00, 0x1c, 0x16, 0x68, 0x3e, 0x16, 0x68, 0xde, 0x56, 0x68, 0xf7, 0x2b, 0xb4, 0x87, 0x15, 0xda, 0xcf,
0x15, 0xda, 0xf7, 0x2f, 0x68, 0x1e, 0xcf, 0x6a, 0xff, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x86,
0xae, 0x35, 0x6c, 0x39, 0x01, 0x00, 0x00,
} }

3
vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.proto generated vendored
View File

@ -19,8 +19,9 @@ limitations under the License.
syntax = 'proto2'; syntax = 'proto2';
package k8s.io.kubernetes.pkg.runtime.schema; package k8s.io.apimachinery.pkg.runtime.schema;
import "k8s.io/kubernetes/pkg/api/resource/generated.proto";
import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
// Package-wide variables from generator "generated". // Package-wide variables from generator "generated".

6
vendor/k8s.io/apimachinery/pkg/runtime/types.go generated vendored
View File

@ -30,9 +30,7 @@ package runtime
// TypeMeta is provided here for convenience. You may use it directly from this package or define // TypeMeta is provided here for convenience. You may use it directly from this package or define
// your own with the same fields. // your own with the same fields.
// //
// +k8s:deepcopy-gen=true
// +protobuf=true // +protobuf=true
// +k8s:openapi-gen=true
type TypeMeta struct { type TypeMeta struct {
// +optional // +optional
APIVersion string `json:"apiVersion,omitempty" yaml:"apiVersion,omitempty" protobuf:"bytes,1,opt,name=apiVersion"` APIVersion string `json:"apiVersion,omitempty" yaml:"apiVersion,omitempty" protobuf:"bytes,1,opt,name=apiVersion"`
@ -86,9 +84,7 @@ const (
// in the Object. (TODO: In the case where the object is of an unknown type, a // in the Object. (TODO: In the case where the object is of an unknown type, a
// runtime.Unknown object will be created and stored.) // runtime.Unknown object will be created and stored.)
// //
// +k8s:deepcopy-gen=true
// +protobuf=true // +protobuf=true
// +k8s:openapi-gen=true
type RawExtension struct { type RawExtension struct {
// Raw is the underlying serialization of this object. // Raw is the underlying serialization of this object.
// //
@ -105,9 +101,7 @@ type RawExtension struct {
// TODO: Make this object have easy access to field based accessors and settors for // TODO: Make this object have easy access to field based accessors and settors for
// metadata and field mutatation. // metadata and field mutatation.
// //
// +k8s:deepcopy-gen=true
// +protobuf=true // +protobuf=true
// +k8s:openapi-gen=true
type Unknown struct { type Unknown struct {
TypeMeta `json:",inline" protobuf:"bytes,1,opt,name=typeMeta"` TypeMeta `json:",inline" protobuf:"bytes,1,opt,name=typeMeta"`
// Raw will hold the complete serialized object which couldn't be matched // Raw will hold the complete serialized object which couldn't be matched

8
vendor/k8s.io/apimachinery/pkg/util/validation/validation.go generated vendored
View File

@ -88,7 +88,7 @@ func IsValidLabelValue(value string) []string {
} }
const dns1123LabelFmt string = "[a-z0-9]([-a-z0-9]*[a-z0-9])?" const dns1123LabelFmt string = "[a-z0-9]([-a-z0-9]*[a-z0-9])?"
const dns1123LabelErrMsg string = "a valid DNS (RFC 1123) label must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character" const dns1123LabelErrMsg string = "a DNS-1123 label must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character"
const DNS1123LabelMaxLength int = 63 const DNS1123LabelMaxLength int = 63
var dns1123LabelRegexp = regexp.MustCompile("^" + dns1123LabelFmt + "$") var dns1123LabelRegexp = regexp.MustCompile("^" + dns1123LabelFmt + "$")
@ -107,7 +107,7 @@ func IsDNS1123Label(value string) []string {
} }
const dns1123SubdomainFmt string = dns1123LabelFmt + "(\\." + dns1123LabelFmt + ")*" const dns1123SubdomainFmt string = dns1123LabelFmt + "(\\." + dns1123LabelFmt + ")*"
const dns1123SubdomainErrorMsg string = "a valid DNS (RFC 1123) subdomain must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character" const dns1123SubdomainErrorMsg string = "a DNS-1123 subdomain must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character"
const DNS1123SubdomainMaxLength int = 253 const DNS1123SubdomainMaxLength int = 253
var dns1123SubdomainRegexp = regexp.MustCompile("^" + dns1123SubdomainFmt + "$") var dns1123SubdomainRegexp = regexp.MustCompile("^" + dns1123SubdomainFmt + "$")
@ -126,7 +126,7 @@ func IsDNS1123Subdomain(value string) []string {
} }
const dns1035LabelFmt string = "[a-z]([-a-z0-9]*[a-z0-9])?" const dns1035LabelFmt string = "[a-z]([-a-z0-9]*[a-z0-9])?"
const dns1035LabelErrMsg string = "a valid DNS (RFC 1035) label must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character" const dns1035LabelErrMsg string = "a DNS-1035 label must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character"
const DNS1035LabelMaxLength int = 63 const DNS1035LabelMaxLength int = 63
var dns1035LabelRegexp = regexp.MustCompile("^" + dns1035LabelFmt + "$") var dns1035LabelRegexp = regexp.MustCompile("^" + dns1035LabelFmt + "$")
@ -149,7 +149,7 @@ func IsDNS1035Label(value string) []string {
// - valid: *.bar.com, *.foo.bar.com // - valid: *.bar.com, *.foo.bar.com
// - invalid: *.*.bar.com, *.foo.*.com, *bar.com, f*.bar.com, * // - invalid: *.*.bar.com, *.foo.*.com, *bar.com, f*.bar.com, *
const wildcardDNS1123SubdomainFmt = "\\*\\." + dns1123SubdomainFmt const wildcardDNS1123SubdomainFmt = "\\*\\." + dns1123SubdomainFmt
const wildcardDNS1123SubdomainErrMsg = "a valid wildcard DNS (RFC 1123) subdomain must start with '*.', followed by a valid DNS subdomain, which must consist of lower case alphanumeric characters, '-' or '.' and end with an alphanumeric character" const wildcardDNS1123SubdomainErrMsg = "a wildcard DNS-1123 subdomain must start with '*.', followed by a valid DNS subdomain, which must consist of lower case alphanumeric characters, '-' or '.' and end with an alphanumeric character"
// IsWildcardDNS1123Subdomain tests for a string that conforms to the definition of a // IsWildcardDNS1123Subdomain tests for a string that conforms to the definition of a
// wildcard subdomain in DNS (RFC 1034 section 4.3.3). // wildcard subdomain in DNS (RFC 1034 section 4.3.3).