From 0191433d584cef4f60b633ad8aaf6d970147b916 Mon Sep 17 00:00:00 2001 From: mbohlool Date: Mon, 17 Oct 2016 09:11:20 -0700 Subject: [PATCH] Generated protobufs --- .../apis/federation/v1beta1/generated.proto | 12 + pkg/api/unversioned/generated.proto | 22 + pkg/api/v1/generated.proto | 439 ++++++++++++++++++ pkg/apis/apps/v1alpha1/generated.proto | 8 + .../authentication/v1beta1/generated.proto | 10 + .../authorization/v1beta1/generated.proto | 24 + pkg/apis/autoscaling/v1/generated.proto | 15 + pkg/apis/batch/v1/generated.proto | 22 + pkg/apis/batch/v2alpha1/generated.proto | 35 ++ .../certificates/v1alpha1/generated.proto | 12 + pkg/apis/extensions/v1beta1/generated.proto | 136 ++++++ pkg/apis/imagepolicy/v1alpha1/generated.proto | 7 + pkg/apis/policy/v1alpha1/generated.proto | 8 + pkg/apis/rbac/v1alpha1/generated.proto | 15 + pkg/apis/storage/v1beta1/generated.proto | 3 + pkg/runtime/generated.proto | 2 + 16 files changed, 770 insertions(+) diff --git a/federation/apis/federation/v1beta1/generated.proto b/federation/apis/federation/v1beta1/generated.proto index 30c5533c2d1..9ad46d690f2 100644 --- a/federation/apis/federation/v1beta1/generated.proto +++ b/federation/apis/federation/v1beta1/generated.proto @@ -34,12 +34,15 @@ option go_package = "v1beta1"; message Cluster { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Spec defines the behavior of the Cluster. + // +optional optional ClusterSpec spec = 2; // Status describes the current status of a Cluster + // +optional optional ClusterStatus status = 3; } @@ -52,15 +55,19 @@ message ClusterCondition { optional string status = 2; // Last time the condition was checked. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; // Last time the condition transit from one status to another. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; // (brief) reason for the condition's last transition. + // +optional optional string reason = 5; // Human readable message indicating details about last transition. + // +optional optional string message = 6; } @@ -68,6 +75,7 @@ message ClusterCondition { message ClusterList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // List of Cluster objects. @@ -87,19 +95,23 @@ message ClusterSpec { // Admin needs to ensure that the required secret exists. Secret should be in the same namespace where federation control plane is hosted and it should have kubeconfig in its data with key "kubeconfig". // This will later be changed to a reference to secret in federation control plane when the federation control plane supports secrets. // This can be left empty if the cluster allows insecure access. + // +optional optional k8s.io.kubernetes.pkg.api.v1.LocalObjectReference secretRef = 2; } // ClusterStatus is information about the current status of a cluster updated by cluster controller peridocally. message ClusterStatus { // Conditions is an array of current cluster conditions. + // +optional repeated ClusterCondition conditions = 1; // Zones is the list of availability zones in which the nodes of the cluster exist, e.g. 'us-east1-a'. // These will always be in the same region. + // +optional repeated string zones = 5; // Region is the name of the region in which all of the nodes in the cluster exist. e.g. 'us-east1'. + // +optional optional string region = 6; } diff --git a/pkg/api/unversioned/generated.proto b/pkg/api/unversioned/generated.proto index cab7058aac1..91d3fbf6512 100644 --- a/pkg/api/unversioned/generated.proto +++ b/pkg/api/unversioned/generated.proto @@ -38,6 +38,7 @@ message APIGroup { // preferredVersion is the version preferred by the API server, which // probably is the storage version. + // +optional optional GroupVersionForDiscovery preferredVersion = 3; // a map of client CIDR to server address that is serving this group. @@ -185,9 +186,11 @@ message LabelSelector { // matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels // map is equivalent to an element of matchExpressions, whose key field is "key", the // operator is "In", and the values array contains only "value". The requirements are ANDed. + // +optional map matchLabels = 1; // matchExpressions is a list of label selector requirements. The requirements are ANDed. + // +optional repeated LabelSelectorRequirement matchExpressions = 2; } @@ -205,6 +208,7 @@ message LabelSelectorRequirement { // the values array must be non-empty. If the operator is Exists or DoesNotExist, // the values array must be empty. This array is replaced during a strategic // merge patch. + // +optional repeated string values = 3; } @@ -214,6 +218,7 @@ message ListMeta { // SelfLink is a URL representing this object. // Populated by the system. // Read-only. + // +optional optional string selfLink = 1; // String that identifies the server's internal version of this object that @@ -222,6 +227,7 @@ message ListMeta { // Populated by the system. // Read-only. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency + // +optional optional string resourceVersion = 2; } @@ -246,29 +252,35 @@ message ServerAddressByClientCIDR { message Status { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional ListMeta metadata = 1; // Status of the operation. // One of: "Success" or "Failure". // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional string status = 2; // A human-readable description of the status of this operation. + // +optional optional string message = 3; // A machine-readable description of why this operation is in the // "Failure" status. If this value is empty there // is no information available. A Reason clarifies an HTTP status // code but does not override it. + // +optional optional string reason = 4; // Extended data associated with the reason. Each reason may define its // own extended details. This field is optional and the data returned // is not guaranteed to conform to any schema except that defined by // the reason type. + // +optional optional StatusDetails details = 5; // Suggested HTTP return code for this status, 0 if not set. + // +optional optional int32 code = 6; } @@ -277,10 +289,12 @@ message Status { message StatusCause { // A machine-readable description of the cause of the error. If this value is // empty there is no information available. + // +optional optional string reason = 1; // A human-readable description of the cause of the error. This field may be // presented as-is to a reader. + // +optional optional string message = 2; // The field of the resource that has caused this error, as named by its JSON @@ -292,6 +306,7 @@ message StatusCause { // Examples: // "name" - the field "name" on the current resource // "items[0].name" - the field "name" on the first array entry in "items" + // +optional optional string field = 3; } @@ -304,21 +319,26 @@ message StatusCause { message StatusDetails { // The name attribute of the resource associated with the status StatusReason // (when there is a single name which can be described). + // +optional optional string name = 1; // The group attribute of the resource associated with the status StatusReason. + // +optional optional string group = 2; // The kind attribute of the resource associated with the status StatusReason. // On some operations may differ from the requested resource Kind. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional string kind = 3; // The Causes array includes more details associated with the StatusReason // failure. Not all StatusReasons may provide detailed causes. + // +optional repeated StatusCause causes = 4; // If specified, the time in seconds before the operation should be retried. + // +optional optional int32 retryAfterSeconds = 5; } @@ -367,12 +387,14 @@ message TypeMeta { // Cannot be updated. // In CamelCase. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional string kind = 1; // APIVersion defines the versioned schema of this representation of an object. // Servers should convert recognized schemas to the latest internal value, and // may reject unrecognized values. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources + // +optional optional string apiVersion = 2; } diff --git a/pkg/api/v1/generated.proto b/pkg/api/v1/generated.proto index b9578c41fdb..3f0bf25d79c 100644 --- a/pkg/api/v1/generated.proto +++ b/pkg/api/v1/generated.proto @@ -45,29 +45,35 @@ message AWSElasticBlockStoreVolumeSource { // Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. // More info: http://kubernetes.io/docs/user-guide/volumes#awselasticblockstore // TODO: how do we prevent errors in the filesystem from compromising the machine + // +optional optional string fsType = 2; // The partition in the volume that you want to mount. // If omitted, the default is to mount by volume name. // Examples: For volume /dev/sda1, you specify the partition as "1". // Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty). + // +optional optional int32 partition = 3; // Specify "true" to force and set the ReadOnly property in VolumeMounts to "true". // If omitted, the default is "false". // More info: http://kubernetes.io/docs/user-guide/volumes#awselasticblockstore + // +optional optional bool readOnly = 4; } // Affinity is a group of affinity scheduling rules. message Affinity { // Describes node affinity scheduling rules for the pod. + // +optional optional NodeAffinity nodeAffinity = 1; // Describes pod affinity scheduling rules (e.g. co-locate this pod in the same node, zone, etc. as some other pod(s)). + // +optional optional PodAffinity podAffinity = 2; // Describes pod anti-affinity scheduling rules (e.g. avoid putting this pod in the same node, zone, etc. as some other pod(s)). + // +optional optional PodAntiAffinity podAntiAffinity = 3; } @@ -86,6 +92,7 @@ message AttachedVolume { message AvoidPods { // Bounded-sized list of signatures of pods that should avoid this node, sorted // in timestamp order from oldest to newest. Size of the slice is unspecified. + // +optional repeated PreferAvoidPodsEntry preferAvoidPods = 1; } @@ -98,15 +105,18 @@ message AzureDiskVolumeSource { optional string diskURI = 2; // Host Caching mode: None, Read Only, Read Write. + // +optional optional string cachingMode = 3; // Filesystem type to mount. // Must be a filesystem type supported by the host operating system. // Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. + // +optional optional string fsType = 4; // Defaults to false (read/write). ReadOnly here will force // the ReadOnly setting in VolumeMounts. + // +optional optional bool readOnly = 5; } @@ -120,6 +130,7 @@ message AzureFileVolumeSource { // Defaults to false (read/write). ReadOnly here will force // the ReadOnly setting in VolumeMounts. + // +optional optional bool readOnly = 3; } @@ -128,6 +139,7 @@ message AzureFileVolumeSource { message Binding { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional ObjectMeta metadata = 1; // The target object that you want to bind to the standard object. @@ -137,9 +149,11 @@ message Binding { // Adds and removes POSIX capabilities from running containers. message Capabilities { // Added capabilities + // +optional repeated string add = 1; // Removed capabilities + // +optional repeated string drop = 2; } @@ -151,23 +165,28 @@ message CephFSVolumeSource { repeated string monitors = 1; // Optional: Used as the mounted root, rather than the full Ceph tree, default is / + // +optional optional string path = 2; // Optional: User is the rados user name, default is admin // More info: http://releases.k8s.io/HEAD/examples/volumes/cephfs/README.md#how-to-use-it + // +optional optional string user = 3; // Optional: SecretFile is the path to key ring for User, default is /etc/ceph/user.secret // More info: http://releases.k8s.io/HEAD/examples/volumes/cephfs/README.md#how-to-use-it + // +optional optional string secretFile = 4; // Optional: SecretRef is reference to the authentication secret for User, default is empty. // More info: http://releases.k8s.io/HEAD/examples/volumes/cephfs/README.md#how-to-use-it + // +optional optional LocalObjectReference secretRef = 5; // Optional: Defaults to false (read/write). ReadOnly here will force // the ReadOnly setting in VolumeMounts. // More info: http://releases.k8s.io/HEAD/examples/volumes/cephfs/README.md#how-to-use-it + // +optional optional bool readOnly = 6; } @@ -184,11 +203,13 @@ message CinderVolumeSource { // Must be a filesystem type supported by the host operating system. // Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. // More info: http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md + // +optional optional string fsType = 2; // Optional: Defaults to false (read/write). ReadOnly here will force // the ReadOnly setting in VolumeMounts. // More info: http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md + // +optional optional bool readOnly = 3; } @@ -204,10 +225,12 @@ message ComponentCondition { // Message about the condition for a component. // For example, information about a health check. + // +optional optional string message = 3; // Condition error code for a component. // For example, a health check error code. + // +optional optional string error = 4; } @@ -215,9 +238,11 @@ message ComponentCondition { message ComponentStatus { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional ObjectMeta metadata = 1; // List of component conditions observed + // +optional repeated ComponentCondition conditions = 2; } @@ -225,6 +250,7 @@ message ComponentStatus { message ComponentStatusList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // List of ComponentStatus objects. @@ -235,10 +261,12 @@ message ComponentStatusList { message ConfigMap { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional ObjectMeta metadata = 1; // Data contains the configuration data. // Each key must be a valid DNS_SUBDOMAIN with an optional leading dot. + // +optional map data = 2; } @@ -254,6 +282,7 @@ message ConfigMapKeySelector { // ConfigMapList is a resource containing a list of ConfigMap objects. message ConfigMapList { // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is the list of ConfigMaps. @@ -276,6 +305,7 @@ message ConfigMapVolumeSource { // present. If a key is specified which is not present in the ConfigMap, // the volume setup will error. Paths must be relative and may not contain // the '..' path or start with '..'. + // +optional repeated KeyToPath items = 2; // Optional: mode bits to use on created files by default. Must be a @@ -283,6 +313,7 @@ message ConfigMapVolumeSource { // Directories within the path are not affected by this setting. // This might be in conflict with other options that affect the file // mode, like fsGroup, and the result can be other mode bits set. + // +optional optional int32 defaultMode = 3; } @@ -295,6 +326,7 @@ message Container { // Docker image name. // More info: http://kubernetes.io/docs/user-guide/images + // +optional optional string image = 2; // Entrypoint array. Not executed within a shell. @@ -305,6 +337,7 @@ message Container { // regardless of whether the variable exists or not. // Cannot be updated. // More info: http://kubernetes.io/docs/user-guide/containers#containers-and-commands + // +optional repeated string command = 3; // Arguments to the entrypoint. @@ -315,12 +348,14 @@ message Container { // regardless of whether the variable exists or not. // Cannot be updated. // More info: http://kubernetes.io/docs/user-guide/containers#containers-and-commands + // +optional repeated string args = 4; // Container's working directory. // If not specified, the container runtime's default will be used, which // might be configured in the container image. // Cannot be updated. + // +optional optional string workingDir = 5; // List of ports to expose from the container. Exposing a port here gives @@ -330,35 +365,42 @@ message Container { // listening on the default "0.0.0.0" address inside a container will be // accessible from the network. // Cannot be updated. + // +optional repeated ContainerPort ports = 6; // List of environment variables to set in the container. // Cannot be updated. + // +optional repeated EnvVar env = 7; // Compute Resources required by this container. // Cannot be updated. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#resources + // +optional optional ResourceRequirements resources = 8; // Pod volumes to mount into the container's filesystem. // Cannot be updated. + // +optional repeated VolumeMount volumeMounts = 9; // Periodic probe of container liveness. // Container will be restarted if the probe fails. // Cannot be updated. // More info: http://kubernetes.io/docs/user-guide/pod-states#container-probes + // +optional optional Probe livenessProbe = 10; // Periodic probe of container service readiness. // Container will be removed from service endpoints if the probe fails. // Cannot be updated. // More info: http://kubernetes.io/docs/user-guide/pod-states#container-probes + // +optional optional Probe readinessProbe = 11; // Actions that the management system should take in response to container lifecycle events. // Cannot be updated. + // +optional optional Lifecycle lifecycle = 12; // Optional: Path at which the file to which the container's termination message @@ -366,6 +408,7 @@ message Container { // Message written is intended to be brief final status, such as an assertion failure message. // Defaults to /dev/termination-log. // Cannot be updated. + // +optional optional string terminationMessagePath = 13; // Image pull policy. @@ -373,15 +416,18 @@ message Container { // Defaults to Always if :latest tag is specified, or IfNotPresent otherwise. // Cannot be updated. // More info: http://kubernetes.io/docs/user-guide/images#updating-images + // +optional optional string imagePullPolicy = 14; // Security options the pod should run with. // More info: http://releases.k8s.io/HEAD/docs/design/security_context.md + // +optional optional SecurityContext securityContext = 15; // Whether this container should allocate a buffer for stdin in the container runtime. If this // is not set, reads from stdin in the container will always result in EOF. // Default is false. + // +optional optional bool stdin = 16; // Whether the container runtime should close the stdin channel after it has been opened by @@ -391,10 +437,12 @@ message Container { // at which time stdin is closed and remains closed until the container is restarted. If this // flag is false, a container processes that reads from stdin will never receive an EOF. // Default is false + // +optional optional bool stdinOnce = 17; // Whether this container should allocate a TTY for itself, also requires 'stdin' to be true. // Default is false. + // +optional optional bool tty = 18; } @@ -405,6 +453,7 @@ message ContainerImage { repeated string names = 1; // The size of the image in bytes. + // +optional optional int64 sizeBytes = 2; } @@ -413,12 +462,14 @@ message ContainerPort { // If specified, this must be an IANA_SVC_NAME and unique within the pod. Each // named port in a pod must have a unique name. Name for the port that can be // referred to by services. + // +optional optional string name = 1; // Number of port to expose on the host. // If specified, this must be a valid port number, 0 < x < 65536. // If HostNetwork is specified, this must match ContainerPort. // Most containers do not need this. + // +optional optional int32 hostPort = 2; // Number of port to expose on the pod's IP address. @@ -427,9 +478,11 @@ message ContainerPort { // Protocol for port. Must be UDP or TCP. // Defaults to "TCP". + // +optional optional string protocol = 4; // What host IP to bind the external port to. + // +optional optional string hostIP = 5; } @@ -438,18 +491,22 @@ message ContainerPort { // If none of them is specified, the default one is ContainerStateWaiting. message ContainerState { // Details about a waiting container + // +optional optional ContainerStateWaiting waiting = 1; // Details about a running container + // +optional optional ContainerStateRunning running = 2; // Details about a terminated container + // +optional optional ContainerStateTerminated terminated = 3; } // ContainerStateRunning is a running state of a container. message ContainerStateRunning { // Time at which the container was last (re-)started + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time startedAt = 1; } @@ -459,30 +516,38 @@ message ContainerStateTerminated { optional int32 exitCode = 1; // Signal from the last termination of the container + // +optional optional int32 signal = 2; // (brief) reason from the last termination of the container + // +optional optional string reason = 3; // Message regarding the last termination of the container + // +optional optional string message = 4; // Time at which previous execution of the container started + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time startedAt = 5; // Time at which the container last terminated + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time finishedAt = 6; // Container's ID in the format 'docker://' + // +optional optional string containerID = 7; } // ContainerStateWaiting is a waiting state of a container. message ContainerStateWaiting { // (brief) reason the container is not yet running. + // +optional optional string reason = 1; // Message regarding why the container is not yet running. + // +optional optional string message = 2; } @@ -493,9 +558,11 @@ message ContainerStatus { optional string name = 1; // Details about the container's current condition. + // +optional optional ContainerState state = 2; // Details about the container's last termination condition. + // +optional optional ContainerState lastState = 3; // Specifies whether the container has passed its readiness probe. @@ -517,6 +584,7 @@ message ContainerStatus { // Container's ID in the format 'docker://'. // More info: http://kubernetes.io/docs/user-guide/container-environment#container-information + // +optional optional string containerID = 8; } @@ -532,14 +600,17 @@ message DeleteOptions { // The value zero indicates delete immediately. If this value is nil, the default grace period for the // specified type will be used. // Defaults to a per object value if not specified. zero means delete immediately. + // +optional optional int64 gracePeriodSeconds = 1; // Must be fulfilled before a deletion is carried out. If not possible, a 409 Conflict status will be // returned. + // +optional optional Preconditions preconditions = 2; // Should the dependent objects be orphaned. If true/false, the "orphan" // finalizer will be added to/removed from the object's finalizers list. + // +optional optional bool orphanDependents = 3; } @@ -549,16 +620,19 @@ message DownwardAPIVolumeFile { optional string path = 1; // Required: Selects a field of the pod: only annotations, labels, name and namespace are supported. + // +optional optional ObjectFieldSelector fieldRef = 2; // Selects a resource of the container: only resources limits and requests // (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported. + // +optional optional ResourceFieldSelector resourceFieldRef = 3; // Optional: mode bits to use on this file, must be a value between 0 // and 0777. If not specified, the volume defaultMode will be used. // This might be in conflict with other options that affect the file // mode, like fsGroup, and the result can be other mode bits set. + // +optional optional int32 mode = 4; } @@ -566,6 +640,7 @@ message DownwardAPIVolumeFile { // Downward API volumes support ownership management and SELinux relabeling. message DownwardAPIVolumeSource { // Items is a list of downward API volume file + // +optional repeated DownwardAPIVolumeFile items = 1; // Optional: mode bits to use on created files by default. Must be a @@ -573,6 +648,7 @@ message DownwardAPIVolumeSource { // Directories within the path are not affected by this setting. // This might be in conflict with other options that affect the file // mode, like fsGroup, and the result can be other mode bits set. + // +optional optional int32 defaultMode = 2; } @@ -583,6 +659,7 @@ message EmptyDirVolumeSource { // The default is "" which means to use the node's default medium. // Must be an empty string (default) or Memory. // More info: http://kubernetes.io/docs/user-guide/volumes#emptydir + // +optional optional string medium = 1; } @@ -597,12 +674,15 @@ message EndpointAddress { optional string ip = 1; // The Hostname of this endpoint + // +optional optional string hostname = 3; // Optional: Node hosting this endpoint. This can be used to determine endpoints local to a node. + // +optional optional string nodeName = 4; // Reference to object providing the endpoint. + // +optional optional ObjectReference targetRef = 2; } @@ -611,6 +691,7 @@ message EndpointPort { // The name of this port (corresponds to ServicePort.Name). // Must be a DNS_LABEL. // Optional only if one port is defined. + // +optional optional string name = 1; // The port number of the endpoint. @@ -619,6 +700,7 @@ message EndpointPort { // The IP protocol for this port. // Must be UDP or TCP. // Default is TCP. + // +optional optional string protocol = 3; } @@ -635,14 +717,17 @@ message EndpointPort { message EndpointSubset { // IP addresses which offer the related ports that are marked as ready. These endpoints // should be considered safe for load balancers and clients to utilize. + // +optional repeated EndpointAddress addresses = 1; // IP addresses which offer the related ports but are not currently marked as ready // because they have not yet finished starting, have recently failed a readiness check, // or have recently failed a liveness check. + // +optional repeated EndpointAddress notReadyAddresses = 2; // Port numbers available on the related IP addresses. + // +optional repeated EndpointPort ports = 3; } @@ -661,6 +746,7 @@ message EndpointSubset { message Endpoints { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional ObjectMeta metadata = 1; // The set of all endpoints is the union of all subsets. Addresses are placed into @@ -677,6 +763,7 @@ message Endpoints { message EndpointsList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // List of endpoints. @@ -696,9 +783,11 @@ message EnvVar { // references will never be expanded, regardless of whether the variable // exists or not. // Defaults to "". + // +optional optional string value = 2; // Source for the environment variable's value. Cannot be used if value is not empty. + // +optional optional EnvVarSource valueFrom = 3; } @@ -706,16 +795,20 @@ message EnvVar { message EnvVarSource { // Selects a field of the pod: supports metadata.name, metadata.namespace, metadata.labels, metadata.annotations, // spec.nodeName, spec.serviceAccountName, status.podIP. + // +optional optional ObjectFieldSelector fieldRef = 1; // Selects a resource of the container: only resources limits and requests // (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported. + // +optional optional ResourceFieldSelector resourceFieldRef = 2; // Selects a key of a ConfigMap. + // +optional optional ConfigMapKeySelector configMapKeyRef = 3; // Selects a key of a secret in the pod's namespace + // +optional optional SecretKeySelector secretKeyRef = 4; } @@ -732,25 +825,32 @@ message Event { // This should be a short, machine understandable string that gives the reason // for the transition into the object's current status. // TODO: provide exact specification for format. + // +optional optional string reason = 3; // A human-readable description of the status of this operation. // TODO: decide on maximum length. + // +optional optional string message = 4; // The component reporting this event. Should be a short machine understandable string. + // +optional optional EventSource source = 5; // The time at which the event was first recorded. (Time of server receipt is in TypeMeta.) + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time firstTimestamp = 6; // The time at which the most recent occurrence of this event was recorded. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTimestamp = 7; // The number of times this event has occurred. + // +optional optional int32 count = 8; // Type of this event (Normal, Warning), new types could be added in the future + // +optional optional string type = 9; } @@ -758,6 +858,7 @@ message Event { message EventList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // List of events @@ -767,9 +868,11 @@ message EventList { // EventSource contains information for an event. message EventSource { // Component from which the event is generated. + // +optional optional string component = 1; // Node name on which the event is generated. + // +optional optional string host = 2; } @@ -780,6 +883,7 @@ message ExecAction { // not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use // a shell, you need to explicitly call out to that shell. // Exit status of 0 is treated as live/healthy and non-zero is unhealthy. + // +optional repeated string command = 1; } @@ -806,10 +910,12 @@ message FCVolumeSource { // Must be a filesystem type supported by the host operating system. // Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. // TODO: how do we prevent errors in the filesystem from compromising the machine + // +optional optional string fsType = 3; // Optional: Defaults to false (read/write). ReadOnly here will force // the ReadOnly setting in VolumeMounts. + // +optional optional bool readOnly = 4; } @@ -822,6 +928,7 @@ message FlexVolumeSource { // Filesystem type to mount. // Must be a filesystem type supported by the host operating system. // Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script. + // +optional optional string fsType = 2; // Optional: SecretRef is reference to the secret object containing @@ -829,13 +936,16 @@ message FlexVolumeSource { // empty if no secret object is specified. If the secret object // contains more than one secret, all secrets are passed to the plugin // scripts. + // +optional optional LocalObjectReference secretRef = 3; // Optional: Defaults to false (read/write). ReadOnly here will force // the ReadOnly setting in VolumeMounts. + // +optional optional bool readOnly = 4; // Optional: Extra command options if any. + // +optional map options = 5; } @@ -845,9 +955,11 @@ message FlexVolumeSource { message FlockerVolumeSource { // Name of the dataset stored as metadata -> name on the dataset for Flocker // should be considered as deprecated + // +optional optional string datasetName = 1; // UUID of the dataset. This is unique identifier of a Flocker dataset + // +optional optional string datasetUUID = 2; } @@ -867,6 +979,7 @@ message GCEPersistentDiskVolumeSource { // Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. // More info: http://kubernetes.io/docs/user-guide/volumes#gcepersistentdisk // TODO: how do we prevent errors in the filesystem from compromising the machine + // +optional optional string fsType = 2; // The partition in the volume that you want to mount. @@ -874,11 +987,13 @@ message GCEPersistentDiskVolumeSource { // Examples: For volume /dev/sda1, you specify the partition as "1". // Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty). // More info: http://kubernetes.io/docs/user-guide/volumes#gcepersistentdisk + // +optional optional int32 partition = 3; // ReadOnly here will force the ReadOnly setting in VolumeMounts. // Defaults to false. // More info: http://kubernetes.io/docs/user-guide/volumes#gcepersistentdisk + // +optional optional bool readOnly = 4; } @@ -890,12 +1005,14 @@ message GitRepoVolumeSource { optional string repository = 1; // Commit hash for the specified revision. + // +optional optional string revision = 2; // Target directory name. // Must not contain or start with '..'. If '.' is supplied, the volume directory will be the // git repository. Otherwise, if specified, the volume will contain the git repository in // the subdirectory with the given name. + // +optional optional string directory = 3; } @@ -913,12 +1030,14 @@ message GlusterfsVolumeSource { // ReadOnly here will force the Glusterfs volume to be mounted with read-only permissions. // Defaults to false. // More info: http://releases.k8s.io/HEAD/examples/volumes/glusterfs/README.md#create-a-pod + // +optional optional bool readOnly = 3; } // HTTPGetAction describes an action based on HTTP Get requests. message HTTPGetAction { // Path to access on the HTTP server. + // +optional optional string path = 1; // Name or number of the port to access on the container. @@ -928,13 +1047,16 @@ message HTTPGetAction { // Host name to connect to, defaults to the pod IP. You probably want to set // "Host" in httpHeaders instead. + // +optional optional string host = 3; // Scheme to use for connecting to the host. // Defaults to HTTP. + // +optional optional string scheme = 4; // Custom headers to set in the request. HTTP allows repeated headers. + // +optional repeated HTTPHeader httpHeaders = 5; } @@ -952,14 +1074,17 @@ message HTTPHeader { message Handler { // One and only one of the following should be specified. // Exec specifies the action to take. + // +optional optional ExecAction exec = 1; // HTTPGet specifies the http request to perform. + // +optional optional HTTPGetAction httpGet = 2; // TCPSocket specifies an action involving a TCP port. // TCP hooks not yet supported // TODO: implement a realistic TCP lifecycle hook + // +optional optional TCPSocketAction tcpSocket = 3; } @@ -986,6 +1111,7 @@ message ISCSIVolumeSource { optional int32 lun = 3; // Optional: Defaults to 'default' (tcp). iSCSI interface name that uses an iSCSI transport. + // +optional optional string iscsiInterface = 4; // Filesystem type of the volume that you want to mount. @@ -993,10 +1119,12 @@ message ISCSIVolumeSource { // Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. // More info: http://kubernetes.io/docs/user-guide/volumes#iscsi // TODO: how do we prevent errors in the filesystem from compromising the machine + // +optional optional string fsType = 5; // ReadOnly here will force the ReadOnly setting in VolumeMounts. // Defaults to false. + // +optional optional bool readOnly = 6; } @@ -1015,6 +1143,7 @@ message KeyToPath { // and 0777. If not specified, the volume defaultMode will be used. // This might be in conflict with other options that affect the file // mode, like fsGroup, and the result can be other mode bits set. + // +optional optional int32 mode = 3; } @@ -1026,6 +1155,7 @@ message Lifecycle { // the container is terminated and restarted according to its restart policy. // Other management of the container blocks until the hook completes. // More info: http://kubernetes.io/docs/user-guide/container-environment#hook-details + // +optional optional Handler postStart = 1; // PreStop is called immediately before a container is terminated. @@ -1034,6 +1164,7 @@ message Lifecycle { // Regardless of the outcome of the handler, the container is eventually terminated. // Other management of the container blocks until the hook completes. // More info: http://kubernetes.io/docs/user-guide/container-environment#hook-details + // +optional optional Handler preStop = 2; } @@ -1041,31 +1172,39 @@ message Lifecycle { message LimitRange { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional ObjectMeta metadata = 1; // Spec defines the limits enforced. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional LimitRangeSpec spec = 2; } // LimitRangeItem defines a min/max usage limit for any resource that matches on kind. message LimitRangeItem { // Type of resource that this limit applies to. + // +optional optional string type = 1; // Max usage constraints on this kind by resource name. + // +optional map max = 2; // Min usage constraints on this kind by resource name. + // +optional map min = 3; // Default resource requirement limit value by resource name if resource limit is omitted. + // +optional map default = 4; // DefaultRequest is the default resource requirement request value by resource name if resource request is omitted. + // +optional map 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 maxLimitRequestRatio = 6; } @@ -1073,6 +1212,7 @@ message LimitRangeItem { message LimitRangeList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is a list of LimitRange objects. @@ -1090,6 +1230,7 @@ message LimitRangeSpec { message List { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // List of objects @@ -1100,21 +1241,26 @@ message List { message ListOptions { // A selector to restrict the list of returned objects by their labels. // Defaults to everything. + // +optional optional string labelSelector = 1; // A selector to restrict the list of returned objects by their fields. // Defaults to everything. + // +optional optional string fieldSelector = 2; // Watch for changes to the described resources and return them as a stream of // add, update, and remove notifications. Specify resourceVersion. + // +optional optional bool watch = 3; // When specified with a watch call, shows changes that occur after that particular version of a resource. // Defaults to changes from the beginning of history. + // +optional optional string resourceVersion = 4; // Timeout for the list/watch call. + // +optional optional int64 timeoutSeconds = 5; } @@ -1123,10 +1269,12 @@ message ListOptions { message LoadBalancerIngress { // IP is set for load-balancer ingress points that are IP based // (typically GCE or OpenStack load-balancers) + // +optional optional string ip = 1; // Hostname is set for load-balancer ingress points that are DNS based // (typically AWS load-balancers) + // +optional optional string hostname = 2; } @@ -1134,6 +1282,7 @@ message LoadBalancerIngress { message LoadBalancerStatus { // Ingress is a list containing ingress points for the load-balancer. // Traffic intended for the service should be sent to these ingress points. + // +optional repeated LoadBalancerIngress ingress = 1; } @@ -1143,6 +1292,7 @@ message LocalObjectReference { // Name of the referent. // More info: http://kubernetes.io/docs/user-guide/identifiers#names // TODO: Add other useful fields. apiVersion, kind, uid? + // +optional optional string name = 1; } @@ -1161,6 +1311,7 @@ message NFSVolumeSource { // the NFS export to be mounted with read-only permissions. // Defaults to false. // More info: http://kubernetes.io/docs/user-guide/volumes#nfs + // +optional optional bool readOnly = 3; } @@ -1169,14 +1320,17 @@ message NFSVolumeSource { message Namespace { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional ObjectMeta metadata = 1; // Spec defines the behavior of the Namespace. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional NamespaceSpec spec = 2; // Status describes the current status of a Namespace. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional NamespaceStatus status = 3; } @@ -1184,6 +1338,7 @@ message Namespace { message NamespaceList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is the list of Namespace objects in the list. @@ -1195,6 +1350,7 @@ message NamespaceList { message NamespaceSpec { // Finalizers is an opaque list of values that must be empty to permanently remove object from storage. // More info: http://releases.k8s.io/HEAD/docs/design/namespaces.md#finalizers + // +optional repeated string finalizers = 1; } @@ -1202,6 +1358,7 @@ message NamespaceSpec { message NamespaceStatus { // Phase is the current lifecycle phase of the namespace. // More info: http://releases.k8s.io/HEAD/docs/design/namespaces.md#phases + // +optional optional string phase = 1; } @@ -1210,16 +1367,19 @@ message NamespaceStatus { message Node { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional ObjectMeta metadata = 1; // Spec defines the behavior of a node. // http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional NodeSpec spec = 2; // Most recently observed status of the node. // Populated by the system. // Read-only. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional NodeStatus status = 3; } @@ -1239,6 +1399,7 @@ message NodeAffinity { // If the affinity requirements specified by this field cease to be met // at some point during pod execution (e.g. due to an update), the system // may or may not try to eventually evict the pod from its node. + // +optional optional NodeSelector requiredDuringSchedulingIgnoredDuringExecution = 1; // The scheduler will prefer to schedule pods to nodes that satisfy @@ -1250,6 +1411,7 @@ message NodeAffinity { // compute a sum by iterating through the elements of this field and adding // "weight" to the sum if the node matches the corresponding matchExpressions; the // node(s) with the highest sum are the most preferred. + // +optional repeated PreferredSchedulingTerm preferredDuringSchedulingIgnoredDuringExecution = 2; } @@ -1262,21 +1424,26 @@ message NodeCondition { optional string status = 2; // Last time we got an update on a given condition. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastHeartbeatTime = 3; // Last time the condition transit from one status to another. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; // (brief) reason for the condition's last transition. + // +optional optional string reason = 5; // Human readable message indicating details about last transition. + // +optional optional string message = 6; } // NodeDaemonEndpoints lists ports opened by daemons running on the Node. message NodeDaemonEndpoints { // Endpoint on which Kubelet is listening. + // +optional optional DaemonEndpoint kubeletEndpoint = 1; } @@ -1284,6 +1451,7 @@ message NodeDaemonEndpoints { message NodeList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // List of nodes @@ -1293,6 +1461,7 @@ message NodeList { // NodeProxyOptions is the query options to a Node's proxy call. message NodeProxyOptions { // Path is the URL path to use for the current proxy request to node. + // +optional optional string path = 1; } @@ -1319,6 +1488,7 @@ message NodeSelectorRequirement { // the values array must be empty. If the operator is Gt or Lt, the values // array must have a single element, which will be interpreted as an integer. // This array is replaced during a strategic merge patch. + // +optional repeated string values = 3; } @@ -1331,17 +1501,21 @@ message NodeSelectorTerm { // NodeSpec describes the attributes that a node is created with. message NodeSpec { // PodCIDR represents the pod IP range assigned to the node. + // +optional optional string podCIDR = 1; // External ID of the node assigned by some machine database (e.g. a cloud provider). // Deprecated. + // +optional optional string externalID = 2; // ID of the node assigned by the cloud provider in the format: :// + // +optional optional string providerID = 3; // Unschedulable controls node schedulability of new pods. By default, node is schedulable. // More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration"` + // +optional optional bool unschedulable = 4; } @@ -1349,40 +1523,50 @@ message NodeSpec { 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 capacity = 1; // Allocatable represents the resources of a node that are available for scheduling. // Defaults to Capacity. + // +optional map 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 // The field is never populated, and now is deprecated. + // +optional optional string phase = 3; // Conditions is an array of current observed node conditions. // More info: http://releases.k8s.io/HEAD/docs/admin/node.md#node-condition + // +optional repeated NodeCondition conditions = 4; // List of addresses reachable to the node. // Queried from cloud provider, if available. // More info: http://releases.k8s.io/HEAD/docs/admin/node.md#node-addresses + // +optional repeated NodeAddress addresses = 5; // Endpoints of daemons running on the Node. + // +optional optional NodeDaemonEndpoints daemonEndpoints = 6; // Set of ids/uuids to uniquely identify the node. // More info: http://releases.k8s.io/HEAD/docs/admin/node.md#node-info + // +optional optional NodeSystemInfo nodeInfo = 7; // List of container images on this node + // +optional repeated ContainerImage images = 8; // List of attachable volumes in use (mounted) by the node. + // +optional repeated string volumesInUse = 9; // List of volumes that are attached to the node. + // +optional repeated AttachedVolume volumesAttached = 10; } @@ -1426,6 +1610,7 @@ message NodeSystemInfo { // ObjectFieldSelector selects an APIVersioned field of an object. message ObjectFieldSelector { // Version of the schema the FieldPath is written in terms of, defaults to "v1". + // +optional optional string apiVersion = 1; // Path of the field to select in the specified API version. @@ -1441,6 +1626,7 @@ message ObjectMeta { // definition. // Cannot be updated. // More info: http://kubernetes.io/docs/user-guide/identifiers#names + // +optional optional string name = 1; // GenerateName is an optional prefix, used by the server, to generate a unique @@ -1458,6 +1644,7 @@ message ObjectMeta { // // Applied only if Name is not specified. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#idempotency + // +optional optional string generateName = 2; // Namespace defines the space within each name must be unique. An empty namespace is @@ -1468,11 +1655,13 @@ message ObjectMeta { // Must be a DNS_LABEL. // Cannot be updated. // More info: http://kubernetes.io/docs/user-guide/namespaces + // +optional optional string namespace = 3; // SelfLink is a URL representing this object. // Populated by the system. // Read-only. + // +optional optional string selfLink = 4; // UID is the unique in time and space value for this object. It is typically generated by @@ -1482,6 +1671,7 @@ message ObjectMeta { // Populated by the system. // Read-only. // More info: http://kubernetes.io/docs/user-guide/identifiers#uids + // +optional optional string uid = 5; // An opaque value that represents the internal version of this object that can @@ -1494,10 +1684,12 @@ message ObjectMeta { // Read-only. // Value must be treated as opaque by clients and . // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency + // +optional optional string resourceVersion = 6; // A sequence number representing a specific generation of the desired state. // Populated by the system. Read-only. + // +optional optional int64 generation = 7; // CreationTimestamp is a timestamp representing the server time when this object was @@ -1508,6 +1700,7 @@ message ObjectMeta { // Read-only. // Null for lists. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time creationTimestamp = 8; // DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This @@ -1524,41 +1717,48 @@ message ObjectMeta { // Populated by the system when a graceful deletion is requested. // Read-only. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time deletionTimestamp = 9; // Number of seconds allowed for this object to gracefully terminate before // it will be removed from the system. Only set when deletionTimestamp is also set. // May only be shortened. // Read-only. + // +optional optional int64 deletionGracePeriodSeconds = 10; // Map of string keys and values that can be used to organize and categorize // (scope and select) objects. May match selectors of replication controllers // and services. // More info: http://kubernetes.io/docs/user-guide/labels + // +optional map labels = 11; // Annotations is an unstructured key value map stored with a resource that may be // set by external tools to store and retrieve arbitrary metadata. They are not // queryable and should be preserved when modifying objects. // More info: http://kubernetes.io/docs/user-guide/annotations + // +optional map annotations = 12; // List of objects depended by this object. If ALL objects in the list have // been deleted, this object will be garbage collected. If this object is managed by a controller, // then an entry in this list will point to this controller, with the controller field set to true. // There cannot be more than one managing controller. + // +optional repeated OwnerReference ownerReferences = 13; // Must be empty before the object is deleted from the registry. Each entry // is an identifier for the responsible component that will remove the entry // from the list. If the deletionTimestamp of the object is non-nil, entries // in this list can only be removed. + // +optional repeated string finalizers = 14; // The name of the cluster which the object belongs to. // This is used to distinguish resources with same name and namespace in different clusters. // This field is not set anywhere right now and apiserver is going to ignore it if set in create or update request. + // +optional optional string clusterName = 15; } @@ -1566,25 +1766,31 @@ message ObjectMeta { message ObjectReference { // Kind of the referent. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional string kind = 1; // Namespace of the referent. // More info: http://kubernetes.io/docs/user-guide/namespaces + // +optional optional string namespace = 2; // Name of the referent. // More info: http://kubernetes.io/docs/user-guide/identifiers#names + // +optional optional string name = 3; // UID of the referent. // More info: http://kubernetes.io/docs/user-guide/identifiers#uids + // +optional optional string uid = 4; // API version of the referent. + // +optional optional string apiVersion = 5; // Specific resourceVersion to which this reference is made, if any. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency + // +optional optional string resourceVersion = 6; // If referring to a piece of an object instead of an entire object, this string @@ -1595,6 +1801,7 @@ message ObjectReference { // index 2 in this pod). This syntax is chosen only to have some well-defined way of // referencing a part of an object. // TODO: this design is not final and this field is subject to change in the future. + // +optional optional string fieldPath = 7; } @@ -1618,6 +1825,7 @@ message OwnerReference { optional string uid = 4; // If true, this reference points to the managing controller. + // +optional optional bool controller = 6; } @@ -1627,17 +1835,20 @@ message OwnerReference { message PersistentVolume { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional ObjectMeta metadata = 1; // Spec defines a specification of a persistent volume owned by the cluster. // Provisioned by an administrator. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#persistent-volumes + // +optional optional PersistentVolumeSpec spec = 2; // Status represents the current information/status for the persistent volume. // Populated by the system. // Read-only. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#persistent-volumes + // +optional optional PersistentVolumeStatus status = 3; } @@ -1645,15 +1856,18 @@ message PersistentVolume { message PersistentVolumeClaim { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional ObjectMeta metadata = 1; // Spec defines the desired characteristics of a volume requested by a pod author. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#persistentvolumeclaims + // +optional optional PersistentVolumeClaimSpec spec = 2; // Status represents the current information/status of a persistent volume claim. // Read-only. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#persistentvolumeclaims + // +optional optional PersistentVolumeClaimStatus status = 3; } @@ -1661,6 +1875,7 @@ message PersistentVolumeClaim { message PersistentVolumeClaimList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // A list of persistent volume claims. @@ -1673,29 +1888,36 @@ message PersistentVolumeClaimList { message PersistentVolumeClaimSpec { // AccessModes contains the desired access modes the volume should have. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#access-modes-1 + // +optional repeated string accessModes = 1; // A label query over volumes to consider for binding. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 4; // Resources represents the minimum resources the volume should have. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#resources + // +optional optional ResourceRequirements resources = 2; // VolumeName is the binding reference to the PersistentVolume backing this claim. + // +optional optional string volumeName = 3; } // PersistentVolumeClaimStatus is the current status of a persistent volume claim. message PersistentVolumeClaimStatus { // Phase represents the current phase of PersistentVolumeClaim. + // +optional optional string phase = 1; // AccessModes contains the actual access modes the volume backing the PVC has. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#access-modes-1 + // +optional repeated string accessModes = 2; // Represents the actual resources of the underlying volume. + // +optional map capacity = 3; } @@ -1710,6 +1932,7 @@ message PersistentVolumeClaimVolumeSource { // Will force the ReadOnly setting in VolumeMounts. // Default false. + // +optional optional bool readOnly = 2; } @@ -1717,6 +1940,7 @@ message PersistentVolumeClaimVolumeSource { message PersistentVolumeList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // List of persistent volumes. @@ -1730,11 +1954,13 @@ message PersistentVolumeSource { // GCEPersistentDisk represents a GCE Disk resource that is attached to a // kubelet's host machine and then exposed to the pod. Provisioned by an admin. // More info: http://kubernetes.io/docs/user-guide/volumes#gcepersistentdisk + // +optional optional GCEPersistentDiskVolumeSource gcePersistentDisk = 1; // AWSElasticBlockStore represents an AWS Disk resource that is attached to a // kubelet's host machine and then exposed to the pod. // More info: http://kubernetes.io/docs/user-guide/volumes#awselasticblockstore + // +optional optional AWSElasticBlockStoreVolumeSource awsElasticBlockStore = 2; // HostPath represents a directory on the host. @@ -1742,53 +1968,67 @@ message PersistentVolumeSource { // This is useful for single-node development and testing only! // On-host storage is not supported in any way and WILL NOT WORK in a multi-node cluster. // More info: http://kubernetes.io/docs/user-guide/volumes#hostpath + // +optional optional HostPathVolumeSource hostPath = 3; // Glusterfs represents a Glusterfs volume that is attached to a host and // exposed to the pod. Provisioned by an admin. // More info: http://releases.k8s.io/HEAD/examples/volumes/glusterfs/README.md + // +optional optional GlusterfsVolumeSource glusterfs = 4; // NFS represents an NFS mount on the host. Provisioned by an admin. // More info: http://kubernetes.io/docs/user-guide/volumes#nfs + // +optional optional NFSVolumeSource nfs = 5; // RBD represents a Rados Block Device mount on the host that shares a pod's lifetime. // More info: http://releases.k8s.io/HEAD/examples/volumes/rbd/README.md + // +optional optional RBDVolumeSource rbd = 6; // ISCSI represents an ISCSI Disk resource that is attached to a // kubelet's host machine and then exposed to the pod. Provisioned by an admin. + // +optional optional ISCSIVolumeSource iscsi = 7; // Cinder represents a cinder volume attached and mounted on kubelets host machine // More info: http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md + // +optional optional CinderVolumeSource cinder = 8; // CephFS represents a Ceph FS mount on the host that shares a pod's lifetime + // +optional optional CephFSVolumeSource cephfs = 9; // FC represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed to the pod. + // +optional optional FCVolumeSource fc = 10; // Flocker represents a Flocker volume attached to a kubelet's host machine and exposed to the pod for its usage. This depends on the Flocker control service being running + // +optional optional FlockerVolumeSource flocker = 11; // FlexVolume represents a generic volume resource that is // provisioned/attached using an exec based plugin. This is an // alpha feature and may change in future. + // +optional optional FlexVolumeSource flexVolume = 12; // AzureFile represents an Azure File Service mount on the host and bind mount to the pod. + // +optional optional AzureFileVolumeSource azureFile = 13; // VsphereVolume represents a vSphere volume attached and mounted on kubelets host machine + // +optional optional VsphereVirtualDiskVolumeSource vsphereVolume = 14; // Quobyte represents a Quobyte mount on the host that shares a pod's lifetime + // +optional optional QuobyteVolumeSource quobyte = 15; // AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod. + // +optional optional AzureDiskVolumeSource azureDisk = 16; } @@ -1796,6 +2036,7 @@ message PersistentVolumeSource { 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 capacity = 1; // The actual volume backing the persistent volume. @@ -1803,18 +2044,21 @@ message PersistentVolumeSpec { // AccessModes contains all ways the volume can be mounted. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#access-modes + // +optional repeated string accessModes = 3; // ClaimRef is part of a bi-directional binding between PersistentVolume and PersistentVolumeClaim. // Expected to be non-nil when bound. // claim.VolumeName is the authoritative bind between PV and PVC. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#binding + // +optional optional ObjectReference claimRef = 4; // What happens to a persistent volume when released from its claim. // Valid options are Retain (default) and Recycle. // Recycling must be supported by the volume plugin underlying this persistent volume. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#recycling-policy + // +optional optional string persistentVolumeReclaimPolicy = 5; } @@ -1822,13 +2066,16 @@ message PersistentVolumeSpec { message PersistentVolumeStatus { // Phase indicates if a volume is available, bound to a claim, or released by a claim. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#phase + // +optional optional string phase = 1; // A human-readable message indicating details about why the volume is in this state. + // +optional optional string message = 2; // Reason is a brief CamelCase string that describes any failure and is meant // for machine parsing and tidy display in the CLI. + // +optional optional string reason = 3; } @@ -1837,10 +2084,12 @@ message PersistentVolumeStatus { message Pod { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional ObjectMeta metadata = 1; // Specification of the desired behavior of the pod. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional PodSpec spec = 2; // Most recently observed status of the pod. @@ -1848,6 +2097,7 @@ message Pod { // Populated by the system. // Read-only. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional PodStatus status = 3; } @@ -1861,6 +2111,7 @@ message PodAffinity { // system will try to eventually evict the pod from its node. // When there are multiple elements, the lists of nodes corresponding to each // podAffinityTerm are intersected, i.e. all terms must be satisfied. + // +optional // RequiredDuringSchedulingRequiredDuringExecution []PodAffinityTerm `json:"requiredDuringSchedulingRequiredDuringExecution,omitempty"` // If the affinity requirements specified by this field are not met at // scheduling time, the pod will not be scheduled onto the node. @@ -1869,6 +2120,7 @@ message PodAffinity { // system may or may not try to eventually evict the pod from its node. // When there are multiple elements, the lists of nodes corresponding to each // podAffinityTerm are intersected, i.e. all terms must be satisfied. + // +optional repeated PodAffinityTerm requiredDuringSchedulingIgnoredDuringExecution = 1; // The scheduler will prefer to schedule pods to nodes that satisfy @@ -1880,6 +2132,7 @@ message PodAffinity { // compute a sum by iterating through the elements of this field and adding // "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the // node(s) with the highest sum are the most preferred. + // +optional repeated WeightedPodAffinityTerm preferredDuringSchedulingIgnoredDuringExecution = 2; } @@ -1891,6 +2144,7 @@ message PodAffinity { // a pod of the set of pods is running message PodAffinityTerm { // A label query over a set of resources, in this case pods. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector labelSelector = 1; // namespaces specifies which namespaces the labelSelector applies to (matches against); @@ -1906,6 +2160,7 @@ message PodAffinityTerm { // For PreferredDuringScheduling pod anti-affinity, empty topologyKey is interpreted as "all topologies" // ("all topologies" here means all the topologyKeys indicated by scheduler command-line argument --failure-domains); // for affinity and for RequiredDuringScheduling pod anti-affinity, empty topologyKey is not allowed. + // +optional optional string topologyKey = 3; } @@ -1919,6 +2174,7 @@ message PodAntiAffinity { // system will try to eventually evict the pod from its node. // When there are multiple elements, the lists of nodes corresponding to each // podAffinityTerm are intersected, i.e. all terms must be satisfied. + // +optional // RequiredDuringSchedulingRequiredDuringExecution []PodAffinityTerm `json:"requiredDuringSchedulingRequiredDuringExecution,omitempty"` // If the anti-affinity requirements specified by this field are not met at // scheduling time, the pod will not be scheduled onto the node. @@ -1927,6 +2183,7 @@ message PodAntiAffinity { // system may or may not try to eventually evict the pod from its node. // When there are multiple elements, the lists of nodes corresponding to each // podAffinityTerm are intersected, i.e. all terms must be satisfied. + // +optional repeated PodAffinityTerm requiredDuringSchedulingIgnoredDuringExecution = 1; // The scheduler will prefer to schedule pods to nodes that satisfy @@ -1938,6 +2195,7 @@ message PodAntiAffinity { // compute a sum by iterating through the elements of this field and adding // "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the // node(s) with the highest sum are the most preferred. + // +optional repeated WeightedPodAffinityTerm preferredDuringSchedulingIgnoredDuringExecution = 2; } @@ -1948,24 +2206,29 @@ message PodAntiAffinity { message PodAttachOptions { // Stdin if true, redirects the standard input stream of the pod for this call. // Defaults to false. + // +optional optional bool stdin = 1; // Stdout if true indicates that stdout is to be redirected for the attach call. // Defaults to true. + // +optional optional bool stdout = 2; // Stderr if true indicates that stderr is to be redirected for the attach call. // Defaults to true. + // +optional optional bool stderr = 3; // TTY if true indicates that a tty will be allocated for the attach call. // This is passed through the container runtime so the tty // is allocated on the worker node by the container runtime. // Defaults to false. + // +optional optional bool tty = 4; // The container in which to execute the command. // Defaults to only container if there is only one container in the pod. + // +optional optional string container = 5; } @@ -1982,15 +2245,19 @@ message PodCondition { optional string status = 2; // Last time we probed the condition. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; // Last time the condition transitioned from one status to another. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; // Unique, one-word, CamelCase reason for the condition's last transition. + // +optional optional string reason = 5; // Human-readable message indicating details about last transition. + // +optional optional string message = 6; } @@ -2001,22 +2268,27 @@ message PodCondition { message PodExecOptions { // Redirect the standard input stream of the pod for this call. // Defaults to false. + // +optional optional bool stdin = 1; // Redirect the standard output stream of the pod for this call. // Defaults to true. + // +optional optional bool stdout = 2; // Redirect the standard error stream of the pod for this call. // Defaults to true. + // +optional optional bool stderr = 3; // TTY if true indicates that a tty will be allocated for the exec call. // Defaults to false. + // +optional optional bool tty = 4; // Container in which to execute the command. // Defaults to only container if there is only one container in the pod. + // +optional optional string container = 5; // Command is the remote command to execute. argv array. Not executed within a shell. @@ -2027,6 +2299,7 @@ message PodExecOptions { message PodList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // List of pods. @@ -2037,43 +2310,52 @@ message PodList { // PodLogOptions is the query options for a Pod's logs REST call. message PodLogOptions { // The container for which to stream logs. Defaults to only container if there is one container in the pod. + // +optional optional string container = 1; // Follow the log stream of the pod. Defaults to false. + // +optional optional bool follow = 2; // Return previous terminated container logs. Defaults to false. + // +optional optional bool previous = 3; // A relative time in seconds before the current time from which to show logs. If this value // precedes the time a pod was started, only logs since the pod start will be returned. // If this value is in the future, no logs will be returned. // Only one of sinceSeconds or sinceTime may be specified. + // +optional optional int64 sinceSeconds = 4; // An RFC3339 timestamp from which to show logs. If this value // precedes the time a pod was started, only logs since the pod start will be returned. // If this value is in the future, no logs will be returned. // Only one of sinceSeconds or sinceTime may be specified. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time sinceTime = 5; // If true, add an RFC3339 or RFC3339Nano timestamp at the beginning of every line // of log output. Defaults to false. + // +optional optional bool timestamps = 6; // If set, the number of lines from the end of the logs to show. If not specified, // logs are shown from the creation of the container or sinceSeconds or sinceTime + // +optional optional int64 tailLines = 7; // If set, the number of bytes to read from the server before terminating the // log output. This may not display a complete final line of logging, and may return // slightly more or slightly less than the specified limit. + // +optional optional int64 limitBytes = 8; } // PodProxyOptions is the query options to a Pod's proxy call. message PodProxyOptions { // Path is the URL path to use for the current proxy request to pod. + // +optional optional string path = 1; } @@ -2086,6 +2368,7 @@ message PodSecurityContext { // container. May also be set in SecurityContext. If set in // both SecurityContext and PodSecurityContext, the value specified in SecurityContext // takes precedence for that container. + // +optional optional SELinuxOptions seLinuxOptions = 1; // The UID to run the entrypoint of the container process. @@ -2093,6 +2376,7 @@ message PodSecurityContext { // May also be set in SecurityContext. If set in both SecurityContext and // PodSecurityContext, the value specified in SecurityContext takes precedence // for that container. + // +optional optional int64 runAsUser = 2; // Indicates that the container must run as a non-root user. @@ -2101,11 +2385,13 @@ message PodSecurityContext { // If unset or false, no such validation will be performed. // May also be set in SecurityContext. If set in both SecurityContext and // PodSecurityContext, the value specified in SecurityContext takes precedence. + // +optional optional bool runAsNonRoot = 3; // A list of groups applied to the first process run in each container, in addition // to the container's primary GID. If unspecified, no groups will be added to // any container. + // +optional repeated int64 supplementalGroups = 4; // A special supplemental group that applies to all containers in a pod. @@ -2117,6 +2403,7 @@ message PodSecurityContext { // 3. The permission bits are OR'd with rw-rw---- // // If unset, the Kubelet will not modify the ownership and permissions of any volume. + // +optional optional int64 fsGroup = 5; } @@ -2124,6 +2411,7 @@ message PodSecurityContext { // Exactly one field should be set. message PodSignature { // Reference to controller whose pods should avoid this node. + // +optional optional OwnerReference podController = 1; } @@ -2131,6 +2419,7 @@ message PodSignature { message PodSpec { // List of volumes that can be mounted by containers belonging to the pod. // More info: http://kubernetes.io/docs/user-guide/volumes + // +optional repeated Volume volumes = 1; // List of containers belonging to the pod. @@ -2144,6 +2433,7 @@ message PodSpec { // One of Always, OnFailure, Never. // Default to Always. // More info: http://kubernetes.io/docs/user-guide/pod-states#restartpolicy + // +optional optional string restartPolicy = 3; // Optional duration in seconds the pod needs to terminate gracefully. May be decreased in delete request. @@ -2153,69 +2443,83 @@ message PodSpec { // a termination signal and the time when the processes are forcibly halted with a kill signal. // Set this value longer than the expected cleanup time for your process. // Defaults to 30 seconds. + // +optional optional int64 terminationGracePeriodSeconds = 4; // Optional duration in seconds the pod may be active on the node relative to // StartTime before the system will actively try to mark it failed and kill associated containers. // Value must be a positive integer. + // +optional optional int64 activeDeadlineSeconds = 5; // Set DNS policy for containers within the pod. // One of 'ClusterFirst' or 'Default'. // Defaults to "ClusterFirst". + // +optional optional string dnsPolicy = 6; // NodeSelector is a selector which must be true for the pod to fit on a node. // Selector which must match a node's labels for the pod to be scheduled on that node. // More info: http://kubernetes.io/docs/user-guide/node-selection/README + // +optional map nodeSelector = 7; // ServiceAccountName is the name of the ServiceAccount to use to run this pod. // More info: http://releases.k8s.io/HEAD/docs/design/service_accounts.md + // +optional optional string serviceAccountName = 8; // DeprecatedServiceAccount is a depreciated alias for ServiceAccountName. // Deprecated: Use serviceAccountName instead. // +k8s:conversion-gen=false + // +optional optional string serviceAccount = 9; // NodeName is a request to schedule this pod onto a specific node. If it is non-empty, // the scheduler simply schedules this pod onto that node, assuming that it fits resource // requirements. + // +optional optional string nodeName = 10; // Host networking requested for this pod. Use the host's network namespace. // If this option is set, the ports that will be used must be specified. // Default to false. // +k8s:conversion-gen=false + // +optional optional bool hostNetwork = 11; // Use the host's pid namespace. // Optional: Default to false. // +k8s:conversion-gen=false + // +optional optional bool hostPID = 12; // Use the host's ipc namespace. // Optional: Default to false. // +k8s:conversion-gen=false + // +optional optional bool hostIPC = 13; // SecurityContext holds pod-level security attributes and common container settings. // Optional: Defaults to empty. See type description for default values of each field. + // +optional optional PodSecurityContext securityContext = 14; // ImagePullSecrets is an optional list of references to secrets in the same namespace to use for pulling any of the images used by this PodSpec. // If specified, these secrets will be passed to individual puller implementations for them to use. For example, // in the case of docker, only DockerConfig type secrets are honored. // More info: http://kubernetes.io/docs/user-guide/images#specifying-imagepullsecrets-on-a-pod + // +optional repeated LocalObjectReference imagePullSecrets = 15; // Specifies the hostname of the Pod // If not specified, the pod's hostname will be set to a system-defined value. + // +optional optional string hostname = 16; // If specified, the fully qualified Pod hostname will be "...svc.". // If not specified, the pod will not have a domainname at all. + // +optional optional string subdomain = 17; } @@ -2224,33 +2528,41 @@ message PodSpec { message PodStatus { // Current condition of the pod. // More info: http://kubernetes.io/docs/user-guide/pod-states#pod-phase + // +optional optional string phase = 1; // Current service state of pod. // More info: http://kubernetes.io/docs/user-guide/pod-states#pod-conditions + // +optional repeated PodCondition conditions = 2; // A human readable message indicating details about why the pod is in this condition. + // +optional optional string message = 3; // A brief CamelCase message indicating details about why the pod is in this state. // e.g. 'OutOfDisk' + // +optional optional string reason = 4; // IP address of the host to which the pod is assigned. Empty if not yet scheduled. + // +optional optional string hostIP = 5; // IP address allocated to the pod. Routable at least within the cluster. // Empty if not yet allocated. + // +optional optional string podIP = 6; // RFC 3339 date and time at which the object was acknowledged by the Kubelet. // This is before the Kubelet pulled the container image(s) for the pod. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time startTime = 7; // The list has one entry per container in the manifest. Each entry is currently the output // of `docker inspect`. // More info: http://kubernetes.io/docs/user-guide/pod-states#container-statuses + // +optional repeated ContainerStatus containerStatuses = 8; } @@ -2258,6 +2570,7 @@ message PodStatus { message PodStatusResult { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional ObjectMeta metadata = 1; // Most recently observed status of the pod. @@ -2265,6 +2578,7 @@ message PodStatusResult { // Populated by the system. // Read-only. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional PodStatus status = 2; } @@ -2272,10 +2586,12 @@ message PodStatusResult { message PodTemplate { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional ObjectMeta metadata = 1; // Template defines the pods that will be created from this pod template. // http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional PodTemplateSpec template = 2; } @@ -2283,6 +2599,7 @@ message PodTemplate { message PodTemplateList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // List of pod templates @@ -2293,16 +2610,19 @@ message PodTemplateList { message PodTemplateSpec { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional ObjectMeta metadata = 1; // Specification of the desired behavior of the pod. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional PodSpec spec = 2; } // Preconditions must be fulfilled before an operation (update, delete, etc.) is carried out. message Preconditions { // Specifies the target UID. + // +optional optional string uid = 1; } @@ -2312,12 +2632,15 @@ message PreferAvoidPodsEntry { optional PodSignature podSignature = 1; // Time at which this entry was added to the list. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time evictionTime = 2; // (brief) reason why this entry was added to the list. + // +optional optional string reason = 3; // Human readable message indicating why this entry was added to the list. + // +optional optional string message = 4; } @@ -2339,23 +2662,28 @@ message Probe { // Number of seconds after the container has started before liveness probes are initiated. // More info: http://kubernetes.io/docs/user-guide/pod-states#container-probes + // +optional optional int32 initialDelaySeconds = 2; // Number of seconds after which the probe times out. // Defaults to 1 second. Minimum value is 1. // More info: http://kubernetes.io/docs/user-guide/pod-states#container-probes + // +optional optional int32 timeoutSeconds = 3; // How often (in seconds) to perform the probe. // Default to 10 seconds. Minimum value is 1. + // +optional optional int32 periodSeconds = 4; // Minimum consecutive successes for the probe to be considered successful after having failed. // Defaults to 1. Must be 1 for liveness. Minimum value is 1. + // +optional optional int32 successThreshold = 5; // Minimum consecutive failures for the probe to be considered failed after having succeeded. // Defaults to 3. Minimum value is 1. + // +optional optional int32 failureThreshold = 6; } @@ -2372,14 +2700,17 @@ message QuobyteVolumeSource { // ReadOnly here will force the Quobyte volume to be mounted with read-only permissions. // Defaults to false. + // +optional optional bool readOnly = 3; // User to map volume access to // Defaults to serivceaccount user + // +optional optional string user = 4; // Group to map volume access to // Default is no group + // +optional optional string group = 5; } @@ -2399,32 +2730,38 @@ message RBDVolumeSource { // Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. // More info: http://kubernetes.io/docs/user-guide/volumes#rbd // TODO: how do we prevent errors in the filesystem from compromising the machine + // +optional optional string fsType = 3; // The rados pool name. // Default is rbd. // More info: http://releases.k8s.io/HEAD/examples/volumes/rbd/README.md#how-to-use-it. + // +optional optional string pool = 4; // The rados user name. // Default is admin. // More info: http://releases.k8s.io/HEAD/examples/volumes/rbd/README.md#how-to-use-it + // +optional optional string user = 5; // Keyring is the path to key ring for RBDUser. // Default is /etc/ceph/keyring. // More info: http://releases.k8s.io/HEAD/examples/volumes/rbd/README.md#how-to-use-it + // +optional optional string keyring = 6; // SecretRef is name of the authentication secret for RBDUser. If provided // overrides keyring. // Default is nil. // More info: http://releases.k8s.io/HEAD/examples/volumes/rbd/README.md#how-to-use-it + // +optional optional LocalObjectReference secretRef = 7; // ReadOnly here will force the ReadOnly setting in VolumeMounts. // Defaults to false. // More info: http://releases.k8s.io/HEAD/examples/volumes/rbd/README.md#how-to-use-it + // +optional optional bool readOnly = 8; } @@ -2432,6 +2769,7 @@ message RBDVolumeSource { message RangeAllocation { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional ObjectMeta metadata = 1; // Range is string that identifies the range represented by 'data'. @@ -2446,10 +2784,12 @@ message ReplicationController { // If the Labels of a ReplicationController are empty, they are defaulted to // 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 + // +optional optional ObjectMeta metadata = 1; // Spec defines the specification of the desired behavior of the replication controller. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional ReplicationControllerSpec spec = 2; // Status is the most recently observed status of the replication controller. @@ -2457,6 +2797,7 @@ message ReplicationController { // Populated by the system. // Read-only. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional ReplicationControllerStatus status = 3; } @@ -2469,15 +2810,19 @@ message ReplicationControllerCondition { optional string status = 2; // Last time we probed the condition. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; // The last time the condition transitioned from one status to another. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; // The reason for the condition's last transition. + // +optional optional string reason = 5; // A human readable message indicating details about the transition. + // +optional optional string message = 6; } @@ -2485,6 +2830,7 @@ message ReplicationControllerCondition { message ReplicationControllerList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // List of replication controllers. @@ -2498,11 +2844,13 @@ message ReplicationControllerSpec { // This is a pointer to distinguish between explicit zero and unspecified. // Defaults to 1. // More info: http://kubernetes.io/docs/user-guide/replication-controller#what-is-a-replication-controller + // +optional optional int32 replicas = 1; // Minimum number of seconds for which a newly created pod should be ready // without any of its container crashing, for it to be considered available. // Defaults to 0 (pod will be considered available as soon as it is ready) + // +optional optional int32 minReadySeconds = 4; // Selector is a label query over pods that should match the Replicas count. @@ -2510,11 +2858,13 @@ message ReplicationControllerSpec { // Label keys and values that must match in order to be controlled by this replication // controller, if empty defaulted to labels on Pod template. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors + // +optional map selector = 2; // Template is the object that describes the pod that will be created if // insufficient replicas are detected. This takes precedence over a TemplateRef. // More info: http://kubernetes.io/docs/user-guide/replication-controller#pod-template + // +optional optional PodTemplateSpec template = 3; } @@ -2526,30 +2876,37 @@ message ReplicationControllerStatus { optional int32 replicas = 1; // The number of pods that have labels matching the labels of the pod template of the replication controller. + // +optional optional int32 fullyLabeledReplicas = 2; // The number of ready replicas for this replication controller. + // +optional optional int32 readyReplicas = 4; // The number of available replicas (ready for at least minReadySeconds) for this replication controller. + // +optional optional int32 availableReplicas = 5; // ObservedGeneration reflects the generation of the most recently observed replication controller. + // +optional optional int64 observedGeneration = 3; // Represents the latest available observations of a replication controller's current state. + // +optional repeated ReplicationControllerCondition conditions = 6; } // ResourceFieldSelector represents container resources (cpu, memory) and their output format message ResourceFieldSelector { // Container name: required for volumes, optional for env vars + // +optional optional string containerName = 1; // Required: resource to select optional string resource = 2; // Specifies the output format of the exposed resources, defaults to "1" + // +optional optional k8s.io.kubernetes.pkg.api.resource.Quantity divisor = 3; } @@ -2557,14 +2914,17 @@ message ResourceFieldSelector { message ResourceQuota { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional ObjectMeta metadata = 1; // Spec defines the desired quota. // http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional ResourceQuotaSpec spec = 2; // Status defines the actual enforced quota and its current usage. // http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional ResourceQuotaStatus status = 3; } @@ -2572,6 +2932,7 @@ message ResourceQuota { message ResourceQuotaList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is a list of ResourceQuota objects. @@ -2583,10 +2944,12 @@ message ResourceQuotaList { 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 hard = 1; // A collection of filters that must match each object tracked by a quota. // If not specified, the quota matches all objects. + // +optional repeated string scopes = 2; } @@ -2594,9 +2957,11 @@ message ResourceQuotaSpec { 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 hard = 1; // Used is the current observed total usage of the resource in the namespace. + // +optional map used = 2; } @@ -2604,27 +2969,33 @@ message ResourceQuotaStatus { message ResourceRequirements { // Limits describes the maximum amount of compute resources allowed. // More info: http://kubernetes.io/docs/user-guide/compute-resources/ + // +optional map 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 requests = 2; } // SELinuxOptions are the labels to be applied to the container message SELinuxOptions { // User is a SELinux user label that applies to the container. + // +optional optional string user = 1; // Role is a SELinux role label that applies to the container. + // +optional optional string role = 2; // Type is a SELinux type label that applies to the container. + // +optional optional string type = 3; // Level is SELinux level label that applies to the container. + // +optional optional string level = 4; } @@ -2633,6 +3004,7 @@ message SELinuxOptions { message Secret { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional ObjectMeta metadata = 1; // Data contains the secret data. Each key must be a valid DNS_SUBDOMAIN @@ -2640,6 +3012,7 @@ message Secret { // The serialized form of the secret data is a base64 encoded string, // representing the arbitrary (possibly non-string) data value here. // Described in https://tools.ietf.org/html/rfc4648#section-4 + // +optional map data = 2; // stringData allows specifying non-binary secret data in string form. @@ -2647,9 +3020,11 @@ message Secret { // All keys and values are merged into the data field on write, overwriting any existing values. // It is never output when reading from the API. // +k8s:conversion-gen=false + // +optional map stringData = 4; // Used to facilitate programmatic handling of secret data. + // +optional optional string type = 3; } @@ -2666,6 +3041,7 @@ message SecretKeySelector { message SecretList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is a list of secret objects. @@ -2681,6 +3057,7 @@ message SecretList { message SecretVolumeSource { // Name of the secret in the pod's namespace to use. // More info: http://kubernetes.io/docs/user-guide/volumes#secrets + // +optional optional string secretName = 1; // If unspecified, each key-value pair in the Data field of the referenced @@ -2690,6 +3067,7 @@ message SecretVolumeSource { // present. If a key is specified which is not present in the Secret, // the volume setup will error. Paths must be relative and may not contain // the '..' path or start with '..'. + // +optional repeated KeyToPath items = 2; // Optional: mode bits to use on created files by default. Must be a @@ -2697,6 +3075,7 @@ message SecretVolumeSource { // Directories within the path are not affected by this setting. // This might be in conflict with other options that affect the file // mode, like fsGroup, and the result can be other mode bits set. + // +optional optional int32 defaultMode = 3; } @@ -2706,23 +3085,27 @@ message SecretVolumeSource { message SecurityContext { // The capabilities to add/drop when running containers. // Defaults to the default set of capabilities granted by the container runtime. + // +optional optional Capabilities capabilities = 1; // Run container in privileged mode. // Processes in privileged containers are essentially equivalent to root on the host. // Defaults to false. + // +optional optional bool privileged = 2; // The SELinux context to be applied to the container. // If unspecified, the container runtime will allocate a random SELinux context for each // container. May also be set in PodSecurityContext. If set in both SecurityContext and // PodSecurityContext, the value specified in SecurityContext takes precedence. + // +optional optional SELinuxOptions seLinuxOptions = 3; // The UID to run the entrypoint of the container process. // Defaults to user specified in image metadata if unspecified. // May also be set in PodSecurityContext. If set in both SecurityContext and // PodSecurityContext, the value specified in SecurityContext takes precedence. + // +optional optional int64 runAsUser = 4; // Indicates that the container must run as a non-root user. @@ -2731,16 +3114,19 @@ message SecurityContext { // If unset or false, no such validation will be performed. // May also be set in PodSecurityContext. If set in both SecurityContext and // PodSecurityContext, the value specified in SecurityContext takes precedence. + // +optional optional bool runAsNonRoot = 5; // Whether this container has a read-only root filesystem. // Default is false. + // +optional optional bool readOnlyRootFilesystem = 6; } // SerializedReference is a reference to serialized object. message SerializedReference { // The reference to an object in the system. + // +optional optional ObjectReference reference = 1; } @@ -2750,16 +3136,19 @@ message SerializedReference { message Service { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional ObjectMeta metadata = 1; // Spec defines the behavior of a service. // http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional ServiceSpec spec = 2; // Most recently observed status of the service. // Populated by the system. // Read-only. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional ServiceStatus status = 3; } @@ -2770,16 +3159,19 @@ message Service { message ServiceAccount { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional ObjectMeta metadata = 1; // Secrets is the list of secrets allowed to be used by pods running using this ServiceAccount. // More info: http://kubernetes.io/docs/user-guide/secrets + // +optional repeated ObjectReference secrets = 2; // ImagePullSecrets is a list of references to secrets in the same namespace to use for pulling any images // in pods that reference this ServiceAccount. ImagePullSecrets are distinct from Secrets because Secrets // can be mounted in the pod, but ImagePullSecrets are only accessed by the kubelet. // More info: http://kubernetes.io/docs/user-guide/secrets#manually-specifying-an-imagepullsecret + // +optional repeated LocalObjectReference imagePullSecrets = 3; } @@ -2787,6 +3179,7 @@ message ServiceAccount { message ServiceAccountList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // List of ServiceAccounts. @@ -2798,6 +3191,7 @@ message ServiceAccountList { message ServiceList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // List of services @@ -2810,10 +3204,12 @@ message ServicePort { // All ports within a ServiceSpec must have unique names. This maps to // the 'Name' field in EndpointPort objects. // Optional if only one ServicePort is defined on this service. + // +optional optional string name = 1; // The IP protocol for this port. Supports "TCP" and "UDP". // Default is TCP. + // +optional optional string protocol = 2; // The port that will be exposed by this service. @@ -2827,6 +3223,7 @@ message ServicePort { // This field is ignored for services with clusterIP=None, and should be // omitted or set equal to the 'port' field. // More info: http://kubernetes.io/docs/user-guide/services#defining-a-service + // +optional optional k8s.io.kubernetes.pkg.util.intstr.IntOrString targetPort = 4; // The port on each node on which this service is exposed when type=NodePort or LoadBalancer. @@ -2834,6 +3231,7 @@ message ServicePort { // if unused or else creation of the service will fail. // Default is to auto-allocate a port if the ServiceType of this Service requires one. // More info: http://kubernetes.io/docs/user-guide/services#type--nodeport + // +optional optional int32 nodePort = 5; } @@ -2844,6 +3242,7 @@ message ServiceProxyOptions { // For example, the whole request URL is // http://localhost/api/v1/namespaces/kube-system/services/elasticsearch-logging/_search?q=user:kimchy. // Path is _search?q=user:kimchy. + // +optional optional string path = 1; } @@ -2859,6 +3258,7 @@ message ServiceSpec { // modify. Only applies to types ClusterIP, NodePort, and LoadBalancer. // Ignored if type is ExternalName. // More info: http://kubernetes.io/docs/user-guide/services#overview + // +optional map selector = 2; // clusterIP is the IP address of the service and is usually assigned @@ -2870,6 +3270,7 @@ message ServiceSpec { // Only applies to types ClusterIP, NodePort, and LoadBalancer. Ignored if // type is ExternalName. // More info: http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies + // +optional optional string clusterIP = 3; // type determines how the Service is exposed. Defaults to ClusterIP. Valid @@ -2886,6 +3287,7 @@ message ServiceSpec { // external load-balancer (if supported in the current cloud) which routes // to the clusterIP. // More info: http://kubernetes.io/docs/user-guide/services#overview + // +optional optional string type = 4; // externalIPs is a list of IP addresses for which nodes in the cluster @@ -2895,6 +3297,7 @@ message ServiceSpec { // that are not part of the Kubernetes system. A previous form of this // functionality exists as the deprecatedPublicIPs field. When using this // field, callers should also clear the deprecatedPublicIPs field. + // +optional repeated string externalIPs = 5; // deprecatedPublicIPs is deprecated and replaced by the externalIPs field @@ -2903,6 +3306,7 @@ message ServiceSpec { // any new API revisions. If both deprecatedPublicIPs *and* externalIPs are // set, deprecatedPublicIPs is used. // +k8s:conversion-gen=false + // +optional repeated string deprecatedPublicIPs = 6; // Supports "ClientIP" and "None". Used to maintain session affinity. @@ -2910,6 +3314,7 @@ message ServiceSpec { // Must be ClientIP or None. // Defaults to None. // More info: http://kubernetes.io/docs/user-guide/services#virtual-ips-and-service-proxies + // +optional optional string sessionAffinity = 7; // Only applies to Service Type: LoadBalancer @@ -2917,17 +3322,20 @@ message ServiceSpec { // This feature depends on whether the underlying cloud-provider supports specifying // the loadBalancerIP when a load balancer is created. // This field will be ignored if the cloud-provider does not support the feature. + // +optional optional string loadBalancerIP = 8; // If specified and supported by the platform, this will restrict traffic through the cloud-provider // load-balancer will be restricted to the specified client IPs. This field will be ignored if the // cloud-provider does not support the feature." // More info: http://kubernetes.io/docs/user-guide/services-firewalls + // +optional repeated string loadBalancerSourceRanges = 9; // externalName is the external reference that kubedns or equivalent will // return as a CNAME record for this service. No proxying will be involved. // Must be a valid DNS name and requires Type to be ExternalName. + // +optional optional string externalName = 10; } @@ -2935,6 +3343,7 @@ message ServiceSpec { message ServiceStatus { // LoadBalancer contains the current status of the load-balancer, // if one is present. + // +optional optional LoadBalancerStatus loadBalancer = 1; } @@ -2953,6 +3362,7 @@ message Taint { optional string key = 1; // Required. The taint value corresponding to the taint key. + // +optional optional string value = 2; // Required. The effect of the taint on pods @@ -2965,20 +3375,24 @@ message Taint { // the triple using the matching operator . message Toleration { // Required. Key is the taint key that the toleration applies to. + // +optional optional string key = 1; // operator represents a key's relationship to the value. // Valid operators are Exists and Equal. Defaults to Equal. // Exists is equivalent to wildcard for value, so that a pod can // tolerate all taints of a particular category. + // +optional optional string operator = 2; // Value is the taint value the toleration matches to. // If the operator is Exists, the value should be empty, otherwise just a regular string. + // +optional optional string value = 3; // Effect indicates the taint effect to match. Empty means match all taint effects. // When specified, allowed values are NoSchedule and PreferNoSchedule. + // +optional optional string effect = 4; } @@ -3002,6 +3416,7 @@ message VolumeMount { // Mounted read-only if true, read-write otherwise (false or unspecified). // Defaults to false. + // +optional optional bool readOnly = 2; // Path within the container at which the volume should be mounted. Must @@ -3010,6 +3425,7 @@ message VolumeMount { // Path within the volume from which the container's volume should be mounted. // Defaults to "" (volume's root). + // +optional optional string subPath = 4; } @@ -3024,85 +3440,107 @@ message VolumeSource { // --- // TODO(jonesdl) We need to restrict who can use host directory mounts and who can/can not // mount host directories as read/write. + // +optional optional HostPathVolumeSource hostPath = 1; // EmptyDir represents a temporary directory that shares a pod's lifetime. // More info: http://kubernetes.io/docs/user-guide/volumes#emptydir + // +optional optional EmptyDirVolumeSource emptyDir = 2; // GCEPersistentDisk represents a GCE Disk resource that is attached to a // kubelet's host machine and then exposed to the pod. // More info: http://kubernetes.io/docs/user-guide/volumes#gcepersistentdisk + // +optional optional GCEPersistentDiskVolumeSource gcePersistentDisk = 3; // AWSElasticBlockStore represents an AWS Disk resource that is attached to a // kubelet's host machine and then exposed to the pod. // More info: http://kubernetes.io/docs/user-guide/volumes#awselasticblockstore + // +optional optional AWSElasticBlockStoreVolumeSource awsElasticBlockStore = 4; // GitRepo represents a git repository at a particular revision. + // +optional optional GitRepoVolumeSource gitRepo = 5; // Secret represents a secret that should populate this volume. // More info: http://kubernetes.io/docs/user-guide/volumes#secrets + // +optional optional SecretVolumeSource secret = 6; // NFS represents an NFS mount on the host that shares a pod's lifetime // More info: http://kubernetes.io/docs/user-guide/volumes#nfs + // +optional optional NFSVolumeSource nfs = 7; // ISCSI represents an ISCSI Disk resource that is attached to a // kubelet's host machine and then exposed to the pod. // More info: http://releases.k8s.io/HEAD/examples/volumes/iscsi/README.md + // +optional optional ISCSIVolumeSource iscsi = 8; // Glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime. // More info: http://releases.k8s.io/HEAD/examples/volumes/glusterfs/README.md + // +optional optional GlusterfsVolumeSource glusterfs = 9; // PersistentVolumeClaimVolumeSource represents a reference to a // PersistentVolumeClaim in the same namespace. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#persistentvolumeclaims + // +optional optional PersistentVolumeClaimVolumeSource persistentVolumeClaim = 10; // RBD represents a Rados Block Device mount on the host that shares a pod's lifetime. // More info: http://releases.k8s.io/HEAD/examples/volumes/rbd/README.md + // +optional optional RBDVolumeSource rbd = 11; // FlexVolume represents a generic volume resource that is // provisioned/attached using an exec based plugin. This is an // alpha feature and may change in future. + // +optional optional FlexVolumeSource flexVolume = 12; // Cinder represents a cinder volume attached and mounted on kubelets host machine // More info: http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md + // +optional optional CinderVolumeSource cinder = 13; // CephFS represents a Ceph FS mount on the host that shares a pod's lifetime + // +optional optional CephFSVolumeSource cephfs = 14; // Flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running + // +optional optional FlockerVolumeSource flocker = 15; // DownwardAPI represents downward API about the pod that should populate this volume + // +optional optional DownwardAPIVolumeSource downwardAPI = 16; // FC represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed to the pod. + // +optional optional FCVolumeSource fc = 17; // AzureFile represents an Azure File Service mount on the host and bind mount to the pod. + // +optional optional AzureFileVolumeSource azureFile = 18; // ConfigMap represents a configMap that should populate this volume + // +optional optional ConfigMapVolumeSource configMap = 19; // VsphereVolume represents a vSphere volume attached and mounted on kubelets host machine + // +optional optional VsphereVirtualDiskVolumeSource vsphereVolume = 20; // Quobyte represents a Quobyte mount on the host that shares a pod's lifetime + // +optional optional QuobyteVolumeSource quobyte = 21; // AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod. + // +optional optional AzureDiskVolumeSource azureDisk = 22; } @@ -3114,6 +3552,7 @@ message VsphereVirtualDiskVolumeSource { // Filesystem type to mount. // Must be a filesystem type supported by the host operating system. // Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. + // +optional optional string fsType = 2; } diff --git a/pkg/apis/apps/v1alpha1/generated.proto b/pkg/apis/apps/v1alpha1/generated.proto index f5743588428..63a2d85c1ac 100644 --- a/pkg/apis/apps/v1alpha1/generated.proto +++ b/pkg/apis/apps/v1alpha1/generated.proto @@ -38,18 +38,22 @@ option go_package = "v1alpha1"; // map to the same storage identity. PetSet is currently in alpha // and subject to change without notice. message PetSet { + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Spec defines the desired identities of pets in this set. + // +optional optional PetSetSpec spec = 2; // Status is the current status of Pets in this PetSet. This data // may be out of date by some window of time. + // +optional optional PetSetStatus status = 3; } // PetSetList is a collection of PetSets. message PetSetList { + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; repeated PetSet items = 2; @@ -62,11 +66,13 @@ message PetSetSpec { // same Template, but individual replicas also have a consistent identity. // If unspecified, defaults to 1. // TODO: Consider a rename of this field. + // +optional optional int32 replicas = 1; // Selector is a label query over pods that should match the replica count. // If empty, defaulted to labels on the pod template. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 2; // Template is the object that describes the pod that will be created if @@ -82,6 +88,7 @@ message PetSetSpec { // container in the template. A claim in this list takes precedence over // any volumes in the template, with the same name. // TODO: Define the behavior if a claim already exists with the same name. + // +optional repeated k8s.io.kubernetes.pkg.api.v1.PersistentVolumeClaim volumeClaimTemplates = 4; // ServiceName is the name of the service that governs this PetSet. @@ -95,6 +102,7 @@ message PetSetSpec { // PetSetStatus represents the current state of a PetSet. message PetSetStatus { // most recent generation observed by this autoscaler. + // +optional optional int64 observedGeneration = 1; // Replicas is the number of actual replicas. diff --git a/pkg/apis/authentication/v1beta1/generated.proto b/pkg/apis/authentication/v1beta1/generated.proto index ac148e207d0..f36e28161b0 100644 --- a/pkg/apis/authentication/v1beta1/generated.proto +++ b/pkg/apis/authentication/v1beta1/generated.proto @@ -43,30 +43,36 @@ message ExtraValue { // Note: TokenReview requests may be cached by the webhook token authenticator // plugin in the kube-apiserver. message TokenReview { + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Spec holds information about the request being evaluated optional TokenReviewSpec spec = 2; // Status is filled in by the server and indicates whether the request can be authenticated. + // +optional optional TokenReviewStatus status = 3; } // TokenReviewSpec is a description of the token authentication request. message TokenReviewSpec { // Token is the opaque bearer token. + // +optional optional string token = 1; } // TokenReviewStatus is the result of the token authentication request. message TokenReviewStatus { // Authenticated indicates that the token was associated with a known user. + // +optional optional bool authenticated = 1; // User is the UserInfo associated with the provided token. + // +optional optional UserInfo user = 2; // Error indicates that the token couldn't be checked + // +optional optional string error = 3; } @@ -74,17 +80,21 @@ message TokenReviewStatus { // user.Info interface. message UserInfo { // The name that uniquely identifies this user among all active users. + // +optional optional string username = 1; // A unique value that identifies this user across time. If this user is // deleted and another user by the same name is added, they will have // different UIDs. + // +optional optional string uid = 2; // The names of groups this user is a part of. + // +optional repeated string groups = 3; // Any additional information provided by the authenticator. + // +optional map extra = 4; } diff --git a/pkg/apis/authorization/v1beta1/generated.proto b/pkg/apis/authorization/v1beta1/generated.proto index bd98cee0706..b3df8977853 100644 --- a/pkg/apis/authorization/v1beta1/generated.proto +++ b/pkg/apis/authorization/v1beta1/generated.proto @@ -43,6 +43,7 @@ message ExtraValue { // Having a namespace scoped resource makes it much easier to grant namespace scoped policy that includes permissions // checking. message LocalSubjectAccessReview { + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Spec holds information about the request being evaluated. spec.namespace must be equal to the namespace @@ -50,15 +51,18 @@ message LocalSubjectAccessReview { optional SubjectAccessReviewSpec spec = 2; // Status is filled in by the server and indicates whether the request is allowed or not + // +optional optional SubjectAccessReviewStatus status = 3; } // NonResourceAttributes includes the authorization attributes available for non-resource requests to the Authorizer interface message NonResourceAttributes { // Path is the URL path of the request + // +optional optional string path = 1; // Verb is the standard HTTP verb + // +optional optional string verb = 2; } @@ -68,24 +72,31 @@ message ResourceAttributes { // "" (empty) is defaulted for LocalSubjectAccessReviews // "" (empty) is empty for cluster-scoped resources // "" (empty) means "all" for namespace scoped resources from a SubjectAccessReview or SelfSubjectAccessReview + // +optional optional string namespace = 1; // Verb is a kubernetes resource API verb, like: get, list, watch, create, update, delete, proxy. "*" means all. + // +optional optional string verb = 2; // Group is the API Group of the Resource. "*" means all. + // +optional optional string group = 3; // Version is the API Version of the Resource. "*" means all. + // +optional optional string version = 4; // Resource is one of the existing resource types. "*" means all. + // +optional optional string resource = 5; // Subresource is one of the existing resource types. "" means none. + // +optional optional string subresource = 6; // Name is the name of the resource being requested for a "get" or deleted for a "delete". "" (empty) means all. + // +optional optional string name = 7; } @@ -93,12 +104,14 @@ message ResourceAttributes { // 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 message SelfSubjectAccessReview { + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Spec holds information about the request being evaluated. user and groups must be empty optional SelfSubjectAccessReviewSpec spec = 2; // Status is filled in by the server and indicates whether the request is allowed or not + // +optional optional SubjectAccessReviewStatus status = 3; } @@ -106,20 +119,24 @@ message SelfSubjectAccessReview { // and NonResourceAuthorizationAttributes must be set message SelfSubjectAccessReviewSpec { // ResourceAuthorizationAttributes describes information for a resource access request + // +optional optional ResourceAttributes resourceAttributes = 1; // NonResourceAttributes describes information for a non-resource access request + // +optional optional NonResourceAttributes nonResourceAttributes = 2; } // SubjectAccessReview checks whether or not a user or group can perform an action. message SubjectAccessReview { + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Spec holds information about the request being evaluated optional SubjectAccessReviewSpec spec = 2; // Status is filled in by the server and indicates whether the request is allowed or not + // +optional optional SubjectAccessReviewStatus status = 3; } @@ -127,20 +144,25 @@ message SubjectAccessReview { // and NonResourceAuthorizationAttributes must be set message SubjectAccessReviewSpec { // ResourceAuthorizationAttributes describes information for a resource access request + // +optional optional ResourceAttributes resourceAttributes = 1; // NonResourceAttributes describes information for a non-resource access request + // +optional optional NonResourceAttributes nonResourceAttributes = 2; // User is the user you're testing for. // If you specify "User" but not "Group", then is it interpreted as "What if User were not a member of any groups + // +optional optional string verb = 3; // Groups is the groups you're testing for. + // +optional repeated string group = 4; // Extra corresponds to the user.Info.GetExtra() method from the authenticator. Since that is input to the authorizer // it needs a reflection here. + // +optional map extra = 5; } @@ -150,11 +172,13 @@ message SubjectAccessReviewStatus { optional bool allowed = 1; // Reason is optional. It indicates why a request was allowed or denied. + // +optional optional string reason = 2; // EvaluationError is an indication that some error occurred during the authorization check. // It is entirely possible to get an error and be able to continue determine authorization status in spite of it. // For instance, RBAC can be missing a role, but enough roles are still present and bound to reason about the request. + // +optional optional string evaluationError = 3; } diff --git a/pkg/apis/autoscaling/v1/generated.proto b/pkg/apis/autoscaling/v1/generated.proto index 56fb0317e64..56d19a9cc95 100644 --- a/pkg/apis/autoscaling/v1/generated.proto +++ b/pkg/apis/autoscaling/v1/generated.proto @@ -39,24 +39,29 @@ message CrossVersionObjectReference { optional string name = 2; // API version of the referent + // +optional optional string apiVersion = 3; } // configuration of a horizontal pod autoscaler. message HorizontalPodAutoscaler { // Standard object metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // behaviour of autoscaler. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. + // +optional optional HorizontalPodAutoscalerSpec spec = 2; // current information about the autoscaler. + // +optional optional HorizontalPodAutoscalerStatus status = 3; } // list of horizontal pod autoscaler objects. message HorizontalPodAutoscalerList { // Standard list metadata. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // list of horizontal pod autoscaler objects. @@ -70,6 +75,7 @@ message HorizontalPodAutoscalerSpec { optional CrossVersionObjectReference scaleTargetRef = 1; // lower limit for the number of pods that can be set by the autoscaler, default 1. + // +optional optional int32 minReplicas = 2; // upper limit for the number of pods that can be set by the autoscaler; cannot be smaller than MinReplicas. @@ -77,16 +83,19 @@ message HorizontalPodAutoscalerSpec { // target average CPU utilization (represented as a percentage of requested CPU) over all the pods; // if not specified the default autoscaling policy will be used. + // +optional optional int32 targetCPUUtilizationPercentage = 4; } // current status of a horizontal pod autoscaler message HorizontalPodAutoscalerStatus { // most recent generation observed by this autoscaler. + // +optional optional int64 observedGeneration = 1; // last time the HorizontalPodAutoscaler scaled the number of pods; // used by the autoscaler to control how often the number of pods is changed. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastScaleTime = 2; // current number of replicas of pods managed by this autoscaler. @@ -97,24 +106,29 @@ message HorizontalPodAutoscalerStatus { // current average CPU utilization over all pods, represented as a percentage of requested CPU, // e.g. 70 means that an average pod is using now 70% of its requested CPU. + // +optional optional int32 currentCPUUtilizationPercentage = 5; } // Scale represents a scaling request for a resource. message Scale { // Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata. + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // defines the behavior of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. + // +optional optional ScaleSpec spec = 2; // current status of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. Read-only. + // +optional optional ScaleStatus status = 3; } // ScaleSpec describes the attributes of a scale subresource. message ScaleSpec { // desired number of instances for the scaled object. + // +optional optional int32 replicas = 1; } @@ -127,6 +141,7 @@ message ScaleStatus { // as the label selector but in the string format to avoid introspection // by clients. The string will be in the same format as the query-param syntax. // More info about label selectors: http://kubernetes.io/docs/user-guide/labels#label-selectors + // +optional optional string selector = 2; } diff --git a/pkg/apis/batch/v1/generated.proto b/pkg/apis/batch/v1/generated.proto index bb14b7fed56..c119f3ce7a8 100644 --- a/pkg/apis/batch/v1/generated.proto +++ b/pkg/apis/batch/v1/generated.proto @@ -34,14 +34,17 @@ option go_package = "v1"; message Job { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Spec is a structure defining the expected behavior of a job. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional JobSpec spec = 2; // Status is a structure describing current status of a job. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional JobStatus status = 3; } @@ -54,15 +57,19 @@ message JobCondition { optional string status = 2; // Last time the condition was checked. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; // Last time the condition transit from one status to another. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; // (brief) reason for the condition's last transition. + // +optional optional string reason = 5; // Human readable message indicating details about last transition. + // +optional optional string message = 6; } @@ -70,6 +77,7 @@ message JobCondition { message JobList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is the list of Job. @@ -83,6 +91,7 @@ message JobSpec { // be less than this number when ((.spec.completions - .status.successful) < .spec.parallelism), // i.e. when the work left to do is less than max parallelism. // More info: http://kubernetes.io/docs/user-guide/jobs + // +optional optional int32 parallelism = 1; // Completions specifies the desired number of successfully finished pods the @@ -91,15 +100,18 @@ message JobSpec { // value. Setting to 1 means that parallelism is limited to 1 and the success of that // pod signals the success of the job. // More info: http://kubernetes.io/docs/user-guide/jobs + // +optional optional int32 completions = 2; // Optional duration in seconds relative to the startTime that the job may be active // before the system tries to terminate it; value must be positive integer + // +optional optional int64 activeDeadlineSeconds = 3; // Selector is a label query over pods that should match the pod count. // Normally, the system sets this field for you. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors + // +optional optional LabelSelector selector = 4; // ManualSelector controls generation of pod labels and pod selectors. @@ -112,6 +124,7 @@ message JobSpec { // `manualSelector=true` in jobs that were created with the old `extensions/v1beta1` // API. // More info: http://releases.k8s.io/HEAD/docs/design/selector-generation.md + // +optional optional bool manualSelector = 5; // Template is the object that describes the pod that will be created when @@ -124,25 +137,31 @@ message JobSpec { message JobStatus { // Conditions represent the latest available observations of an object's current state. // More info: http://kubernetes.io/docs/user-guide/jobs + // +optional repeated JobCondition conditions = 1; // StartTime represents time when the job was acknowledged by the Job Manager. // It is not guaranteed to be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time startTime = 2; // CompletionTime represents time when the job was completed. It is not guaranteed to // be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time completionTime = 3; // Active is the number of actively running pods. + // +optional optional int32 active = 4; // Succeeded is the number of pods which reached Phase Succeeded. + // +optional optional int32 succeeded = 5; // Failed is the number of pods which reached Phase Failed. + // +optional optional int32 failed = 6; } @@ -153,9 +172,11 @@ message LabelSelector { // matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels // map is equivalent to an element of matchExpressions, whose key field is "key", the // operator is "In", and the values array contains only "value". The requirements are ANDed. + // +optional map matchLabels = 1; // matchExpressions is a list of label selector requirements. The requirements are ANDed. + // +optional repeated LabelSelectorRequirement matchExpressions = 2; } @@ -173,6 +194,7 @@ message LabelSelectorRequirement { // the values array must be non-empty. If the operator is Exists or DoesNotExist, // the values array must be empty. This array is replaced during a strategic // merge patch. + // +optional repeated string values = 3; } diff --git a/pkg/apis/batch/v2alpha1/generated.proto b/pkg/apis/batch/v2alpha1/generated.proto index 5792139598c..fe8172f8a75 100644 --- a/pkg/apis/batch/v2alpha1/generated.proto +++ b/pkg/apis/batch/v2alpha1/generated.proto @@ -34,14 +34,17 @@ option go_package = "v2alpha1"; message Job { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Spec is a structure defining the expected behavior of a job. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional JobSpec spec = 2; // Status is a structure describing current status of a job. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional JobStatus status = 3; } @@ -54,15 +57,19 @@ message JobCondition { optional string status = 2; // Last time the condition was checked. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; // Last time the condition transit from one status to another. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; // (brief) reason for the condition's last transition. + // +optional optional string reason = 5; // Human readable message indicating details about last transition. + // +optional optional string message = 6; } @@ -70,6 +77,7 @@ message JobCondition { message JobList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is the list of Job. @@ -83,6 +91,7 @@ message JobSpec { // be less than this number when ((.spec.completions - .status.successful) < .spec.parallelism), // i.e. when the work left to do is less than max parallelism. // More info: http://kubernetes.io/docs/user-guide/jobs + // +optional optional int32 parallelism = 1; // Completions specifies the desired number of successfully finished pods the @@ -91,15 +100,18 @@ message JobSpec { // value. Setting to 1 means that parallelism is limited to 1 and the success of that // pod signals the success of the job. // More info: http://kubernetes.io/docs/user-guide/jobs + // +optional optional int32 completions = 2; // Optional duration in seconds relative to the startTime that the job may be active // before the system tries to terminate it; value must be positive integer + // +optional optional int64 activeDeadlineSeconds = 3; // Selector is a label query over pods that should match the pod count. // Normally, the system sets this field for you. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors + // +optional optional LabelSelector selector = 4; // ManualSelector controls generation of pod labels and pod selectors. @@ -112,6 +124,7 @@ message JobSpec { // `manualSelector=true` in jobs that were created with the old `extensions/v1beta1` // API. // More info: http://releases.k8s.io/HEAD/docs/design/selector-generation.md + // +optional optional bool manualSelector = 5; // Template is the object that describes the pod that will be created when @@ -124,25 +137,31 @@ message JobSpec { message JobStatus { // Conditions represent the latest available observations of an object's current state. // More info: http://kubernetes.io/docs/user-guide/jobs + // +optional repeated JobCondition conditions = 1; // StartTime represents time when the job was acknowledged by the Job Manager. // It is not guaranteed to be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time startTime = 2; // CompletionTime represents time when the job was completed. It is not guaranteed to // be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time completionTime = 3; // Active is the number of actively running pods. + // +optional optional int32 active = 4; // Succeeded is the number of pods which reached Phase Succeeded. + // +optional optional int32 succeeded = 5; // Failed is the number of pods which reached Phase Failed. + // +optional optional int32 failed = 6; } @@ -150,10 +169,12 @@ message JobStatus { message JobTemplate { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Template defines jobs that will be created from this template // http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional JobTemplateSpec template = 2; } @@ -161,10 +182,12 @@ message JobTemplate { message JobTemplateSpec { // Standard object's metadata of the jobs created from this template. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Specification of the desired behavior of the job. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional JobSpec spec = 2; } @@ -175,9 +198,11 @@ message LabelSelector { // matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels // map is equivalent to an element of matchExpressions, whose key field is "key", the // operator is "In", and the values array contains only "value". The requirements are ANDed. + // +optional map matchLabels = 1; // matchExpressions is a list of label selector requirements. The requirements are ANDed. + // +optional repeated LabelSelectorRequirement matchExpressions = 2; } @@ -195,6 +220,7 @@ message LabelSelectorRequirement { // the values array must be non-empty. If the operator is Exists or DoesNotExist, // the values array must be empty. This array is replaced during a strategic // merge patch. + // +optional repeated string values = 3; } @@ -202,14 +228,17 @@ message LabelSelectorRequirement { message ScheduledJob { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Spec is a structure defining the expected behavior of a job, including the schedule. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional ScheduledJobSpec spec = 2; // Status is a structure describing current status of a job. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional ScheduledJobStatus status = 3; } @@ -217,6 +246,7 @@ message ScheduledJob { message ScheduledJobList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is the list of ScheduledJob. @@ -230,13 +260,16 @@ message ScheduledJobSpec { // Optional deadline in seconds for starting the job if it misses scheduled // time for any reason. Missed jobs executions will be counted as failed ones. + // +optional optional int64 startingDeadlineSeconds = 2; // ConcurrencyPolicy specifies how to treat concurrent executions of a Job. + // +optional optional string concurrencyPolicy = 3; // Suspend flag tells the controller to suspend subsequent executions, it does // not apply to already started executions. Defaults to false. + // +optional optional bool suspend = 4; // JobTemplate is the object that describes the job that will be created when @@ -247,9 +280,11 @@ message ScheduledJobSpec { // ScheduledJobStatus represents the current state of a Job. message ScheduledJobStatus { // Active holds pointers to currently running jobs. + // +optional repeated k8s.io.kubernetes.pkg.api.v1.ObjectReference active = 1; // LastScheduleTime keeps information of when was the last time the job was successfully scheduled. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastScheduleTime = 4; } diff --git a/pkg/apis/certificates/v1alpha1/generated.proto b/pkg/apis/certificates/v1alpha1/generated.proto index 5638d1d62af..5c576a2e291 100644 --- a/pkg/apis/certificates/v1alpha1/generated.proto +++ b/pkg/apis/certificates/v1alpha1/generated.proto @@ -32,12 +32,15 @@ option go_package = "v1alpha1"; // Describes a certificate signing request message CertificateSigningRequest { + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // The certificate request itself and any additional information. + // +optional optional CertificateSigningRequestSpec spec = 2; // Derived information about the request. + // +optional optional CertificateSigningRequestStatus status = 3; } @@ -46,16 +49,20 @@ message CertificateSigningRequestCondition { optional string type = 1; // brief reason for the request state + // +optional optional string reason = 2; // human readable message with details about the request state + // +optional optional string message = 3; // timestamp for the last update to this condition + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastUpdateTime = 4; } message CertificateSigningRequestList { + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; repeated CertificateSigningRequest items = 2; @@ -70,18 +77,23 @@ message CertificateSigningRequestSpec { // Information about the requesting user (if relevant) // See user.Info interface for details + // +optional optional string username = 2; + // +optional optional string uid = 3; + // +optional repeated string groups = 4; } message CertificateSigningRequestStatus { // Conditions applied to the request, such as approval or denial. + // +optional repeated CertificateSigningRequestCondition conditions = 1; // If request was approved, the controller will place the issued certificate here. + // +optional optional bytes certificate = 2; } diff --git a/pkg/apis/extensions/v1beta1/generated.proto b/pkg/apis/extensions/v1beta1/generated.proto index 11d0fa69f89..5bc9cc1c43c 100644 --- a/pkg/apis/extensions/v1beta1/generated.proto +++ b/pkg/apis/extensions/v1beta1/generated.proto @@ -33,6 +33,7 @@ option go_package = "v1beta1"; // An APIVersion represents a single concrete version of an object model. message APIVersion { // Name of this version (e.g. 'v1'). + // +optional optional string name = 1; } @@ -71,10 +72,12 @@ message CustomMetricTargetList { message DaemonSet { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Spec defines the desired behavior of this daemon set. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional DaemonSetSpec spec = 2; // Status is the current status of this daemon set. This data may be @@ -82,6 +85,7 @@ message DaemonSet { // Populated by the system. // Read-only. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional DaemonSetStatus status = 3; } @@ -89,6 +93,7 @@ message DaemonSet { message DaemonSetList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is a list of daemon sets. @@ -101,6 +106,7 @@ message DaemonSetSpec { // Must match in order to be controlled. // If empty, defaulted to labels on Pod template. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors + // +optional optional LabelSelector selector = 1; // Template is the object that describes the pod that will be created. @@ -136,18 +142,22 @@ message DaemonSetStatus { // Deployment enables declarative updates for Pods and ReplicaSets. message Deployment { // Standard object metadata. + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Specification of the desired behavior of the Deployment. + // +optional optional DeploymentSpec spec = 2; // Most recently observed status of the Deployment. + // +optional optional DeploymentStatus status = 3; } // DeploymentList is a list of Deployments. message DeploymentList { // Standard list metadata. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is the list of Deployments. @@ -160,6 +170,7 @@ message DeploymentRollback { optional string name = 1; // The annotations to be updated to a deployment + // +optional map updatedAnnotations = 2; // The config of this deployment rollback. @@ -170,56 +181,69 @@ message DeploymentRollback { message DeploymentSpec { // Number of desired pods. This is a pointer to distinguish between explicit // zero and not specified. Defaults to 1. + // +optional optional int32 replicas = 1; // Label selector for pods. Existing ReplicaSets whose pods are // selected by this will be the ones affected by this deployment. + // +optional optional LabelSelector selector = 2; // Template describes the pods that will be created. optional k8s.io.kubernetes.pkg.api.v1.PodTemplateSpec template = 3; // The deployment strategy to use to replace existing pods with new ones. + // +optional optional DeploymentStrategy strategy = 4; // Minimum number of seconds for which a newly created pod should be ready // without any of its container crashing, for it to be considered available. // Defaults to 0 (pod will be considered available as soon as it is ready) + // +optional optional int32 minReadySeconds = 5; // The number of old ReplicaSets to retain to allow rollback. // This is a pointer to distinguish between explicit zero and not specified. + // +optional optional int32 revisionHistoryLimit = 6; // Indicates that the deployment is paused and will not be processed by the // deployment controller. + // +optional optional bool paused = 7; // The config this deployment is rolling back to. Will be cleared after rollback is done. + // +optional optional RollbackConfig rollbackTo = 8; } // DeploymentStatus is the most recently observed status of the Deployment. message DeploymentStatus { // The generation observed by the deployment controller. + // +optional optional int64 observedGeneration = 1; // Total number of non-terminated pods targeted by this deployment (their labels match the selector). + // +optional optional int32 replicas = 2; // Total number of non-terminated pods targeted by this deployment that have the desired template spec. + // +optional optional int32 updatedReplicas = 3; // Total number of available pods (ready for at least minReadySeconds) targeted by this deployment. + // +optional optional int32 availableReplicas = 4; // Total number of unavailable pods targeted by this deployment. + // +optional optional int32 unavailableReplicas = 5; } // DeploymentStrategy describes how to replace existing pods with new ones. message DeploymentStrategy { // Type of deployment. Can be "Recreate" or "RollingUpdate". Default is RollingUpdate. + // +optional optional string type = 1; // Rolling update config params. Present only if DeploymentStrategyType = @@ -227,6 +251,7 @@ message DeploymentStrategy { // --- // TODO: Update this to follow our convention for oneOf, whatever we decide it // to be. + // +optional optional RollingUpdateDeployment rollingUpdate = 2; } @@ -242,10 +267,12 @@ message ExportOptions { // FSGroupStrategyOptions defines the strategy type and options used to create the strategy. message FSGroupStrategyOptions { // Rule is the strategy that will dictate what FSGroup is used in the SecurityContext. + // +optional optional string rule = 1; // Ranges are the allowed ranges of fs groups. If you would like to force a single // fs group then supply a single range with the same start and end. + // +optional repeated IDRange ranges = 2; } @@ -259,6 +286,7 @@ message HTTPIngressPath { // part of a URL as defined by RFC 3986. Paths must begin with // a '/'. If unspecified, the path defaults to a catch all sending // traffic to the backend. + // +optional optional string path = 1; // Backend defines the referenced service endpoint to which the traffic @@ -279,18 +307,22 @@ message HTTPIngressRuleValue { // configuration of a horizontal pod autoscaler. message HorizontalPodAutoscaler { // Standard object metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // behaviour of autoscaler. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. + // +optional optional HorizontalPodAutoscalerSpec spec = 2; // current information about the autoscaler. + // +optional optional HorizontalPodAutoscalerStatus status = 3; } // list of horizontal pod autoscaler objects. message HorizontalPodAutoscalerList { // Standard list metadata. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // list of horizontal pod autoscaler objects. @@ -304,6 +336,7 @@ message HorizontalPodAutoscalerSpec { optional SubresourceReference scaleRef = 1; // lower limit for the number of pods that can be set by the autoscaler, default 1. + // +optional optional int32 minReplicas = 2; // upper limit for the number of pods that can be set by the autoscaler; cannot be smaller than MinReplicas. @@ -311,16 +344,19 @@ message HorizontalPodAutoscalerSpec { // target average CPU utilization (represented as a percentage of requested CPU) over all the pods; // if not specified it defaults to the target CPU utilization at 80% of the requested resources. + // +optional optional CPUTargetUtilization cpuUtilization = 4; } // current status of a horizontal pod autoscaler message HorizontalPodAutoscalerStatus { // most recent generation observed by this autoscaler. + // +optional optional int64 observedGeneration = 1; // last time the HorizontalPodAutoscaler scaled the number of pods; // used by the autoscaler to control how often the number of pods is changed. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastScaleTime = 2; // current number of replicas of pods managed by this autoscaler. @@ -331,6 +367,7 @@ message HorizontalPodAutoscalerStatus { // current average CPU utilization over all pods, represented as a percentage of requested CPU, // e.g. 70 means that an average pod is using now 70% of its requested CPU. + // +optional optional int32 currentCPUUtilizationPercentage = 5; } @@ -360,14 +397,17 @@ message IDRange { message Ingress { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Spec is the desired state of the Ingress. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional IngressSpec spec = 2; // Status is the current state of the Ingress. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional IngressStatus status = 3; } @@ -384,6 +424,7 @@ message IngressBackend { message IngressList { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is the list of Ingress. @@ -406,6 +447,7 @@ message IngressRule { // Incoming requests are matched against the host before the IngressRuleValue. // If the host is unspecified, the Ingress routes all traffic based on the // specified IngressRuleValue. + // +optional optional string host = 1; // IngressRuleValue represents a rule to route requests for this IngressRule. @@ -413,6 +455,7 @@ message IngressRule { // just traffic matching the host to the default backend or all traffic to the // default backend, is left to the controller fulfilling the Ingress. Http is // currently the only supported IngressRuleValue. + // +optional optional IngressRuleValue ingressRuleValue = 2; } @@ -421,6 +464,7 @@ message IngressRule { // mixing different types of rules in a single Ingress is disallowed, so exactly // one of the following must be set. message IngressRuleValue { + // +optional optional HTTPIngressRuleValue http = 1; } @@ -430,6 +474,7 @@ message IngressSpec { // rule. At least one of 'backend' or 'rules' must be specified. This field // is optional to allow the loadbalancer controller or defaulting logic to // specify a global default. + // +optional optional IngressBackend backend = 1; // TLS configuration. Currently the Ingress only supports a single TLS @@ -437,16 +482,19 @@ message IngressSpec { // will be multiplexed on the same port according to the hostname specified // through the SNI TLS extension, if the ingress controller fulfilling the // ingress supports SNI. + // +optional repeated IngressTLS tls = 2; // A list of host rules used to configure the Ingress. If unspecified, or // no rule matches, all traffic is sent to the default backend. + // +optional repeated IngressRule rules = 3; } // IngressStatus describe the current state of the Ingress. message IngressStatus { // LoadBalancer contains the current status of the load-balancer. + // +optional optional k8s.io.kubernetes.pkg.api.v1.LoadBalancerStatus loadBalancer = 1; } @@ -456,6 +504,7 @@ message IngressTLS { // this list must match the name/s used in the tlsSecret. Defaults to the // wildcard host setting for the loadbalancer controller fulfilling this // Ingress, if left unspecified. + // +optional repeated string hosts = 1; // SecretName is the name of the secret used to terminate SSL traffic on 443. @@ -463,6 +512,7 @@ message IngressTLS { // If the SNI host in a listener conflicts with the "Host" header field used // by an IngressRule, the SNI host is used for termination and value of the // Host header is used for routing. + // +optional optional string secretName = 2; } @@ -470,14 +520,17 @@ message IngressTLS { message Job { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Spec is a structure defining the expected behavior of a job. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional JobSpec spec = 2; // Status is a structure describing current status of a job. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional JobStatus status = 3; } @@ -490,15 +543,19 @@ message JobCondition { optional string status = 2; // Last time the condition was checked. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; // Last time the condition transit from one status to another. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; // (brief) reason for the condition's last transition. + // +optional optional string reason = 5; // Human readable message indicating details about last transition. + // +optional optional string message = 6; } @@ -506,6 +563,7 @@ message JobCondition { message JobList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is the list of Job. @@ -519,6 +577,7 @@ message JobSpec { // be less than this number when ((.spec.completions - .status.successful) < .spec.parallelism), // i.e. when the work left to do is less than max parallelism. // More info: http://kubernetes.io/docs/user-guide/jobs + // +optional optional int32 parallelism = 1; // Completions specifies the desired number of successfully finished pods the @@ -527,15 +586,18 @@ message JobSpec { // value. Setting to 1 means that parallelism is limited to 1 and the success of that // pod signals the success of the job. // More info: http://kubernetes.io/docs/user-guide/jobs + // +optional optional int32 completions = 2; // Optional duration in seconds relative to the startTime that the job may be active // before the system tries to terminate it; value must be positive integer + // +optional optional int64 activeDeadlineSeconds = 3; // Selector is a label query over pods that should match the pod count. // Normally, the system sets this field for you. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors + // +optional optional LabelSelector selector = 4; // AutoSelector controls generation of pod labels and pod selectors. @@ -543,6 +605,7 @@ message JobSpec { // to allow conversion from batch/v1 Jobs, where it corresponds to, but has the opposite // meaning as, ManualSelector. // More info: http://releases.k8s.io/HEAD/docs/design/selector-generation.md + // +optional optional bool autoSelector = 5; // Template is the object that describes the pod that will be created when @@ -555,25 +618,31 @@ message JobSpec { message JobStatus { // Conditions represent the latest available observations of an object's current state. // More info: http://kubernetes.io/docs/user-guide/jobs + // +optional repeated JobCondition conditions = 1; // StartTime represents time when the job was acknowledged by the Job Manager. // It is not guaranteed to be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time startTime = 2; // CompletionTime represents time when the job was completed. It is not guaranteed to // be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time completionTime = 3; // Active is the number of actively running pods. + // +optional optional int32 active = 4; // Succeeded is the number of pods which reached Phase Succeeded. + // +optional optional int32 succeeded = 5; // Failed is the number of pods which reached Phase Failed. + // +optional optional int32 failed = 6; } @@ -584,9 +653,11 @@ message LabelSelector { // matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels // map is equivalent to an element of matchExpressions, whose key field is "key", the // operator is "In", and the values array contains only "value". The requirements are ANDed. + // +optional map matchLabels = 1; // matchExpressions is a list of label selector requirements. The requirements are ANDed. + // +optional repeated LabelSelectorRequirement matchExpressions = 2; } @@ -604,15 +675,18 @@ message LabelSelectorRequirement { // the values array must be non-empty. If the operator is Exists or DoesNotExist, // the values array must be empty. This array is replaced during a strategic // merge patch. + // +optional repeated string values = 3; } message NetworkPolicy { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Specification of the desired behavior for this NetworkPolicy. + // +optional optional NetworkPolicySpec spec = 2; } @@ -625,6 +699,7 @@ message NetworkPolicyIngressRule { // If this field is present and contains at least one item, then this rule allows traffic // only if the traffic matches at least one port in the list. // TODO: Update this to be a pointer to slice as soon as auto-generation supports it. + // +optional repeated NetworkPolicyPort ports = 1; // List of sources which should be able to access the pods selected for this rule. @@ -634,6 +709,7 @@ message NetworkPolicyIngressRule { // If this field is present and contains at least on item, this rule allows traffic only if the // traffic matches at least one item in the from list. // TODO: Update this to be a pointer to slice as soon as auto-generation supports it. + // +optional repeated NetworkPolicyPeer from = 2; } @@ -641,6 +717,7 @@ message NetworkPolicyIngressRule { message NetworkPolicyList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is a list of schema objects. @@ -652,6 +729,7 @@ message NetworkPolicyPeer { // This field follows standard label selector semantics. // If not provided, this selector selects no pods. // If present but empty, this selector selects all pods in this namespace. + // +optional optional LabelSelector podSelector = 1; // Selects Namespaces using cluster scoped-labels. This @@ -659,12 +737,14 @@ message NetworkPolicyPeer { // This field follows standard label selector semantics. // If omitted, this selector selects no namespaces. // If present but empty, this selector selects all namespaces. + // +optional optional LabelSelector namespaceSelector = 2; } message NetworkPolicyPort { // Optional. The protocol (TCP or UDP) which traffic must match. // If not specified, this field defaults to TCP. + // +optional optional string protocol = 1; // If specified, the port on the given protocol. This can @@ -672,6 +752,7 @@ message NetworkPolicyPort { // this matches all port names and numbers. // If present, only traffic on the specified protocol AND port // will be matched. + // +optional optional k8s.io.kubernetes.pkg.util.intstr.IntOrString port = 2; } @@ -691,6 +772,7 @@ message NetworkPolicySpec { // If this field is empty then this NetworkPolicy does not affect ingress isolation. // If this field is present and contains at least one rule, this policy allows any traffic // which matches at least one of the ingress rules in this list. + // +optional repeated NetworkPolicyIngressRule ingress = 2; } @@ -699,9 +781,11 @@ message NetworkPolicySpec { message PodSecurityPolicy { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // spec defines the policy enforced. + // +optional optional PodSecurityPolicySpec spec = 2; } @@ -709,6 +793,7 @@ message PodSecurityPolicy { message PodSecurityPolicyList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is a list of schema objects. @@ -718,36 +803,45 @@ message PodSecurityPolicyList { // Pod Security Policy Spec defines the policy enforced. message PodSecurityPolicySpec { // privileged determines if a pod can request to be run as privileged. + // +optional optional bool privileged = 1; // DefaultAddCapabilities is the default set of capabilities that will be added to the container // unless the pod spec specifically drops the capability. You may not list a capabiility in both // DefaultAddCapabilities and RequiredDropCapabilities. + // +optional repeated string defaultAddCapabilities = 2; // RequiredDropCapabilities are the capabilities that will be dropped from the container. These // are required to be dropped and cannot be added. + // +optional repeated string requiredDropCapabilities = 3; // AllowedCapabilities is a list of capabilities that can be requested to add to the container. // Capabilities in this field may be added at the pod author's discretion. // You must not list a capability in both AllowedCapabilities and RequiredDropCapabilities. + // +optional repeated string allowedCapabilities = 4; // volumes is a white list of allowed volume plugins. Empty indicates that all plugins // may be used. + // +optional repeated string volumes = 5; // hostNetwork determines if the policy allows the use of HostNetwork in the pod spec. + // +optional optional bool hostNetwork = 6; // hostPorts determines which host port ranges are allowed to be exposed. + // +optional repeated HostPortRange hostPorts = 7; // hostPID determines if the policy allows the use of HostPID in the pod spec. + // +optional optional bool hostPID = 8; // hostIPC determines if the policy allows the use of HostIPC in the pod spec. + // +optional optional bool hostIPC = 9; // seLinux is the strategy that will dictate the allowable labels that may be set. @@ -767,6 +861,7 @@ message PodSecurityPolicySpec { // the PSP should deny the pod. // If set to false the container may run with a read only root file system if it wishes but it // will not be forced to. + // +optional optional bool readOnlyRootFilesystem = 14; } @@ -775,10 +870,12 @@ message ReplicaSet { // If the Labels of a ReplicaSet are empty, they are defaulted to // 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 + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Spec defines the specification of the desired behavior of the ReplicaSet. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional ReplicaSetSpec spec = 2; // Status is the most recently observed status of the ReplicaSet. @@ -786,6 +883,7 @@ message ReplicaSet { // Populated by the system. // Read-only. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status + // +optional optional ReplicaSetStatus status = 3; } @@ -798,15 +896,19 @@ message ReplicaSetCondition { optional string status = 2; // Last time we probed the condition. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; // The last time the condition transitioned from one status to another. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; // The reason for the condition's last transition. + // +optional optional string reason = 5; // A human readable message indicating details about the transition. + // +optional optional string message = 6; } @@ -814,6 +916,7 @@ message ReplicaSetCondition { message ReplicaSetList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // List of ReplicaSets. @@ -827,22 +930,26 @@ message ReplicaSetSpec { // This is a pointer to distinguish between explicit zero and unspecified. // Defaults to 1. // More info: http://kubernetes.io/docs/user-guide/replication-controller#what-is-a-replication-controller + // +optional optional int32 replicas = 1; // Minimum number of seconds for which a newly created pod should be ready // without any of its container crashing, for it to be considered available. // Defaults to 0 (pod will be considered available as soon as it is ready) + // +optional optional int32 minReadySeconds = 4; // Selector is a label query over pods that should match the replica count. // If the selector is empty, it is defaulted to the labels present on the pod template. // Label keys and values that must match in order to be controlled by this replica set. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors + // +optional optional LabelSelector selector = 2; // Template is the object that describes the pod that will be created if // insufficient replicas are detected. // More info: http://kubernetes.io/docs/user-guide/replication-controller#pod-template + // +optional optional k8s.io.kubernetes.pkg.api.v1.PodTemplateSpec template = 3; } @@ -853,18 +960,23 @@ message ReplicaSetStatus { optional int32 replicas = 1; // The number of pods that have labels matching the labels of the pod template of the replicaset. + // +optional optional int32 fullyLabeledReplicas = 2; // The number of ready replicas for this replica set. + // +optional optional int32 readyReplicas = 4; // The number of available replicas (ready for at least minReadySeconds) for this replica set. + // +optional optional int32 availableReplicas = 5; // ObservedGeneration reflects the generation of the most recently observed ReplicaSet. + // +optional optional int64 observedGeneration = 3; // Represents the latest available observations of a replica set's current state. + // +optional repeated ReplicaSetCondition conditions = 6; } @@ -874,6 +986,7 @@ message ReplicationControllerDummy { message RollbackConfig { // The revision to rollback to. If set to 0, rollbck to the last revision. + // +optional optional int64 revision = 1; } @@ -889,6 +1002,7 @@ message RollingUpdateDeployment { // can be scaled down further, followed by scaling up the new RC, ensuring // that the total number of pods available at all times during the update is at // least 70% of desired pods. + // +optional optional k8s.io.kubernetes.pkg.util.intstr.IntOrString maxUnavailable = 1; // The maximum number of pods that can be scheduled above the desired number of @@ -902,6 +1016,7 @@ message RollingUpdateDeployment { // 130% of desired pods. Once old pods have been killed, // new RC can be scaled up further, ensuring that total number of pods running // at any time during the update is atmost 130% of desired pods. + // +optional optional k8s.io.kubernetes.pkg.util.intstr.IntOrString maxSurge = 2; } @@ -911,6 +1026,7 @@ message RunAsUserStrategyOptions { optional string rule = 1; // Ranges are the allowed ranges of uids that may be used. + // +optional repeated IDRange ranges = 2; } @@ -921,24 +1037,29 @@ message SELinuxStrategyOptions { // seLinuxOptions required to run as; required for MustRunAs // More info: http://releases.k8s.io/HEAD/docs/design/security_context.md#security-context + // +optional optional k8s.io.kubernetes.pkg.api.v1.SELinuxOptions seLinuxOptions = 2; } // represents a scaling request for a resource. message Scale { // Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata. + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // defines the behavior of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. + // +optional optional ScaleSpec spec = 2; // current status of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. Read-only. + // +optional optional ScaleStatus status = 3; } // describes the attributes of a scale subresource message ScaleSpec { // desired number of instances for the scaled object. + // +optional optional int32 replicas = 1; } @@ -948,6 +1069,7 @@ message ScaleStatus { optional int32 replicas = 1; // label query over pods that should match the replicas count. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors + // +optional map selector = 2; // label selector for pods that should match the replicas count. This is a serializated @@ -956,31 +1078,38 @@ message ScaleStatus { // query-param syntax. If the target type only supports map-based selectors, both this // field and map-based selector field are populated. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors + // +optional optional string targetSelector = 3; } // SubresourceReference contains enough information to let you inspect or modify the referred subresource. message SubresourceReference { // Kind of the referent; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional optional string kind = 1; // Name of the referent; More info: http://kubernetes.io/docs/user-guide/identifiers#names + // +optional optional string name = 2; // API version of the referent + // +optional optional string apiVersion = 3; // Subresource name of the referent + // +optional optional string subresource = 4; } // SupplementalGroupsStrategyOptions defines the strategy type and options used to create the strategy. message SupplementalGroupsStrategyOptions { // Rule is the strategy that will dictate what supplemental groups is used in the SecurityContext. + // +optional optional string rule = 1; // Ranges are the allowed ranges of supplemental groups. If you would like to force a single // supplemental group then supply a single range with the same start and end. + // +optional repeated IDRange ranges = 2; } @@ -988,21 +1117,26 @@ message SupplementalGroupsStrategyOptions { // types to the API. It consists of one or more Versions of the api. message ThirdPartyResource { // Standard object metadata + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Description is the description of this object. + // +optional optional string description = 2; // Versions are versions for this third party object + // +optional repeated APIVersion versions = 3; } // An internal object, used for versioned storage in etcd. Not exposed to the end user. message ThirdPartyResourceData { // Standard object metadata. + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Data is the raw JSON data for this data. + // +optional optional bytes data = 2; } @@ -1010,6 +1144,7 @@ message ThirdPartyResourceData { message ThirdPartyResourceDataList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is the list of ThirdpartyResourceData. @@ -1019,6 +1154,7 @@ message ThirdPartyResourceDataList { // ThirdPartyResourceList is a list of ThirdPartyResources. message ThirdPartyResourceList { // Standard list metadata. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is the list of ThirdPartyResources. diff --git a/pkg/apis/imagepolicy/v1alpha1/generated.proto b/pkg/apis/imagepolicy/v1alpha1/generated.proto index a0797d57621..7b26db93535 100644 --- a/pkg/apis/imagepolicy/v1alpha1/generated.proto +++ b/pkg/apis/imagepolicy/v1alpha1/generated.proto @@ -32,32 +32,38 @@ option go_package = "v1alpha1"; // ImageReview checks if the set of images in a pod are allowed. message ImageReview { + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Spec holds information about the pod being evaluated optional ImageReviewSpec spec = 2; // Status is filled in by the backend and indicates whether the pod should be allowed. + // +optional optional ImageReviewStatus status = 3; } // ImageReviewContainerSpec is a description of a container within the pod creation request. message ImageReviewContainerSpec { // This can be in the form image:tag or image@SHA:012345679abcdef. + // +optional optional string image = 1; } // ImageReviewSpec is a description of the pod creation request. message ImageReviewSpec { // Containers is a list of a subset of the information in each container of the Pod being created. + // +optional repeated ImageReviewContainerSpec containers = 1; // Annotations is a list of key-value pairs extracted from the Pod's annotations. // It only includes keys which match the pattern `*.image-policy.k8s.io/*`. // It is up to each webhook backend to determine how to interpret these annotations, if at all. + // +optional map annotations = 2; // Namespace is the namespace the pod is being created in. + // +optional optional string namespace = 3; } @@ -69,6 +75,7 @@ message ImageReviewStatus { // Reason should be empty unless Allowed is false in which case it // may contain a short description of what is wrong. Kubernetes // may truncate excessively long errors when displaying to the user. + // +optional optional string reason = 2; } diff --git a/pkg/apis/policy/v1alpha1/generated.proto b/pkg/apis/policy/v1alpha1/generated.proto index 2b8048013ee..25a499322f0 100644 --- a/pkg/apis/policy/v1alpha1/generated.proto +++ b/pkg/apis/policy/v1alpha1/generated.proto @@ -35,25 +35,31 @@ option go_package = "v1alpha1"; // created by POSTing to .../pods//evictions. message Eviction { // ObjectMeta describes the pod that is being evicted. + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // DeleteOptions may be provided + // +optional optional k8s.io.kubernetes.pkg.api.v1.DeleteOptions deleteOptions = 2; } // PodDisruptionBudget is an object to define the max disruption that can be caused to a collection of pods message PodDisruptionBudget { + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Specification of the desired behavior of the PodDisruptionBudget. + // +optional optional PodDisruptionBudgetSpec spec = 2; // Most recently observed status of the PodDisruptionBudget. + // +optional optional PodDisruptionBudgetStatus status = 3; } // PodDisruptionBudgetList is a collection of PodDisruptionBudgets. message PodDisruptionBudgetList { + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; repeated PodDisruptionBudget items = 2; @@ -65,10 +71,12 @@ message PodDisruptionBudgetSpec { // "selector" will still be available after the eviction, i.e. even in the // absence of the evicted pod. So for example you can prevent all voluntary // evictions by specifying "100%". + // +optional optional k8s.io.kubernetes.pkg.util.intstr.IntOrString minAvailable = 1; // Label query over pods whose evictions are managed by the disruption // budget. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 2; } diff --git a/pkg/apis/rbac/v1alpha1/generated.proto b/pkg/apis/rbac/v1alpha1/generated.proto index ebb657c4a9e..09f11e33b06 100644 --- a/pkg/apis/rbac/v1alpha1/generated.proto +++ b/pkg/apis/rbac/v1alpha1/generated.proto @@ -33,6 +33,7 @@ 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. message ClusterRole { // Standard object's metadata. + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Rules holds all the PolicyRules for this ClusterRole @@ -43,6 +44,7 @@ message ClusterRole { // and adds who information via Subject. message ClusterRoleBinding { // Standard object's metadata. + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Subjects holds references to the objects the role applies to. @@ -56,6 +58,7 @@ message ClusterRoleBinding { // ClusterRoleBindingList is a collection of ClusterRoleBindings message ClusterRoleBindingList { // Standard object's metadata. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is a list of ClusterRoleBindings @@ -65,6 +68,7 @@ message ClusterRoleBindingList { // ClusterRoleList is a collection of ClusterRoles message ClusterRoleList { // Standard object's metadata. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is a list of ClusterRoles @@ -79,28 +83,34 @@ message PolicyRule { // AttributeRestrictions will vary depending on what the Authorizer/AuthorizationAttributeBuilder pair supports. // If the Authorizer does not recognize how to handle the AttributeRestrictions, the Authorizer should report an error. + // +optional optional k8s.io.kubernetes.pkg.runtime.RawExtension attributeRestrictions = 2; // APIGroups is the name of the APIGroup that contains the resources. If multiple API groups are specified, any action requested against one of // the enumerated resources in any API group will be allowed. + // +optional repeated string apiGroups = 3; // Resources is a list of resources this rule applies to. ResourceAll represents all resources. + // +optional repeated string resources = 4; // ResourceNames is an optional white list of names that the rule applies to. An empty set means that everything is allowed. + // +optional repeated string resourceNames = 5; // NonResourceURLs is a set of partial urls that a user should have access to. *s are allowed, but only as the full, final step in the path // This name is intentionally different than the internal type so that the DefaultConvert works nicely and because the ordering may be different. // Since non-resource URLs are not namespaced, this field is only applicable for ClusterRoles referenced from a ClusterRoleBinding. // Rules can either apply to API resources (such as "pods" or "secrets") or non-resource URL paths (such as "/api"), but not both. + // +optional repeated string nonResourceURLs = 6; } // Role is a namespaced, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding. message Role { // Standard object's metadata. + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Rules holds all the PolicyRules for this Role @@ -112,6 +122,7 @@ message Role { // namespace only have effect in that namespace. message RoleBinding { // Standard object's metadata. + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Subjects holds references to the objects the role applies to. @@ -125,6 +136,7 @@ message RoleBinding { // RoleBindingList is a collection of RoleBindings message RoleBindingList { // Standard object's metadata. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is a list of RoleBindings @@ -134,6 +146,7 @@ message RoleBindingList { // RoleList is a collection of Roles message RoleList { // Standard object's metadata. + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is a list of Roles @@ -160,6 +173,7 @@ message Subject { optional string kind = 1; // APIVersion holds the API group and version of the referenced object. + // +optional optional string apiVersion = 2; // Name of the object being referenced. @@ -167,6 +181,7 @@ message Subject { // Namespace of the referenced object. If the object kind is non-namespace, such as "User" or "Group", and this value is not empty // the Authorizer should report an error. + // +optional optional string namespace = 4; } diff --git a/pkg/apis/storage/v1beta1/generated.proto b/pkg/apis/storage/v1beta1/generated.proto index dbcdcc3c030..bdc0631cf2f 100644 --- a/pkg/apis/storage/v1beta1/generated.proto +++ b/pkg/apis/storage/v1beta1/generated.proto @@ -38,6 +38,7 @@ option go_package = "v1beta1"; message StorageClass { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1; // Provisioner indicates the type of the provisioner. @@ -45,6 +46,7 @@ message StorageClass { // Parameters holds the parameters for the provisioner that should // create volumes of this storage class. + // +optional map parameters = 3; } @@ -52,6 +54,7 @@ message StorageClass { message StorageClassList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata + // +optional optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; // Items is the list of StorageClasses diff --git a/pkg/runtime/generated.proto b/pkg/runtime/generated.proto index 17951fd3086..136ab0b5e3c 100644 --- a/pkg/runtime/generated.proto +++ b/pkg/runtime/generated.proto @@ -94,8 +94,10 @@ message RawExtension { // +protobuf=true // +k8s:openapi-gen=true message TypeMeta { + // +optional optional string apiVersion = 1; + // +optional optional string kind = 2; }