Update generated files

This commit is contained in:
Dr. Stefan Schimanski
2017-01-29 13:08:49 +01:00
committed by Dr. Stefan Schimanski
parent 79adb99a13
commit 44ea6b3f30
148 changed files with 2264 additions and 1878 deletions

View File

@@ -31,7 +31,6 @@ go_library(
tags = ["automanaged"],
deps = [
"//pkg/api:go_default_library",
"//pkg/api/resource:go_default_library",
"//pkg/apis/extensions:go_default_library",
"//pkg/util:go_default_library",
"//pkg/util/intstr:go_default_library",
@@ -40,6 +39,7 @@ go_library(
"//vendor:github.com/gogo/protobuf/sortkeys",
"//vendor:github.com/ugorji/go/codec",
"//vendor:k8s.io/apimachinery/pkg/api/meta",
"//vendor:k8s.io/apimachinery/pkg/api/resource",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/conversion",
"//vendor:k8s.io/apimachinery/pkg/labels",
@@ -63,11 +63,12 @@ go_test(
tags = ["automanaged"],
deps = [
"//pkg/api:go_default_library",
"//pkg/api/resource:go_default_library",
"//pkg/api/testing/compat:go_default_library",
"//pkg/api/v1:go_default_library",
"//pkg/api/validation:go_default_library",
"//pkg/util/intstr:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/api/equality",
"//vendor:k8s.io/apimachinery/pkg/api/resource",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/runtime",
"//vendor:k8s.io/apimachinery/pkg/util/diff",
@@ -84,8 +85,8 @@ go_test(
library = ":go_default_library",
tags = ["automanaged"],
deps = [
"//pkg/api:go_default_library",
"//pkg/api/resource:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/api/equality",
"//vendor:k8s.io/apimachinery/pkg/api/resource",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/labels",
],

File diff suppressed because it is too large Load Diff

View File

@@ -21,10 +21,10 @@ syntax = 'proto2';
package k8s.io.kubernetes.pkg.api.v1;
import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
import "k8s.io/apimachinery/pkg/runtime/generated.proto";
import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
// Package-wide variables from generator "generated".
@@ -1241,23 +1241,23 @@ message LimitRangeItem {
// Max usage constraints on this kind by resource name.
// +optional
map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> max = 2;
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> max = 2;
// Min usage constraints on this kind by resource name.
// +optional
map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> min = 3;
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> min = 3;
// Default resource requirement limit value by resource name if resource limit is omitted.
// +optional
map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> default = 4;
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> default = 4;
// DefaultRequest is the default resource requirement request value by resource name if resource request is omitted.
// +optional
map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> defaultRequest = 5;
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> defaultRequest = 5;
// MaxLimitRequestRatio if specified, the named resource must have a request and limit that are both non-zero where limit divided by request is less than or equal to the enumerated value; this represents the max burst for the named resource.
// +optional
map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> maxLimitRequestRatio = 6;
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> maxLimitRequestRatio = 6;
}
// LimitRangeList is a list of LimitRange items.
@@ -1527,7 +1527,7 @@ message NodeProxyOptions {
// see http://releases.k8s.io/HEAD/docs/design/resources.md for more details.
message NodeResources {
// Capacity represents the available resources of a node
map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> capacity = 1;
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> capacity = 1;
}
// A node selector represents the union of the results of one or more label queries
@@ -1589,12 +1589,12 @@ message NodeStatus {
// Capacity represents the total resources of a node.
// More info: http://kubernetes.io/docs/user-guide/persistent-volumes#capacity for more details.
// +optional
map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> capacity = 1;
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> capacity = 1;
// Allocatable represents the resources of a node that are available for scheduling.
// Defaults to Capacity.
// +optional
map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> allocatable = 2;
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> allocatable = 2;
// NodePhase is the recently observed lifecycle phase of the node.
// More info: http://releases.k8s.io/HEAD/docs/admin/node.md#node-phase
@@ -1964,7 +1964,7 @@ message PersistentVolumeClaimStatus {
// Represents the actual resources of the underlying volume.
// +optional
map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> capacity = 3;
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> capacity = 3;
}
// PersistentVolumeClaimVolumeSource references the user's PVC in the same namespace.
@@ -2086,7 +2086,7 @@ message PersistentVolumeSpec {
// A description of the persistent volume's resources and capacity.
// More info: http://kubernetes.io/docs/user-guide/persistent-volumes#capacity
// +optional
map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> capacity = 1;
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> capacity = 1;
// The actual volume backing the persistent volume.
optional PersistentVolumeSource persistentVolumeSource = 2;
@@ -2992,7 +2992,7 @@ message ResourceFieldSelector {
// Specifies the output format of the exposed resources, defaults to "1"
// +optional
optional k8s.io.kubernetes.pkg.api.resource.Quantity divisor = 3;
optional k8s.io.apimachinery.pkg.api.resource.Quantity divisor = 3;
}
// ResourceQuota sets aggregate quota restrictions enforced per namespace
@@ -3030,7 +3030,7 @@ message ResourceQuotaSpec {
// Hard is the set of desired hard limits for each named resource.
// More info: http://releases.k8s.io/HEAD/docs/design/admission_control_resource_quota.md#admissioncontrol-plugin-resourcequota
// +optional
map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> hard = 1;
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> hard = 1;
// A collection of filters that must match each object tracked by a quota.
// If not specified, the quota matches all objects.
@@ -3043,11 +3043,11 @@ message ResourceQuotaStatus {
// Hard is the set of enforced hard limits for each named resource.
// More info: http://releases.k8s.io/HEAD/docs/design/admission_control_resource_quota.md#admissioncontrol-plugin-resourcequota
// +optional
map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> hard = 1;
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> hard = 1;
// Used is the current observed total usage of the resource in the namespace.
// +optional
map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> used = 2;
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> used = 2;
}
// ResourceRequirements describes the compute resource requirements.
@@ -3055,14 +3055,14 @@ message ResourceRequirements {
// Limits describes the maximum amount of compute resources allowed.
// More info: http://kubernetes.io/docs/user-guide/compute-resources/
// +optional
map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> limits = 1;
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> limits = 1;
// Requests describes the minimum amount of compute resources required.
// If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
// otherwise to an implementation-defined value.
// More info: http://kubernetes.io/docs/user-guide/compute-resources/
// +optional
map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> requests = 2;
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> requests = 2;
}
// SELinuxOptions are the labels to be applied to the container

View File

@@ -65,10 +65,10 @@ func init() {
panic(err)
}
if false { // reference the types, but skip this branch at build/run time
var v0 pkg2_v1.Time
var v1 pkg5_runtime.RawExtension
var v2 pkg1_types.UID
var v3 pkg3_resource.Quantity
var v0 pkg3_resource.Quantity
var v1 pkg2_v1.Time
var v2 pkg5_runtime.RawExtension
var v3 pkg1_types.UID
var v4 pkg4_intstr.IntOrString
var v5 time.Time
_, _, _, _, _, _ = v0, v1, v2, v3, v4, v5

View File

@@ -13,8 +13,8 @@ go_library(
tags = ["automanaged"],
deps = [
"//pkg/api:go_default_library",
"//pkg/api/resource:go_default_library",
"//pkg/api/v1:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/api/resource",
"//vendor:k8s.io/apimachinery/pkg/util/sets",
"//vendor:k8s.io/apimachinery/pkg/util/validation",
"//vendor:k8s.io/apimachinery/pkg/util/validation/field",