From 6bb970148933a7f069b3a01d982f843680c123d7 Mon Sep 17 00:00:00 2001 From: Deyuan Deng Date: Fri, 27 Mar 2015 16:36:03 -0400 Subject: [PATCH] Remove Reachable Condition --- api/swagger-spec/v1beta1.json | 436 ++++++++++------- api/swagger-spec/v1beta2.json | 436 ++++++++++------- api/swagger-spec/v1beta3.json | 462 +++++++++++++------ docs/node.md | 24 +- pkg/api/types.go | 4 +- pkg/api/v1beta1/conversion.go | 6 - pkg/api/v1beta1/types.go | 6 +- pkg/api/v1beta2/conversion.go | 6 - pkg/api/v1beta2/types.go | 6 +- pkg/api/v1beta3/types.go | 6 +- pkg/kubectl/resource_printer.go | 2 +- pkg/kubectl/resource_printer_test.go | 19 +- plugin/pkg/scheduler/factory/factory.go | 8 +- plugin/pkg/scheduler/factory/factory_test.go | 44 +- 14 files changed, 878 insertions(+), 587 deletions(-) diff --git a/api/swagger-spec/v1beta1.json b/api/swagger-spec/v1beta1.json index 11c49acf110..de34807ca67 100644 --- a/api/swagger-spec/v1beta1.json +++ b/api/swagger-spec/v1beta1.json @@ -83,7 +83,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -173,7 +173,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -391,7 +391,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -451,7 +451,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -541,7 +541,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -751,7 +751,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -811,7 +811,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -901,7 +901,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1111,7 +1111,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1163,7 +1163,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1237,7 +1237,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1415,7 +1415,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1477,6 +1477,14 @@ "description": "name of the Node", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -1499,6 +1507,14 @@ "description": "name of the Node", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -1521,6 +1537,14 @@ "description": "name of the Node", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -1543,6 +1567,14 @@ "description": "name of the Node", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -1683,7 +1715,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1757,7 +1789,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1935,7 +1967,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -2059,7 +2091,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -2133,7 +2165,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -2311,7 +2343,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -2373,6 +2405,14 @@ "description": "name of the Node", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -2395,6 +2435,14 @@ "description": "name of the Node", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -2417,6 +2465,14 @@ "description": "name of the Node", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -2439,6 +2495,14 @@ "description": "name of the Node", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -2587,7 +2651,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -2677,7 +2741,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -2895,7 +2959,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -2966,6 +3030,14 @@ "required": true, "allowMultiple": false }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false + }, { "type": "string", "paramType": "query", @@ -2996,6 +3068,14 @@ "required": true, "allowMultiple": false }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false + }, { "type": "string", "paramType": "query", @@ -3026,6 +3106,14 @@ "required": true, "allowMultiple": false }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false + }, { "type": "string", "paramType": "query", @@ -3056,6 +3144,14 @@ "required": true, "allowMultiple": false }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false + }, { "type": "string", "paramType": "query", @@ -3323,7 +3419,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -3413,7 +3509,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -3631,7 +3727,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -3691,7 +3787,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -3781,7 +3877,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -3999,7 +4095,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4103,7 +4199,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4193,7 +4289,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4403,7 +4499,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4463,7 +4559,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4553,7 +4649,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4763,7 +4859,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4834,6 +4930,14 @@ "required": true, "allowMultiple": false }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false + }, { "type": "string", "paramType": "query", @@ -4864,6 +4968,14 @@ "required": true, "allowMultiple": false }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false + }, { "type": "string", "paramType": "query", @@ -4894,6 +5006,14 @@ "required": true, "allowMultiple": false }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false + }, { "type": "string", "paramType": "query", @@ -4924,6 +5044,14 @@ "required": true, "allowMultiple": false }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false + }, { "type": "string", "paramType": "query", @@ -5078,6 +5206,10 @@ "id": "*v1beta1.DeleteOptions", "properties": {} }, + "uint64": { + "id": "", + "properties": null + }, "v1beta1.Binding": { "id": "v1beta1.Binding", "required": [ @@ -5086,7 +5218,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -5134,7 +5266,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" } } @@ -5167,6 +5299,7 @@ "required": [ "name", "image", + "entrypoint:omitempty", "imagePullPolicy" ], "properties": { @@ -5179,13 +5312,20 @@ "items": { "type": "string" }, - "description": "command argv array; not executed within a shell; defaults to entrypoint or command in the image; cannot be updated" + "description": "command argv array; not executed within a shell; the image's cmd is used if this is not provided; cannot be updated" }, "cpu": { "type": "integer", "format": "int32", "description": "CPU share in thousandths of a core; cannot be updated" }, + "entrypoint:omitempty": { + "type": "array", + "items": { + "type": "string" + }, + "description": "entrypoint array; not executed within a shell; the image's entrypoint is used if this is not provided; cannot be updated" + }, "env": { "type": "array", "items": { @@ -5198,7 +5338,7 @@ "description": "Docker image name" }, "imagePullPolicy": { - "$ref": "v1beta1.PullPolicy", + "type": "string", "description": "image pull policy; one of PullAlways, PullNever, PullIfNotPresent; defaults to PullAlways if :latest tag is specified, or PullIfNotPresent otherwise; cannot be updated" }, "lifecycle": { @@ -5271,7 +5411,7 @@ "description": "list of containers belonging to the pod; containers cannot currently be added or removed" }, "dnsPolicy": { - "$ref": "v1beta1.DNSPolicy", + "type": "string", "description": "DNS policy for containers within the pod; one of 'ClusterFirst' or 'Default'" }, "hostNetwork": { @@ -5287,7 +5427,7 @@ "description": "restart policy for all containers within the pod; one of RestartPolicyAlways, RestartPolicyOnFailure, RestartPolicyNever" }, "uuid": { - "$ref": "types.UID", + "type": "string", "description": "manifest UUID, populated by the system, read-only" }, "version": { @@ -5328,7 +5468,7 @@ "description": "name for the port that can be referred to by services; must be a DNS_LABEL and unique without the pod" }, "protocol": { - "$ref": "v1beta1.Protocol", + "type": "string", "description": "protocol for port; must be UDP or TCP; TCP if unspecified" } } @@ -5340,7 +5480,7 @@ ], "properties": { "medium": { - "$ref": "v1beta1.StorageType", + "type": "string", "description": "type of storage used to back the volume; must be an empty string (default) or Memory" } } @@ -5396,7 +5536,7 @@ "description": "specific resourceVersion to which this reference is made, if any: https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/api-conventions.md#concurrency-control-and-consistency" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "uid of the referent" } } @@ -5417,7 +5557,7 @@ "description": "port number of the endpoint" }, "protocol": { - "$ref": "v1beta1.Protocol", + "type": "string", "description": "protocol for this port; must be UDP or TCP; TCP if unspecified" } } @@ -5449,7 +5589,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -5488,7 +5628,7 @@ "description": "namespace to which the object belongs; must be a DNS_SUBDOMAIN; 'default' by default; cannot be updated" }, "protocol": { - "$ref": "v1beta1.Protocol", + "type": "string", "description": "IP protocol for the first set of endpoint ports; must be UDP or TCP; TCP if unspecified" }, "resourceVersion": { @@ -5514,7 +5654,7 @@ "description": "list of references to objects providing the endpoints" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" } } @@ -5526,7 +5666,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -5573,7 +5713,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" } } @@ -5602,7 +5742,7 @@ "id": "v1beta1.Event", "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -5683,7 +5823,7 @@ "description": "time at which the client recorded the event" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" } } @@ -5695,7 +5835,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -5742,7 +5882,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" } } @@ -5868,7 +6008,7 @@ "id": "v1beta1.LimitRange", "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -5912,7 +6052,7 @@ "description": "spec defines the limits enforced" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" } } @@ -5921,15 +6061,15 @@ "id": "v1beta1.LimitRangeItem", "properties": { "max": { - "$ref": "v1beta1.ResourceList", + "type": "any", "description": "max usage constraints on this kind by resource name" }, "min": { - "$ref": "v1beta1.ResourceList", + "type": "any", "description": "min usage constraints on this kind by resource name" }, "type": { - "$ref": "v1beta1.LimitType", + "type": "string", "description": "type of resource that this limit applies to" } } @@ -5941,7 +6081,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -5988,7 +6128,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" } } @@ -6039,7 +6179,7 @@ "id": "v1beta1.Minion", "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -6075,7 +6215,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta1.Minion.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize minions; labels of a minion assigned by the scheduler must match the scheduled pod's nodeSelector" }, "namespace": { @@ -6103,7 +6243,7 @@ "description": "current status of node" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" }, "unschedulable": { @@ -6112,10 +6252,6 @@ } } }, - "v1beta1.Minion.labels": { - "id": "v1beta1.Minion.labels", - "properties": {} - }, "v1beta1.MinionList": { "id": "v1beta1.MinionList", "required": [ @@ -6123,7 +6259,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -6177,7 +6313,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" } } @@ -6207,7 +6343,7 @@ "id": "v1beta1.Namespace", "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -6235,7 +6371,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta1.Namespace.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize namespaces" }, "namespace": { @@ -6259,15 +6395,11 @@ "description": "status describes the current status of a Namespace; read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" } } }, - "v1beta1.Namespace.labels": { - "id": "v1beta1.Namespace.labels", - "properties": {} - }, "v1beta1.NamespaceList": { "id": "v1beta1.NamespaceList", "required": [ @@ -6275,7 +6407,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -6322,7 +6454,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" } } @@ -6343,7 +6475,7 @@ "id": "v1beta1.NamespaceStatus", "properties": { "phase": { - "$ref": "v1beta1.NamespacePhase", + "type": "string", "description": "phase is the current lifecycle phase of the namespace" } } @@ -6360,7 +6492,7 @@ "description": "string representation of the address" }, "type": { - "$ref": "v1beta1.NodeAddressType", + "type": "string", "description": "type of the node address, e.g. external ip, internal ip, hostname, etc" } } @@ -6373,8 +6505,8 @@ ], "properties": { "kind": { - "$ref": "v1beta1.NodeConditionKind", - "description": "kind of the condition, one of Reachable, Ready" + "type": "string", + "description": "kind of the condition, one of Reachable, Ready, Schedulable" }, "lastProbeTime": { "type": "string", @@ -6393,7 +6525,7 @@ "description": "(brief) reason for the condition's last transition" }, "status": { - "$ref": "v1beta1.ConditionStatus", + "type": "string", "description": "status of the condition, one of Full, None, Unknown" } } @@ -6402,7 +6534,7 @@ "id": "v1beta1.NodeResources", "properties": { "capacity": { - "$ref": "v1beta1.ResourceList", + "type": "any", "description": "resource capacity of a node represented as a map of resource name to quantity of resource" } } @@ -6429,7 +6561,7 @@ "description": "node identity is a set of ids/uuids to uniquely identify the node" }, "phase": { - "$ref": "v1beta1.NodePhase", + "type": "string", "description": "node phase is the current lifecycle phase of the node" } } @@ -6509,7 +6641,7 @@ "description": "specific resourceVersion to which this reference is made, if any: https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/api-conventions.md#concurrency-control-and-consistency" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "uid of the referent" } } @@ -6518,7 +6650,7 @@ "id": "v1beta1.Pod", "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -6554,7 +6686,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta1.Pod.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize pods; may match selectors of replication controllers and services" }, "namespace": { @@ -6562,7 +6694,7 @@ "description": "namespace to which the object belongs; must be a DNS_SUBDOMAIN; 'default' by default; cannot be updated" }, "nodeSelector": { - "$ref": "v1beta1.Pod.nodeSelector", + "type": "any", "description": "selector which must match a node's labels for the pod to be scheduled on that node" }, "resourceVersion": { @@ -6574,19 +6706,11 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" } } }, - "v1beta1.Pod.labels": { - "id": "v1beta1.Pod.labels", - "properties": {} - }, - "v1beta1.Pod.nodeSelector": { - "id": "v1beta1.Pod.nodeSelector", - "properties": {} - }, "v1beta1.PodCondition": { "id": "v1beta1.PodCondition", "required": [ @@ -6595,11 +6719,11 @@ ], "properties": { "kind": { - "$ref": "v1beta1.PodConditionKind", + "type": "string", "description": "kind of the condition, currently only Ready" }, "status": { - "$ref": "v1beta1.ConditionStatus", + "type": "string", "description": "status of the condition, one of Full, None, Unknown" } } @@ -6611,7 +6735,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -6658,7 +6782,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" } } @@ -6682,7 +6806,7 @@ "description": "IP address of the host to which the pod is assigned; empty if not yet scheduled" }, "info": { - "$ref": "v1beta1.PodInfo", + "type": "any", "description": "map of container name to container status" }, "manifest": { @@ -6698,7 +6822,7 @@ "description": "IP address allocated to the pod; routable at least within the cluster; empty if not yet allocated" }, "status": { - "$ref": "v1beta1.PodStatus", + "type": "string", "description": "current condition of the pod, Waiting, Running, or Terminated" } } @@ -6707,7 +6831,7 @@ "id": "v1beta1.PodTemplate", "properties": { "annotations": { - "$ref": "v1beta1.PodTemplate.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about pods created from the template" }, "desiredState": { @@ -6715,32 +6839,20 @@ "description": "specification of the desired state of pods created from this template" }, "labels": { - "$ref": "v1beta1.PodTemplate.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize the pods created from the template; must match the selector of the replication controller to which the template belongs; may match selectors of services" }, "nodeSelector": { - "$ref": "v1beta1.PodTemplate.nodeSelector", + "type": "any", "description": "a selector which must be true for the pod to fit on a node" } } }, - "v1beta1.PodTemplate.annotations": { - "id": "v1beta1.PodTemplate.annotations", - "properties": {} - }, - "v1beta1.PodTemplate.labels": { - "id": "v1beta1.PodTemplate.labels", - "properties": {} - }, - "v1beta1.PodTemplate.nodeSelector": { - "id": "v1beta1.PodTemplate.nodeSelector", - "properties": {} - }, "v1beta1.ReplicationController": { "id": "v1beta1.ReplicationController", "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -6776,7 +6888,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta1.ReplicationController.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize replication controllers" }, "namespace": { @@ -6792,15 +6904,11 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" } } }, - "v1beta1.ReplicationController.labels": { - "id": "v1beta1.ReplicationController.labels", - "properties": {} - }, "v1beta1.ReplicationControllerList": { "id": "v1beta1.ReplicationControllerList", "required": [ @@ -6808,7 +6916,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -6855,7 +6963,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" } } @@ -6871,7 +6979,7 @@ "description": "template for pods to be created by this replication controller when the observed number of replicas is less than the desired number of replicas" }, "replicaSelector": { - "$ref": "v1beta1.ReplicationControllerState.replicaSelector", + "type": "any", "description": "label keys and values that must match in order to be controlled by this replication controller" }, "replicas": { @@ -6881,15 +6989,11 @@ } } }, - "v1beta1.ReplicationControllerState.replicaSelector": { - "id": "v1beta1.ReplicationControllerState.replicaSelector", - "properties": {} - }, "v1beta1.ResourceQuota": { "id": "v1beta1.ResourceQuota", "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -6917,7 +7021,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta1.ResourceQuota.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize resource quotas" }, "namespace": { @@ -6941,15 +7045,11 @@ "description": "status defines the actual enforced quota and current usage" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" } } }, - "v1beta1.ResourceQuota.labels": { - "id": "v1beta1.ResourceQuota.labels", - "properties": {} - }, "v1beta1.ResourceQuotaList": { "id": "v1beta1.ResourceQuotaList", "required": [ @@ -6957,7 +7057,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -7004,7 +7104,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" } } @@ -7013,7 +7113,7 @@ "id": "v1beta1.ResourceQuotaSpec", "properties": { "hard": { - "$ref": "v1beta1.ResourceList", + "type": "any", "description": "hard is the set of desired hard limits for each named resource" } } @@ -7022,11 +7122,11 @@ "id": "v1beta1.ResourceQuotaStatus", "properties": { "hard": { - "$ref": "v1beta1.ResourceList", + "type": "any", "description": "hard is the set of enforced hard limits for each named resource" }, "used": { - "$ref": "v1beta1.ResourceList", + "type": "any", "description": "used is the current observed total usage of the resource in the namespace" } } @@ -7035,11 +7135,11 @@ "id": "v1beta1.ResourceRequirements", "properties": { "limits": { - "$ref": "v1beta1.ResourceList", + "type": "any", "description": "Maximum amount of compute resources allowed" }, "requests": { - "$ref": "v1beta1.ResourceList", + "type": "any", "description": "Minimum amount of resources requested" } } @@ -7077,7 +7177,7 @@ "id": "v1beta1.Secret", "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -7089,7 +7189,7 @@ "description": "RFC 3339 date and time at which the object was created; populated by the system, read-only; null for lists" }, "data": { - "$ref": "v1beta1.Secret.data", + "type": "any", "description": "data contains the secret data. Each key must be a valid DNS_SUBDOMAIN. Each value must be a base64 encoded string" }, "deletionTimestamp": { @@ -7121,19 +7221,15 @@ "description": "URL for the object; populated by the system, read-only" }, "type": { - "$ref": "v1beta1.SecretType", + "type": "string", "description": "type facilitates programmatic handling of secret data" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" } } }, - "v1beta1.Secret.data": { - "id": "v1beta1.Secret.data", - "properties": {} - }, "v1beta1.SecretList": { "id": "v1beta1.SecretList", "required": [ @@ -7141,7 +7237,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -7188,7 +7284,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" } } @@ -7214,7 +7310,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -7250,7 +7346,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta1.Service.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize services" }, "namespace": { @@ -7275,10 +7371,10 @@ "items": { "$ref": "v1beta1.ServicePort" }, - "description": "ports to be exposed on the service" + "description": "ports to be exposed on the service; if this field is specified, the legacy fields (Port, PortName, Protocol, and ContainerPort) will be overwritten by the first member of this array; if this field is not specified, it will be populated from the legacy fields" }, "protocol": { - "$ref": "v1beta1.Protocol", + "type": "string", "description": "protocol for port; must be UDP or TCP; TCP if unspecified" }, "proxyPort": { @@ -7298,7 +7394,7 @@ "description": "string that identifies the internal version of this object that can be used by clients to determine when objects have changed; populated by the system, read-only; value must be treated as opaque by clients and passed unmodified back to the server: https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/api-conventions.md#concurrency-control-and-consistency" }, "selector": { - "$ref": "v1beta1.Service.selector", + "type": "any", "description": "label keys and values that must match in order to receive traffic for this service; if empty, all pods are selected, if not specified, endpoints must be manually specified" }, "selfLink": { @@ -7306,23 +7402,15 @@ "description": "URL for the object; populated by the system, read-only" }, "sessionAffinity": { - "$ref": "v1beta1.AffinityType", + "type": "string", "description": "enable client IP based session affinity; must be ClientIP or None; defaults to None" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" } } }, - "v1beta1.Service.labels": { - "id": "v1beta1.Service.labels", - "properties": {} - }, - "v1beta1.Service.selector": { - "id": "v1beta1.Service.selector", - "properties": {} - }, "v1beta1.ServiceList": { "id": "v1beta1.ServiceList", "required": [ @@ -7330,7 +7418,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta1.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -7377,7 +7465,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" } } @@ -7405,7 +7493,7 @@ "description": "the port number that is exposed" }, "protocol": { - "$ref": "v1beta1.Protocol", + "type": "string", "description": "the protocol used by this port; must be UDP or TCP; TCP if unspecified" } } diff --git a/api/swagger-spec/v1beta2.json b/api/swagger-spec/v1beta2.json index 65ca9aad1bb..94f476cec0c 100644 --- a/api/swagger-spec/v1beta2.json +++ b/api/swagger-spec/v1beta2.json @@ -83,7 +83,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -173,7 +173,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -391,7 +391,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -451,7 +451,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -541,7 +541,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -751,7 +751,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -811,7 +811,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -901,7 +901,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1111,7 +1111,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1163,7 +1163,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1237,7 +1237,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1415,7 +1415,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1477,6 +1477,14 @@ "description": "name of the Node", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -1499,6 +1507,14 @@ "description": "name of the Node", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -1521,6 +1537,14 @@ "description": "name of the Node", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -1543,6 +1567,14 @@ "description": "name of the Node", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -1683,7 +1715,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1757,7 +1789,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1935,7 +1967,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -2059,7 +2091,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -2133,7 +2165,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -2311,7 +2343,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -2373,6 +2405,14 @@ "description": "name of the Node", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -2395,6 +2435,14 @@ "description": "name of the Node", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -2417,6 +2465,14 @@ "description": "name of the Node", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -2439,6 +2495,14 @@ "description": "name of the Node", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -2587,7 +2651,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -2677,7 +2741,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -2895,7 +2959,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -2966,6 +3030,14 @@ "required": true, "allowMultiple": false }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false + }, { "type": "string", "paramType": "query", @@ -2996,6 +3068,14 @@ "required": true, "allowMultiple": false }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false + }, { "type": "string", "paramType": "query", @@ -3026,6 +3106,14 @@ "required": true, "allowMultiple": false }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false + }, { "type": "string", "paramType": "query", @@ -3056,6 +3144,14 @@ "required": true, "allowMultiple": false }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false + }, { "type": "string", "paramType": "query", @@ -3323,7 +3419,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -3413,7 +3509,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -3631,7 +3727,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -3691,7 +3787,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -3781,7 +3877,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -3999,7 +4095,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4103,7 +4199,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4193,7 +4289,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4403,7 +4499,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4463,7 +4559,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4553,7 +4649,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4763,7 +4859,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4834,6 +4930,14 @@ "required": true, "allowMultiple": false }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false + }, { "type": "string", "paramType": "query", @@ -4864,6 +4968,14 @@ "required": true, "allowMultiple": false }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false + }, { "type": "string", "paramType": "query", @@ -4894,6 +5006,14 @@ "required": true, "allowMultiple": false }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false + }, { "type": "string", "paramType": "query", @@ -4924,6 +5044,14 @@ "required": true, "allowMultiple": false }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false + }, { "type": "string", "paramType": "query", @@ -5078,6 +5206,10 @@ "id": "*v1beta2.DeleteOptions", "properties": {} }, + "uint64": { + "id": "", + "properties": null + }, "v1beta2.Binding": { "id": "v1beta2.Binding", "required": [ @@ -5086,7 +5218,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -5134,7 +5266,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" } } @@ -5167,6 +5299,7 @@ "required": [ "name", "image", + "entrypoint:omitempty", "imagePullPolicy" ], "properties": { @@ -5179,13 +5312,20 @@ "items": { "type": "string" }, - "description": "command argv array; not executed within a shell; defaults to entrypoint or command in the image; cannot be updated" + "description": "command argv array; not executed within a shell; the image's cmd is used if this is not provided; cannot be updated" }, "cpu": { "type": "integer", "format": "int32", "description": "CPU share in thousandths of a core; cannot be updated" }, + "entrypoint:omitempty": { + "type": "array", + "items": { + "type": "string" + }, + "description": "entrypoint array; not executed within a shell; the image's entrypoint is used if this is not provided; cannot be updated" + }, "env": { "type": "array", "items": { @@ -5198,7 +5338,7 @@ "description": "Docker image name" }, "imagePullPolicy": { - "$ref": "v1beta2.PullPolicy", + "type": "string", "description": "image pull policy; one of PullAlways, PullNever, PullIfNotPresent; defaults to PullAlways if :latest tag is specified, or PullIfNotPresent otherwise; cannot be updated" }, "lifecycle": { @@ -5271,7 +5411,7 @@ "description": "list of containers belonging to the pod; cannot be updated; containers cannot currently be added or removed" }, "dnsPolicy": { - "$ref": "v1beta2.DNSPolicy", + "type": "string", "description": "DNS policy for containers within the pod; one of 'ClusterFirst' or 'Default'" }, "hostNetwork": { @@ -5287,7 +5427,7 @@ "description": "restart policy for all containers within the pod; one of RestartPolicyAlways, RestartPolicyOnFailure, RestartPolicyNever" }, "uuid": { - "$ref": "types.UID", + "type": "string", "description": "manifest UUID; cannot be updated" }, "version": { @@ -5328,7 +5468,7 @@ "description": "name for the port that can be referred to by services; must be a DNS_LABEL and unique without the pod" }, "protocol": { - "$ref": "v1beta2.Protocol", + "type": "string", "description": "protocol for port; must be UDP or TCP; TCP if unspecified" } } @@ -5340,7 +5480,7 @@ ], "properties": { "medium": { - "$ref": "v1beta2.StorageType", + "type": "string", "description": "type of storage used to back the volume; must be an empty string (default) or Memory" } } @@ -5396,7 +5536,7 @@ "description": "specific resourceVersion to which this reference is made, if any: https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/api-conventions.md#concurrency-control-and-consistency" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "uid of the referent" } } @@ -5417,7 +5557,7 @@ "description": "port number of the endpoint" }, "protocol": { - "$ref": "v1beta2.Protocol", + "type": "string", "description": "protocol for this port; must be UDP or TCP; TCP if unspecified" } } @@ -5449,7 +5589,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -5488,7 +5628,7 @@ "description": "namespace to which the object belongs; must be a DNS_SUBDOMAIN; 'default' by default; cannot be updated" }, "protocol": { - "$ref": "v1beta2.Protocol", + "type": "string", "description": "IP protocol for the first set of endpoint ports; must be UDP or TCP; TCP if unspecified" }, "resourceVersion": { @@ -5514,7 +5654,7 @@ "description": "list of references to objects providing the endpoints" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" } } @@ -5526,7 +5666,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -5573,7 +5713,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" } } @@ -5598,7 +5738,7 @@ "id": "v1beta2.Event", "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -5679,7 +5819,7 @@ "description": "time at which the client recorded the event" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" } } @@ -5691,7 +5831,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -5738,7 +5878,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" } } @@ -5864,7 +6004,7 @@ "id": "v1beta2.LimitRange", "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -5908,7 +6048,7 @@ "description": "spec defines the limits enforced" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" } } @@ -5917,15 +6057,15 @@ "id": "v1beta2.LimitRangeItem", "properties": { "max": { - "$ref": "v1beta2.ResourceList", + "type": "any", "description": "max usage constraints on this kind by resource name" }, "min": { - "$ref": "v1beta2.ResourceList", + "type": "any", "description": "min usage constraints on this kind by resource name" }, "type": { - "$ref": "v1beta2.LimitType", + "type": "string", "description": "type of resource that this limit applies to" } } @@ -5937,7 +6077,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -5984,7 +6124,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" } } @@ -6035,7 +6175,7 @@ "id": "v1beta2.Minion", "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -6071,7 +6211,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta2.Minion.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize minions; labels of a minion assigned by the scheduler must match the scheduled pod's nodeSelector" }, "namespace": { @@ -6099,7 +6239,7 @@ "description": "current status of node" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" }, "unschedulable": { @@ -6108,10 +6248,6 @@ } } }, - "v1beta2.Minion.labels": { - "id": "v1beta2.Minion.labels", - "properties": {} - }, "v1beta2.MinionList": { "id": "v1beta2.MinionList", "required": [ @@ -6119,7 +6255,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -6166,7 +6302,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" } } @@ -6196,7 +6332,7 @@ "id": "v1beta2.Namespace", "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -6224,7 +6360,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta2.Namespace.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize namespaces" }, "namespace": { @@ -6248,15 +6384,11 @@ "description": "status describes the current status of a Namespace; read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" } } }, - "v1beta2.Namespace.labels": { - "id": "v1beta2.Namespace.labels", - "properties": {} - }, "v1beta2.NamespaceList": { "id": "v1beta2.NamespaceList", "required": [ @@ -6264,7 +6396,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -6311,7 +6443,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" } } @@ -6332,7 +6464,7 @@ "id": "v1beta2.NamespaceStatus", "properties": { "phase": { - "$ref": "v1beta2.NamespacePhase", + "type": "string", "description": "phase is the current lifecycle phase of the namespace" } } @@ -6349,7 +6481,7 @@ "description": "string representation of the address" }, "type": { - "$ref": "v1beta2.NodeAddressType", + "type": "string", "description": "type of the node address, e.g. external ip, internal ip, hostname, etc" } } @@ -6362,8 +6494,8 @@ ], "properties": { "kind": { - "$ref": "v1beta2.NodeConditionKind", - "description": "kind of the condition, one of Reachable, Ready" + "type": "string", + "description": "kind of the condition, one of Reachable, Ready, Schedulable" }, "lastProbeTime": { "type": "string", @@ -6382,7 +6514,7 @@ "description": "(brief) reason for the condition's last transition" }, "status": { - "$ref": "v1beta2.ConditionStatus", + "type": "string", "description": "status of the condition, one of Full, None, Unknown" } } @@ -6391,7 +6523,7 @@ "id": "v1beta2.NodeResources", "properties": { "capacity": { - "$ref": "v1beta2.ResourceList", + "type": "any", "description": "resource capacity of a node represented as a map of resource name to quantity of resource" } } @@ -6418,7 +6550,7 @@ "description": "node identity is a set of ids/uuids to uniquely identify the node" }, "phase": { - "$ref": "v1beta2.NodePhase", + "type": "string", "description": "node phase is the current lifecycle phase of the node" } } @@ -6498,7 +6630,7 @@ "description": "specific resourceVersion to which this reference is made, if any: https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/api-conventions.md#concurrency-control-and-consistency" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "uid of the referent" } } @@ -6507,7 +6639,7 @@ "id": "v1beta2.Pod", "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -6543,7 +6675,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta2.Pod.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize pods; may match selectors of replication controllers and services" }, "namespace": { @@ -6551,7 +6683,7 @@ "description": "namespace to which the object belongs; must be a DNS_SUBDOMAIN; 'default' by default; cannot be updated" }, "nodeSelector": { - "$ref": "v1beta2.Pod.nodeSelector", + "type": "any", "description": "selector which must match a node's labels for the pod to be scheduled on that node" }, "resourceVersion": { @@ -6563,19 +6695,11 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" } } }, - "v1beta2.Pod.labels": { - "id": "v1beta2.Pod.labels", - "properties": {} - }, - "v1beta2.Pod.nodeSelector": { - "id": "v1beta2.Pod.nodeSelector", - "properties": {} - }, "v1beta2.PodCondition": { "id": "v1beta2.PodCondition", "required": [ @@ -6584,11 +6708,11 @@ ], "properties": { "kind": { - "$ref": "v1beta2.PodConditionKind", + "type": "string", "description": "kind of the condition, currently only Ready" }, "status": { - "$ref": "v1beta2.ConditionStatus", + "type": "string", "description": "status of the condition, one of Full, None, Unknown" } } @@ -6600,7 +6724,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -6647,7 +6771,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" } } @@ -6671,7 +6795,7 @@ "description": "IP address of the host to which the pod is assigned; empty if not yet scheduled" }, "info": { - "$ref": "v1beta2.PodInfo", + "type": "any", "description": "map of container name to container status" }, "manifest": { @@ -6687,7 +6811,7 @@ "description": "IP address allocated to the pod; routable at least within the cluster; empty if not yet allocated" }, "status": { - "$ref": "v1beta2.PodStatus", + "type": "string", "description": "current condition of the pod, Waiting, Running, or Terminated" } } @@ -6696,7 +6820,7 @@ "id": "v1beta2.PodTemplate", "properties": { "annotations": { - "$ref": "v1beta2.PodTemplate.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about pods created from the template" }, "desiredState": { @@ -6704,32 +6828,20 @@ "description": "specification of the desired state of pods created from this template" }, "labels": { - "$ref": "v1beta2.PodTemplate.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize the pods created from the template; must match the selector of the replication controller to which the template belongs; may match selectors of services" }, "nodeSelector": { - "$ref": "v1beta2.PodTemplate.nodeSelector", + "type": "any", "description": "a selector which must be true for the pod to fit on a node" } } }, - "v1beta2.PodTemplate.annotations": { - "id": "v1beta2.PodTemplate.annotations", - "properties": {} - }, - "v1beta2.PodTemplate.labels": { - "id": "v1beta2.PodTemplate.labels", - "properties": {} - }, - "v1beta2.PodTemplate.nodeSelector": { - "id": "v1beta2.PodTemplate.nodeSelector", - "properties": {} - }, "v1beta2.ReplicationController": { "id": "v1beta2.ReplicationController", "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -6765,7 +6877,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta2.ReplicationController.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize replication controllers" }, "namespace": { @@ -6781,15 +6893,11 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" } } }, - "v1beta2.ReplicationController.labels": { - "id": "v1beta2.ReplicationController.labels", - "properties": {} - }, "v1beta2.ReplicationControllerList": { "id": "v1beta2.ReplicationControllerList", "required": [ @@ -6797,7 +6905,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -6844,7 +6952,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" } } @@ -6860,7 +6968,7 @@ "description": "template for pods to be created by this replication controller when the observed number of replicas is less than the desired number of replicas" }, "replicaSelector": { - "$ref": "v1beta2.ReplicationControllerState.replicaSelector", + "type": "any", "description": "label keys and values that must match in order to be controlled by this replication controller" }, "replicas": { @@ -6870,15 +6978,11 @@ } } }, - "v1beta2.ReplicationControllerState.replicaSelector": { - "id": "v1beta2.ReplicationControllerState.replicaSelector", - "properties": {} - }, "v1beta2.ResourceQuota": { "id": "v1beta2.ResourceQuota", "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -6906,7 +7010,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta2.ResourceQuota.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize resource quotas" }, "namespace": { @@ -6930,15 +7034,11 @@ "description": "status defines the actual enforced quota and current usage" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" } } }, - "v1beta2.ResourceQuota.labels": { - "id": "v1beta2.ResourceQuota.labels", - "properties": {} - }, "v1beta2.ResourceQuotaList": { "id": "v1beta2.ResourceQuotaList", "required": [ @@ -6946,7 +7046,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -6993,7 +7093,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" } } @@ -7002,7 +7102,7 @@ "id": "v1beta2.ResourceQuotaSpec", "properties": { "hard": { - "$ref": "v1beta2.ResourceList", + "type": "any", "description": "hard is the set of desired hard limits for each named resource" } } @@ -7011,11 +7111,11 @@ "id": "v1beta2.ResourceQuotaStatus", "properties": { "hard": { - "$ref": "v1beta2.ResourceList", + "type": "any", "description": "hard is the set of enforced hard limits for each named resource" }, "used": { - "$ref": "v1beta2.ResourceList", + "type": "any", "description": "used is the current observed total usage of the resource in the namespace" } } @@ -7024,11 +7124,11 @@ "id": "v1beta2.ResourceRequirements", "properties": { "limits": { - "$ref": "v1beta2.ResourceList", + "type": "any", "description": "Maximum amount of compute resources allowed" }, "requests": { - "$ref": "v1beta2.ResourceList", + "type": "any", "description": "Minimum amount of resources requested" } } @@ -7066,7 +7166,7 @@ "id": "v1beta2.Secret", "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -7078,7 +7178,7 @@ "description": "RFC 3339 date and time at which the object was created; populated by the system, read-only; null for lists" }, "data": { - "$ref": "v1beta2.Secret.data", + "type": "any", "description": "data contains the secret data. Each key must be a valid DNS_SUBDOMAIN. Each value must be a base64 encoded string" }, "deletionTimestamp": { @@ -7110,19 +7210,15 @@ "description": "URL for the object; populated by the system, read-only" }, "type": { - "$ref": "v1beta2.SecretType", + "type": "string", "description": "type facilitates programmatic handling of secret data" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" } } }, - "v1beta2.Secret.data": { - "id": "v1beta2.Secret.data", - "properties": {} - }, "v1beta2.SecretList": { "id": "v1beta2.SecretList", "required": [ @@ -7130,7 +7226,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -7177,7 +7273,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" } } @@ -7203,7 +7299,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -7239,7 +7335,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta2.Service.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize services" }, "namespace": { @@ -7264,10 +7360,10 @@ "items": { "$ref": "v1beta2.ServicePort" }, - "description": "ports to be exposed on the service" + "description": "ports to be exposed on the service; if this field is specified, the legacy fields (Port, PortName, Protocol, and ContainerPort) will be overwritten by the first member of this array; if this field is not specified, it will be populated from the legacy fields" }, "protocol": { - "$ref": "v1beta2.Protocol", + "type": "string", "description": "protocol for port; must be UDP or TCP; TCP if unspecified" }, "proxyPort": { @@ -7287,7 +7383,7 @@ "description": "string that identifies the internal version of this object that can be used by clients to determine when objects have changed; populated by the system, read-only; value must be treated as opaque by clients and passed unmodified back to the server: https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/api-conventions.md#concurrency-control-and-consistency" }, "selector": { - "$ref": "v1beta2.Service.selector", + "type": "any", "description": "label keys and values that must match in order to receive traffic for this service; if empty, all pods are selected, if not specified, endpoints must be manually specified" }, "selfLink": { @@ -7295,23 +7391,15 @@ "description": "URL for the object; populated by the system, read-only" }, "sessionAffinity": { - "$ref": "v1beta2.AffinityType", + "type": "string", "description": "enable client IP based session affinity; must be ClientIP or None; defaults to None" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" } } }, - "v1beta2.Service.labels": { - "id": "v1beta2.Service.labels", - "properties": {} - }, - "v1beta2.Service.selector": { - "id": "v1beta2.Service.selector", - "properties": {} - }, "v1beta2.ServiceList": { "id": "v1beta2.ServiceList", "required": [ @@ -7319,7 +7407,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta2.TypeMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about the object" }, "apiVersion": { @@ -7366,7 +7454,7 @@ "description": "URL for the object; populated by the system, read-only" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system, read-only" } } @@ -7394,7 +7482,7 @@ "description": "the port number that is exposed" }, "protocol": { - "$ref": "v1beta2.Protocol", + "type": "string", "description": "the protocol used by this port; must be UDP or TCP; TCP if unspecified" } } diff --git a/api/swagger-spec/v1beta3.json b/api/swagger-spec/v1beta3.json index 32151078bed..955118d8ea8 100644 --- a/api/swagger-spec/v1beta3.json +++ b/api/swagger-spec/v1beta3.json @@ -83,7 +83,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -173,7 +173,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -391,7 +391,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -443,7 +443,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -495,7 +495,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -555,7 +555,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -645,7 +645,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -855,7 +855,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -907,7 +907,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -959,7 +959,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1019,7 +1019,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1109,7 +1109,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1319,7 +1319,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1371,7 +1371,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1423,7 +1423,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1475,7 +1475,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1549,7 +1549,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1727,7 +1727,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1851,7 +1851,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -1925,7 +1925,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -2103,7 +2103,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -2165,6 +2165,14 @@ "description": "name of the Node", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -2187,6 +2195,14 @@ "description": "name of the Node", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -2209,6 +2225,14 @@ "description": "name of the Node", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -2231,6 +2255,14 @@ "description": "name of the Node", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -2379,7 +2411,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -2469,7 +2501,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -2687,7 +2719,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -2765,6 +2797,14 @@ "description": "object name and auth scope, such as for teams and projects", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -2795,6 +2835,14 @@ "description": "object name and auth scope, such as for teams and projects", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -2825,6 +2873,14 @@ "description": "object name and auth scope, such as for teams and projects", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -2855,6 +2911,14 @@ "description": "object name and auth scope, such as for teams and projects", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -3027,7 +3091,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -3079,7 +3143,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -3106,6 +3170,14 @@ "summary": "create a Binding", "nickname": "createBinding", "parameters": [ + { + "type": "string", + "paramType": "path", + "name": "name", + "description": "name of the Binding", + "required": true, + "allowMultiple": false + }, { "type": "string", "paramType": "path", @@ -3219,7 +3291,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -3309,7 +3381,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -3527,7 +3599,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -3579,7 +3651,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -3631,7 +3703,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -3691,7 +3763,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -3781,7 +3853,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -3999,7 +4071,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4051,7 +4123,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4103,7 +4175,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4207,7 +4279,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4297,7 +4369,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4507,7 +4579,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4559,7 +4631,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4611,7 +4683,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4671,7 +4743,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4761,7 +4833,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -4971,7 +5043,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -5049,6 +5121,14 @@ "description": "object name and auth scope, such as for teams and projects", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -5079,6 +5159,14 @@ "description": "object name and auth scope, such as for teams and projects", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -5109,6 +5197,14 @@ "description": "object name and auth scope, such as for teams and projects", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -5139,6 +5235,14 @@ "description": "object name and auth scope, such as for teams and projects", "required": true, "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "path:*", + "description": "path to the resource", + "required": true, + "allowMultiple": false } ], "produces": [ @@ -5311,7 +5415,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -5363,7 +5467,7 @@ "allowMultiple": false }, { - "type": "bool", + "type": "boolean", "paramType": "query", "name": "watch", "description": "watch for changes to the described resources and return them as a stream of add, update, and remove notifications; specify resourceVersion", @@ -5397,7 +5501,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta3.ObjectMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about objects" }, "apiVersion": { @@ -5421,7 +5525,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta3.ObjectMeta.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize objects; may match selectors of replication controllers and services" }, "name": { @@ -5445,7 +5549,7 @@ "description": "an object to bind to" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system; read-only" } } @@ -5481,6 +5585,13 @@ "imagePullPolicy" ], "properties": { + "args": { + "type": "array", + "items": { + "type": "string" + }, + "description": "command array; the docker image's cmd is used if this is not provided; arguments to the entrypoint; cannot be updated" + }, "capabilities": { "$ref": "v1beta3.Capabilities", "description": "capabilities for container; cannot be updated" @@ -5490,7 +5601,7 @@ "items": { "type": "string" }, - "description": "command argv array; not executed within a shell; defaults to entrypoint or command in the image; cannot be updated" + "description": "entrypoint array; not executed within a shell; the docker image's entrypoint is used if this is not provided; cannot be updated" }, "env": { "type": "array", @@ -5504,7 +5615,7 @@ "description": "Docker image name" }, "imagePullPolicy": { - "$ref": "v1beta3.PullPolicy", + "type": "string", "description": "image pull policy; one of PullAlways, PullNever, PullIfNotPresent; defaults to PullAlways if :latest tag is specified, or PullIfNotPresent otherwise; cannot be updated" }, "lifecycle": { @@ -5580,7 +5691,7 @@ "description": "name for the port that can be referred to by services; must be a DNS_LABEL and unique without the pod" }, "protocol": { - "$ref": "v1beta3.Protocol", + "type": "string", "description": "protocol for port; must be UDP or TCP; TCP if unspecified" } } @@ -5703,6 +5814,18 @@ } } }, + "v1beta3.EmptyDirVolumeSource": { + "id": "v1beta3.EmptyDirVolumeSource", + "required": [ + "medium" + ], + "properties": { + "medium": { + "type": "string", + "description": "type of storage used to back the volume; must be an empty string (default) or Memory" + } + } + }, "v1beta3.EndpointAddress": { "id": "v1beta3.EndpointAddress", "required": [ @@ -5735,7 +5858,7 @@ "description": "port number of the endpoint" }, "protocol": { - "$ref": "v1beta3.Protocol", + "type": "string", "description": "protocol for this port; must be UDP or TCP; TCP if unspecified" } } @@ -5766,7 +5889,7 @@ ], "properties": { "annotations": { - "$ref": "v1beta3.ObjectMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about objects" }, "apiVersion": { @@ -5790,7 +5913,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta3.ObjectMeta.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize objects; may match selectors of replication controllers and services" }, "name": { @@ -5817,7 +5940,7 @@ "description": "sets of addresses and ports that comprise a service" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system; read-only" } } @@ -5873,7 +5996,7 @@ "id": "v1beta3.Event", "properties": { "annotations": { - "$ref": "v1beta3.ObjectMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about objects" }, "apiVersion": { @@ -5910,7 +6033,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta3.ObjectMeta.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize objects; may match selectors of replication controllers and services" }, "lastTimestamp": { @@ -5946,7 +6069,7 @@ "description": "component reporting this event" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system; read-only" } } @@ -6011,6 +6134,48 @@ "id": "v1beta3.FinalizerName", "properties": {} }, + "v1beta3.GCEPersistentDiskVolumeSource": { + "id": "v1beta3.GCEPersistentDiskVolumeSource", + "required": [ + "pdName" + ], + "properties": { + "fsType": { + "type": "string", + "description": "file system type to mount, such as ext4, xfs, ntfs" + }, + "partition": { + "type": "integer", + "format": "int32", + "description": "partition on the disk to mount (e.g., '1' for /dev/sda1); if omitted the plain device name (e.g., /dev/sda) will be mounted" + }, + "pdName": { + "type": "string", + "description": "unique name of the PD resource in GCE" + }, + "readOnly": { + "type": "boolean", + "description": "read-only if true, read-write otherwise (false or unspecified)" + } + } + }, + "v1beta3.GitRepoVolumeSource": { + "id": "v1beta3.GitRepoVolumeSource", + "required": [ + "repository", + "revision" + ], + "properties": { + "repository": { + "type": "string", + "description": "repository URL" + }, + "revision": { + "type": "string", + "description": "commit hash for the specified revision" + } + } + }, "v1beta3.HTTPGetAction": { "id": "v1beta3.HTTPGetAction", "properties": { @@ -6045,6 +6210,18 @@ } } }, + "v1beta3.HostPathVolumeSource": { + "id": "v1beta3.HostPathVolumeSource", + "required": [ + "path" + ], + "properties": { + "path": { + "type": "string", + "description": "path of the directory on the host" + } + } + }, "v1beta3.Lifecycle": { "id": "v1beta3.Lifecycle", "properties": { @@ -6062,7 +6239,7 @@ "id": "v1beta3.LimitRange", "properties": { "annotations": { - "$ref": "v1beta3.ObjectMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about objects" }, "apiVersion": { @@ -6086,7 +6263,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta3.ObjectMeta.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize objects; may match selectors of replication controllers and services" }, "name": { @@ -6110,7 +6287,7 @@ "description": "spec defines the limits enforced; https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/api-conventions.md#spec-and-status" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system; read-only" } } @@ -6119,15 +6296,15 @@ "id": "v1beta3.LimitRangeItem", "properties": { "max": { - "$ref": "v1beta3.ResourceList", + "type": "any", "description": "max usage constraints on this kind by resource name" }, "min": { - "$ref": "v1beta3.ResourceList", + "type": "any", "description": "min usage constraints on this kind by resource name" }, "type": { - "$ref": "v1beta3.LimitType", + "type": "string", "description": "type of resource that this limit applies to" } } @@ -6178,11 +6355,32 @@ } } }, + "v1beta3.NFSVolumeSource": { + "id": "v1beta3.NFSVolumeSource", + "required": [ + "server", + "path" + ], + "properties": { + "path": { + "type": "string", + "description": "the path that is exported by the NFS server" + }, + "readOnly": { + "type": "boolean", + "description": "forces the NFS export to be mounted with read-only permissions" + }, + "server": { + "type": "string", + "description": "the hostname or IP address of the NFS server" + } + } + }, "v1beta3.Namespace": { "id": "v1beta3.Namespace", "properties": { "annotations": { - "$ref": "v1beta3.ObjectMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about objects" }, "apiVersion": { @@ -6206,7 +6404,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta3.ObjectMeta.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize objects; may match selectors of replication controllers and services" }, "name": { @@ -6234,7 +6432,7 @@ "description": "status describes the current status of a Namespace; https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/api-conventions.md#spec-and-status" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system; read-only" } } @@ -6286,7 +6484,7 @@ "id": "v1beta3.NamespaceStatus", "properties": { "phase": { - "$ref": "v1beta3.NamespacePhase", + "type": "string", "description": "phase is the current lifecycle phase of the namespace" } } @@ -6295,7 +6493,7 @@ "id": "v1beta3.Node", "properties": { "annotations": { - "$ref": "v1beta3.ObjectMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about objects" }, "apiVersion": { @@ -6319,7 +6517,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta3.ObjectMeta.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize objects; may match selectors of replication controllers and services" }, "name": { @@ -6347,7 +6545,7 @@ "description": "most recently observed status of the node; populated by the system, read-only; https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/api-conventions.md#spec-and-status" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system; read-only" } } @@ -6363,7 +6561,7 @@ "type": "string" }, "type": { - "$ref": "v1beta3.NodeAddressType" + "type": "string" } } }, @@ -6391,12 +6589,12 @@ "description": "(brief) reason for the condition's last transition" }, "status": { - "$ref": "v1beta3.ConditionStatus", + "type": "string", "description": "status of the condition, one of Full, None, Unknown" }, "type": { - "$ref": "v1beta3.NodeConditionType", - "description": "type of node condition, one of Reachable, Ready" + "type": "string", + "description": "type of node condition, one of Ready, Schedulable" } } }, @@ -6459,7 +6657,7 @@ "description": "list of addresses reachable to the node" }, "capacity": { - "$ref": "v1beta3.ResourceList", + "type": "any", "description": "compute resource capacity of the node; https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/resources.md" }, "conditions": { @@ -6473,7 +6671,7 @@ "$ref": "v1beta3.NodeSystemInfo" }, "phase": { - "$ref": "v1beta3.NodePhase", + "type": "string", "description": "most recently observed lifecycle phase of the node" } } @@ -6551,7 +6749,7 @@ "description": "specific resourceVersion to which this reference is made, if any: https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/api-conventions.md#concurrency-control-and-consistency" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "uid of the referent" } } @@ -6560,7 +6758,7 @@ "id": "v1beta3.Pod", "properties": { "annotations": { - "$ref": "v1beta3.ObjectMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about objects" }, "apiVersion": { @@ -6584,7 +6782,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta3.ObjectMeta.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize objects; may match selectors of replication controllers and services" }, "name": { @@ -6612,7 +6810,7 @@ "description": "most recently observed status of the pod; populated by the system, read-only; https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/api-conventions.md#spec-and-status" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system; read-only" } } @@ -6625,11 +6823,11 @@ ], "properties": { "status": { - "$ref": "v1beta3.ConditionStatus", + "type": "string", "description": "status of the condition, one of Full, None, Unknown" }, "type": { - "$ref": "v1beta3.PodConditionType", + "type": "string", "description": "kind of the condition" } } @@ -6680,7 +6878,7 @@ "description": "list of containers belonging to the pod; cannot be updated; containers cannot currently be added or removed; there must be at least one container in a Pod" }, "dnsPolicy": { - "$ref": "v1beta3.DNSPolicy", + "type": "string", "description": "DNS policy for containers within the pod; one of 'ClusterFirst' or 'Default'" }, "host": { @@ -6692,11 +6890,11 @@ "description": "host networking requested for this pod" }, "nodeSelector": { - "$ref": "v1beta3.PodSpec.nodeSelector", + "type": "any", "description": "selector which must match a node's labels for the pod to be scheduled on that node" }, "restartPolicy": { - "$ref": "v1beta3.RestartPolicy", + "type": "string", "description": "restart policy for all containers within the pod; one of RestartPolicyAlways, RestartPolicyOnFailure, RestartPolicyNever" }, "volumes": { @@ -6708,10 +6906,6 @@ } } }, - "v1beta3.PodSpec.nodeSelector": { - "id": "v1beta3.PodSpec.nodeSelector", - "properties": {} - }, "v1beta3.PodStatus": { "id": "v1beta3.PodStatus", "properties": { @@ -6742,7 +6936,7 @@ "description": "human readable message indicating details about why the pod is in this condition" }, "phase": { - "$ref": "v1beta3.PodPhase", + "type": "string", "description": "current condition of the pod." }, "podIP": { @@ -6755,7 +6949,7 @@ "id": "v1beta3.PodTemplateSpec", "properties": { "annotations": { - "$ref": "v1beta3.ObjectMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about objects" }, "creationTimestamp": { @@ -6771,7 +6965,7 @@ "description": "an optional prefix to use to generate a unique name; has the same validation rules as name; optional, and is applied only name if is not specified" }, "labels": { - "$ref": "v1beta3.ObjectMeta.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize objects; may match selectors of replication controllers and services" }, "name": { @@ -6795,7 +6989,7 @@ "description": "specification of the desired behavior of the pod; https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/api-conventions.md#spec-and-status" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system; read-only" } } @@ -6831,7 +7025,7 @@ "id": "v1beta3.ReplicationController", "properties": { "annotations": { - "$ref": "v1beta3.ObjectMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about objects" }, "apiVersion": { @@ -6855,7 +7049,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta3.ObjectMeta.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize objects; may match selectors of replication controllers and services" }, "name": { @@ -6883,7 +7077,7 @@ "description": "most recently observed status of the replication controller; populated by the system, read-only; https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/api-conventions.md#spec-and-status" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system; read-only" } } @@ -6931,7 +7125,7 @@ "description": "number of replicas desired" }, "selector": { - "$ref": "v1beta3.ReplicationControllerSpec.selector", + "type": "any", "description": "label keys and values that must match in order to be controlled by this replication controller" }, "template": { @@ -6944,10 +7138,6 @@ } } }, - "v1beta3.ReplicationControllerSpec.selector": { - "id": "v1beta3.ReplicationControllerSpec.selector", - "properties": {} - }, "v1beta3.ReplicationControllerStatus": { "id": "v1beta3.ReplicationControllerStatus", "required": [ @@ -6965,7 +7155,7 @@ "id": "v1beta3.ResourceQuota", "properties": { "annotations": { - "$ref": "v1beta3.ObjectMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about objects" }, "apiVersion": { @@ -6989,7 +7179,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta3.ObjectMeta.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize objects; may match selectors of replication controllers and services" }, "name": { @@ -7017,7 +7207,7 @@ "description": "status defines the actual enforced quota and current usage; https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/api-conventions.md#spec-and-status" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system; read-only" } } @@ -7057,7 +7247,7 @@ "id": "v1beta3.ResourceQuotaSpec", "properties": { "hard": { - "$ref": "v1beta3.ResourceList", + "type": "any", "description": "hard is the set of desired hard limits for each named resource" } } @@ -7066,11 +7256,11 @@ "id": "v1beta3.ResourceQuotaStatus", "properties": { "hard": { - "$ref": "v1beta3.ResourceList", + "type": "any", "description": "hard is the set of enforced hard limits for each named resource" }, "used": { - "$ref": "v1beta3.ResourceList", + "type": "any", "description": "used is the current observed total usage of the resource in the namespace" } } @@ -7079,11 +7269,11 @@ "id": "v1beta3.ResourceRequirements", "properties": { "limits": { - "$ref": "v1beta3.ResourceList", + "type": "any", "description": "Maximum amount of compute resources allowed" }, "requests": { - "$ref": "v1beta3.ResourceList", + "type": "any", "description": "Minimum amount of resources requested" } } @@ -7092,7 +7282,7 @@ "id": "v1beta3.Secret", "properties": { "annotations": { - "$ref": "v1beta3.ObjectMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about objects" }, "apiVersion": { @@ -7104,7 +7294,7 @@ "description": "RFC 3339 date and time at which the object was created; populated by the system, read-only; null for lists" }, "data": { - "$ref": "v1beta3.Secret.data", + "type": "any", "description": "data contains the secret data. Each key must be a valid DNS_SUBDOMAIN. Each value must be a base64 encoded string" }, "deletionTimestamp": { @@ -7120,7 +7310,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta3.ObjectMeta.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize objects; may match selectors of replication controllers and services" }, "name": { @@ -7140,19 +7330,15 @@ "description": "URL for the object; populated by the system, read-only" }, "type": { - "$ref": "v1beta3.SecretType", + "type": "string", "description": "type facilitates programmatic handling of secret data" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system; read-only" } } }, - "v1beta3.Secret.data": { - "id": "v1beta3.Secret.data", - "properties": {} - }, "v1beta3.SecretList": { "id": "v1beta3.SecretList", "required": [ @@ -7184,11 +7370,23 @@ } } }, + "v1beta3.SecretVolumeSource": { + "id": "v1beta3.SecretVolumeSource", + "required": [ + "secretName" + ], + "properties": { + "secretName": { + "type": "string", + "description": "secretName is the name of a secret in the pod's namespace" + } + } + }, "v1beta3.Service": { "id": "v1beta3.Service", "properties": { "annotations": { - "$ref": "v1beta3.ObjectMeta.annotations", + "type": "any", "description": "map of string keys and values that can be used by external tooling to store and retrieve arbitrary metadata about objects" }, "apiVersion": { @@ -7212,7 +7410,7 @@ "description": "kind of object, in CamelCase; cannot be updated" }, "labels": { - "$ref": "v1beta3.ObjectMeta.labels", + "type": "any", "description": "map of string keys and values that can be used to organize and categorize objects; may match selectors of replication controllers and services" }, "name": { @@ -7240,7 +7438,7 @@ "description": "most recently observed status of the service; populated by the system, read-only; https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/api-conventions.md#spec-and-status" }, "uid": { - "$ref": "types.UID", + "type": "string", "description": "unique UUID across space and time; populated by the system; read-only" } } @@ -7295,7 +7493,7 @@ "description": "the port number that is exposed" }, "protocol": { - "$ref": "v1beta3.Protocol", + "type": "string", "description": "the protocol used by this port; must be UDP or TCP; TCP if unspecified" }, "targetPort": { @@ -7334,19 +7532,15 @@ "description": "externally visible IPs (e.g. load balancers) that should be proxied to this service" }, "selector": { - "$ref": "v1beta3.ServiceSpec.selector", + "type": "any", "description": "label keys and values that must match in order to receive traffic for this service; if empty, all pods are selected, if not specified, endpoints must be manually specified" }, "sessionAffinity": { - "$ref": "v1beta3.AffinityType", + "type": "string", "description": "enable client IP based session affinity; must be ClientIP or None; defaults to None" } } }, - "v1beta3.ServiceSpec.selector": { - "id": "v1beta3.ServiceSpec.selector", - "properties": {} - }, "v1beta3.ServiceStatus": { "id": "v1beta3.ServiceStatus", "properties": {} @@ -7364,12 +7558,12 @@ "id": "v1beta3.Volume", "required": [ "name", - "hostPath", - "emptyDir", - "gcePersistentDisk", "gitRepo", "secret", - "nfs" + "nfs", + "hostPath", + "emptyDir", + "gcePersistentDisk" ], "properties": { "emptyDir": { diff --git a/docs/node.md b/docs/node.md index 6f9933953c1..f1d4a9bd721 100644 --- a/docs/node.md +++ b/docs/node.md @@ -38,26 +38,20 @@ must have appropriate conditions, see below. ### Node Condition Node Condition describes the conditions of `Running` nodes. Current valid -conditions are `NodeReachable`, `NodeReady` and `NodeSchedulable`. In the -future, we plan to add more. `NodeReachable` means the node can be reached -within the cluster. `NodeReady` means the kubelet returns StatusOK for HTTP -health check. `NodeSchedulable` means node is allowed to schedule any new -pods and is controlled by 'unschedulable' field in node spec. -Different condition provides different level of understanding for node -health. Kubernetes will make a comprehensive scheduling decision based on the -information. Node condition is represented as a json object. For example, the -following conditions mean the node is reachable from its cluster, node is in -sane state but not allowed to accept new pods: +conditions are `NodeReady` and `NodeSchedulable`. In the future, we plan to +add more. `NodeReady` means kubelet is healthy and ready to accept pods +`NodeSchedulable` means node is allowed to schedule any new pods and is +controlled by 'unschedulable' field in node spec. Different condition provides +different level of understanding for node health. Kubernetes will make a +comprehensive scheduling decision based on the information. Node condition +is represented as a json object. For example, the following conditions mean +the node is in sane state but not allowed to accept new pods: ```json "conditions": [ - { - "kind": "Reachable", - "status": "True", - }, { "kind": "Ready", "status": "True", - }, + }, { "kind": "Schedulable", "status": "False", diff --git a/pkg/api/types.go b/pkg/api/types.go index 10b6272a16d..95aa9274cf1 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -1069,9 +1069,7 @@ type NodeConditionType string // node condition. In the future, we will add more. The proposed set of conditions are: // NodeReachable, NodeLive, NodeReady, NodeSchedulable, NodeRunnable. const ( - // NodeReachable means the node can be reached (in the sense of HTTP connection) from node controller. - NodeReachable NodeConditionType = "Reachable" - // NodeReady means the node returns StatusOK for HTTP health check. + // NodeReady means kubelet is healthy and ready to accept pods. NodeReady NodeConditionType = "Ready" // NodeSchedulable means the node is ready to accept new pods. NodeSchedulable NodeConditionType = "Schedulable" diff --git a/pkg/api/v1beta1/conversion.go b/pkg/api/v1beta1/conversion.go index 31bea4d290b..a39a854d786 100644 --- a/pkg/api/v1beta1/conversion.go +++ b/pkg/api/v1beta1/conversion.go @@ -1390,9 +1390,6 @@ func init() { func(in *newer.NodeConditionType, out *NodeConditionKind, s conversion.Scope) error { switch *in { - case newer.NodeReachable: - *out = NodeReachable - break case newer.NodeReady: *out = NodeReady break @@ -1406,9 +1403,6 @@ func init() { }, func(in *NodeConditionKind, out *newer.NodeConditionType, s conversion.Scope) error { switch *in { - case NodeReachable: - *out = newer.NodeReachable - break case NodeReady: *out = newer.NodeReady break diff --git a/pkg/api/v1beta1/types.go b/pkg/api/v1beta1/types.go index a9e917b0320..75e4f3ec6d9 100644 --- a/pkg/api/v1beta1/types.go +++ b/pkg/api/v1beta1/types.go @@ -917,16 +917,16 @@ type NodeConditionKind string // node condition. In the future, we will add more. The proposed set of conditions are: // NodeReachable, NodeLive, NodeReady, NodeSchedulable, NodeRunnable. const ( - // NodeReachable means the node can be reached (in the sense of HTTP connection) from node controller. + // NodeReachable means the node can be reached (in the sense of HTTP connection) within cluster. NodeReachable NodeConditionKind = "Reachable" - // NodeReady means the node returns StatusOK for HTTP health check. + // NodeReady means kubelet is healthy and ready to accept pods. NodeReady NodeConditionKind = "Ready" // NodeSchedulable means the node is ready to accept new pods. NodeSchedulable NodeConditionKind = "Schedulable" ) type NodeCondition struct { - Kind NodeConditionKind `json:"kind" description:"kind of the condition, one of Reachable, Ready"` + Kind NodeConditionKind `json:"kind" description:"kind of the condition, one of Reachable, Ready, Schedulable"` Status ConditionStatus `json:"status" description:"status of the condition, one of Full, None, Unknown"` LastProbeTime util.Time `json:"lastProbeTime,omitempty" description:"last time the condition was probed"` LastTransitionTime util.Time `json:"lastTransitionTime,omitempty" description:"last time the condition transit from one status to another"` diff --git a/pkg/api/v1beta2/conversion.go b/pkg/api/v1beta2/conversion.go index 0300c9c2467..e6ffbc6952e 100644 --- a/pkg/api/v1beta2/conversion.go +++ b/pkg/api/v1beta2/conversion.go @@ -1317,9 +1317,6 @@ func init() { func(in *newer.NodeConditionType, out *NodeConditionKind, s conversion.Scope) error { switch *in { - case newer.NodeReachable: - *out = NodeReachable - break case newer.NodeReady: *out = NodeReady break @@ -1333,9 +1330,6 @@ func init() { }, func(in *NodeConditionKind, out *newer.NodeConditionType, s conversion.Scope) error { switch *in { - case NodeReachable: - *out = newer.NodeReachable - break case NodeReady: *out = newer.NodeReady break diff --git a/pkg/api/v1beta2/types.go b/pkg/api/v1beta2/types.go index 09b5fa1efd2..2e0677e815a 100644 --- a/pkg/api/v1beta2/types.go +++ b/pkg/api/v1beta2/types.go @@ -926,9 +926,9 @@ type NodeConditionKind string // node condition. In the future, we will add more. The proposed set of conditions are: // NodeReachable, NodeLive, NodeReady, NodeSchedulable, NodeRunnable. const ( - // NodeReachable means the node can be reached (in the sense of HTTP connection) from node controller. + // NodeReachable means the node can be reached (in the sense of HTTP connection) within cluster. NodeReachable NodeConditionKind = "Reachable" - // NodeReady means the node returns StatusOK for HTTP health check. + // NodeReady means kubelet is healthy and ready to accept pods. NodeReady NodeConditionKind = "Ready" // NodeSchedulable means the node is ready to accept new pods. NodeSchedulable NodeConditionKind = "Schedulable" @@ -938,7 +938,7 @@ const ( // // https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/node.md#node-condition type NodeCondition struct { - Kind NodeConditionKind `json:"kind" description:"kind of the condition, one of Reachable, Ready"` + Kind NodeConditionKind `json:"kind" description:"kind of the condition, one of Reachable, Ready, Schedulable"` Status ConditionStatus `json:"status" description:"status of the condition, one of Full, None, Unknown"` LastProbeTime util.Time `json:"lastProbeTime,omitempty" description:"last time the condition was probed"` LastTransitionTime util.Time `json:"lastTransitionTime,omitempty" description:"last time the condition transit from one status to another"` diff --git a/pkg/api/v1beta3/types.go b/pkg/api/v1beta3/types.go index 5640eb35873..78841dcebdb 100644 --- a/pkg/api/v1beta3/types.go +++ b/pkg/api/v1beta3/types.go @@ -1066,16 +1066,14 @@ type NodeConditionType string // node condition. In the future, we will add more. The proposed set of conditions are: // NodeReachable, NodeLive, NodeReady, NodeSchedulable, NodeRunnable. const ( - // NodeReachable means the node can be reached (in the sense of HTTP connection) from node controller. - NodeReachable NodeConditionType = "Reachable" - // NodeReady means the node returns StatusOK for HTTP health check. + // NodeReady means kubelet is healthy and ready to accept pods. NodeReady NodeConditionType = "Ready" // NodeSchedulable means the node is ready to accept new pods. NodeSchedulable NodeConditionType = "Schedulable" ) type NodeCondition struct { - Type NodeConditionType `json:"type" description:"type of node condition, one of Reachable, Ready"` + Type NodeConditionType `json:"type" description:"type of node condition, one of Ready, Schedulable"` Status ConditionStatus `json:"status" description:"status of the condition, one of Full, None, Unknown"` LastProbeTime util.Time `json:"lastProbeTime,omitempty" description:"last time the condition was probed"` LastTransitionTime util.Time `json:"lastTransitionTime,omitempty" description:"last time the condition transit from one status to another"` diff --git a/pkg/kubectl/resource_printer.go b/pkg/kubectl/resource_printer.go index 9acc9915dfd..29effe3c8a8 100644 --- a/pkg/kubectl/resource_printer.go +++ b/pkg/kubectl/resource_printer.go @@ -458,7 +458,7 @@ func printSecretList(list *api.SecretList, w io.Writer) error { func printNode(node *api.Node, w io.Writer) error { conditionMap := make(map[api.NodeConditionType]*api.NodeCondition) - NodeAllConditions := []api.NodeConditionType{api.NodeSchedulable, api.NodeReady, api.NodeReachable} + NodeAllConditions := []api.NodeConditionType{api.NodeSchedulable, api.NodeReady} for i := range node.Status.Conditions { cond := node.Status.Conditions[i] conditionMap[cond.Type] = &cond diff --git a/pkg/kubectl/resource_printer_test.go b/pkg/kubectl/resource_printer_test.go index d224a8e7475..4f749efa013 100644 --- a/pkg/kubectl/resource_printer_test.go +++ b/pkg/kubectl/resource_printer_test.go @@ -549,15 +549,6 @@ func TestPrintMinionStatus(t *testing.T) { }, status: "Ready", }, - { - minion: api.Node{ - ObjectMeta: api.ObjectMeta{Name: "foo2"}, - Status: api.NodeStatus{Conditions: []api.NodeCondition{ - {Type: api.NodeReady, Status: api.ConditionTrue}, - {Type: api.NodeReachable, Status: api.ConditionTrue}}}, - }, - status: "Ready,Reachable", - }, { minion: api.Node{ ObjectMeta: api.ObjectMeta{Name: "foo3"}, @@ -593,20 +584,18 @@ func TestPrintMinionStatus(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "foo7"}, Status: api.NodeStatus{Conditions: []api.NodeCondition{ {Type: api.NodeSchedulable, Status: api.ConditionTrue}, - {Type: api.NodeReady, Status: api.ConditionTrue}, - {Type: api.NodeReachable, Status: api.ConditionTrue}}}, + {Type: api.NodeReady, Status: api.ConditionTrue}}}, }, - status: "Schedulable,Ready,Reachable", + status: "Schedulable,Ready", }, { minion: api.Node{ ObjectMeta: api.ObjectMeta{Name: "foo8"}, Status: api.NodeStatus{Conditions: []api.NodeCondition{ {Type: api.NodeSchedulable, Status: api.ConditionFalse}, - {Type: api.NodeReady, Status: api.ConditionFalse}, - {Type: api.NodeReachable, Status: api.ConditionTrue}}}, + {Type: api.NodeReady, Status: api.ConditionFalse}}}, }, - status: "NotSchedulable,NotReady,Reachable", + status: "NotSchedulable,NotReady", }, } diff --git a/plugin/pkg/scheduler/factory/factory.go b/plugin/pkg/scheduler/factory/factory.go index 5380daff811..590394d75df 100644 --- a/plugin/pkg/scheduler/factory/factory.go +++ b/plugin/pkg/scheduler/factory/factory.go @@ -256,14 +256,10 @@ func (factory *ConfigFactory) pollMinions() (cache.Enumerator, error) { if condition.Status == api.ConditionTrue { nodes.Items = append(nodes.Items, node) } - } else if condition, ok := conditionMap[api.NodeReachable]; ok { - if condition.Status == api.ConditionTrue { - nodes.Items = append(nodes.Items, node) - } } else { // If no condition is set, we get unknown node condition. In such cases, - // do not add the node - glog.V(2).Infof("Minion %s is not available. Skipping", node.Name) + // do not add the node. + glog.V(2).Infof("Minion %s is not available. Skipping", node.Name) } } return &nodeEnumerator{nodes}, nil diff --git a/plugin/pkg/scheduler/factory/factory_test.go b/plugin/pkg/scheduler/factory/factory_test.go index d7c47ce8a3e..89ebadce07a 100644 --- a/plugin/pkg/scheduler/factory/factory_test.go +++ b/plugin/pkg/scheduler/factory/factory_test.go @@ -146,14 +146,6 @@ func TestPollMinions(t *testing.T) { }, }, }, - { - ObjectMeta: api.ObjectMeta{Name: "bar"}, - Status: api.NodeStatus{ - Conditions: []api.NodeCondition{ - {Type: api.NodeReachable, Status: api.ConditionTrue}, - }, - }, - }, { ObjectMeta: api.ObjectMeta{Name: "fiz"}, Status: api.NodeStatus{ @@ -162,15 +154,6 @@ func TestPollMinions(t *testing.T) { }, }, }, - { - ObjectMeta: api.ObjectMeta{Name: "biz"}, - Status: api.NodeStatus{ - Conditions: []api.NodeCondition{ - {Type: api.NodeReady, Status: api.ConditionTrue}, - {Type: api.NodeReachable, Status: api.ConditionTrue}, - }, - }, - }, { ObjectMeta: api.ObjectMeta{Name: "baz"}, Status: api.NodeStatus{ @@ -186,7 +169,6 @@ func TestPollMinions(t *testing.T) { Conditions: []api.NodeCondition{ {Type: api.NodeSchedulable, Status: api.ConditionTrue}, {Type: api.NodeReady, Status: api.ConditionTrue}, - {Type: api.NodeReachable, Status: api.ConditionTrue}, }, }, }, @@ -196,7 +178,6 @@ func TestPollMinions(t *testing.T) { Conditions: []api.NodeCondition{ {Type: api.NodeSchedulable, Status: api.ConditionFalse}, {Type: api.NodeReady, Status: api.ConditionTrue}, - {Type: api.NodeReachable, Status: api.ConditionTrue}, }, }, }, @@ -206,21 +187,11 @@ func TestPollMinions(t *testing.T) { Conditions: []api.NodeCondition{ {Type: api.NodeSchedulable, Status: api.ConditionTrue}, {Type: api.NodeReady, Status: api.ConditionFalse}, - {Type: api.NodeReachable, Status: api.ConditionTrue}, - }, - }, - }, - { - ObjectMeta: api.ObjectMeta{Name: "fizbiz"}, - Status: api.NodeStatus{ - Conditions: []api.NodeCondition{ - {Type: api.NodeSchedulable, Status: api.ConditionTrue}, - {Type: api.NodeReachable, Status: api.ConditionFalse}, }, }, }, }, - expectedCount: 5, + expectedCount: 3, }, { minions: []api.Node{ @@ -271,19 +242,6 @@ func TestPollMinions(t *testing.T) { Status: api.NodeStatus{ Conditions: []api.NodeCondition{ {Type: api.NodeReady, Status: api.ConditionTrue}, - {Type: api.NodeReachable, Status: api.ConditionFalse}}, - }, - }, - }, - expectedCount: 1, - }, - { - minions: []api.Node{ - { - ObjectMeta: api.ObjectMeta{Name: "foo"}, - Status: api.NodeStatus{ - Conditions: []api.NodeCondition{ - {Type: api.NodeReachable, Status: api.ConditionTrue}, {Type: "invalidValue", Status: api.ConditionFalse}}, }, },