diff --git a/api/swagger-spec/api.json b/api/swagger-spec/api.json index 08cfc5a5cac..f86dea5dea4 100644 --- a/api/swagger-spec/api.json +++ b/api/swagger-spec/api.json @@ -24,4 +24,4 @@ ] } ] - } + } \ No newline at end of file diff --git a/api/swagger-spec/resourceListing.json b/api/swagger-spec/resourceListing.json index 252566c2ba8..f387f1fc70a 100644 --- a/api/swagger-spec/resourceListing.json +++ b/api/swagger-spec/resourceListing.json @@ -27,4 +27,4 @@ "title": "", "description": "" } - } + } \ No newline at end of file diff --git a/api/swagger-spec/v1beta1.json b/api/swagger-spec/v1beta1.json index 08c608ec158..976e40474ff 100644 --- a/api/swagger-spec/v1beta1.json +++ b/api/swagger-spec/v1beta1.json @@ -47,6 +47,116 @@ } ] }, + { + "path": "/api/v1beta1/componentStatuses", + "description": "API at /api/v1beta1 version v1beta1", + "operations": [ + { + "type": "v1beta1.ComponentStatusList", + "method": "GET", + "summary": "list objects of kind ComponentStatus", + "nickname": "listComponentStatus", + "parameters": [ + { + "type": "string", + "paramType": "query", + "name": "fields", + "description": "a selector to restrict the list of returned objects by their fields; defaults to everything", + "required": false, + "allowMultiple": false + }, + { + "type": "string", + "paramType": "query", + "name": "labels", + "description": "a selector to restrict the list of returned objects by their labels; defaults to everything", + "required": false, + "allowMultiple": false + }, + { + "type": "string", + "paramType": "query", + "name": "namespace", + "description": "object name and auth scope, such as for teams and projects", + "required": false, + "allowMultiple": false + }, + { + "type": "string", + "paramType": "query", + "name": "resourceVersion", + "description": "when specified with a watch call, shows changes that occur after that particular version of a resource; defaults to changes from the beginning of history", + "required": false, + "allowMultiple": false + }, + { + "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", + "required": false, + "allowMultiple": false + } + ], + "responseMessages": [ + { + "code": 200, + "message": "OK", + "responseModel": "v1beta1.ComponentStatusList" + } + ], + "produces": [ + "application/json" + ], + "consumes": [ + "*/*" + ] + } + ] + }, + { + "path": "/api/v1beta1/componentStatuses/{name}", + "description": "API at /api/v1beta1 version v1beta1", + "operations": [ + { + "type": "v1beta1.ComponentStatus", + "method": "GET", + "summary": "read the specified ComponentStatus", + "nickname": "readComponentStatus", + "parameters": [ + { + "type": "string", + "paramType": "path", + "name": "name", + "description": "name of the ComponentStatus", + "required": true, + "allowMultiple": false + }, + { + "type": "string", + "paramType": "query", + "name": "namespace", + "description": "object name and auth scope, such as for teams and projects", + "required": false, + "allowMultiple": false + } + ], + "responseMessages": [ + { + "code": 200, + "message": "OK", + "responseModel": "v1beta1.ComponentStatus" + } + ], + "produces": [ + "application/json" + ], + "consumes": [ + "*/*" + ] + } + ] + }, { "path": "/api/v1beta1/endpoints", "description": "API at /api/v1beta1 version v1beta1", @@ -7233,6 +7343,150 @@ "id": "v1beta1.CapabilityType", "properties": {} }, + "v1beta1.ComponentCondition": { + "id": "v1beta1.ComponentCondition", + "required": [ + "type", + "status" + ], + "properties": { + "error": { + "type": "string", + "description": "error code from health check attempt (if any)" + }, + "message": { + "type": "string", + "description": "health check message received from the component" + }, + "status": { + "type": "string", + "description": "current status of this component condition, one of Full, None, Unknown" + }, + "type": { + "type": "string", + "description": "type of component condition, currently only Healthy" + } + } + }, + "v1beta1.ComponentStatus": { + "id": "v1beta1.ComponentStatus", + "properties": { + "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": { + "type": "string", + "description": "version of the schema the object should have" + }, + "conditions": { + "type": "array", + "items": { + "$ref": "v1beta1.ComponentCondition" + }, + "description": "list of component conditions observed" + }, + "creationTimestamp": { + "type": "string", + "description": "RFC 3339 date and time at which the object was created; populated by the system, read-only; null for lists" + }, + "deletionTimestamp": { + "type": "string", + "description": "RFC 3339 date and time at which the object will be deleted; populated by the system when a graceful deletion is requested, read-only; if not set, graceful deletion of the object has not been requested" + }, + "generateName": { + "type": "string", + "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" + }, + "id": { + "type": "string", + "description": "name of the object; must be a DNS_SUBDOMAIN and unique among all objects of the same kind within the same namespace; used in resource URLs; cannot be updated" + }, + "kind": { + "type": "string", + "description": "kind of object, in CamelCase; cannot be updated" + }, + "name": { + "type": "string", + "description": "name of the component" + }, + "namespace": { + "type": "string", + "description": "namespace to which the object belongs; must be a DNS_SUBDOMAIN; 'default' by default; cannot be updated" + }, + "resourceVersion": { + "$ref": "uint64", + "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" + }, + "selfLink": { + "type": "string", + "description": "URL for the object; populated by the system, read-only" + }, + "uid": { + "type": "string", + "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" + } + } + }, + "v1beta1.ComponentStatusList": { + "id": "v1beta1.ComponentStatusList", + "required": [ + "items" + ], + "properties": { + "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": { + "type": "string", + "description": "version of the schema the object should have" + }, + "creationTimestamp": { + "type": "string", + "description": "RFC 3339 date and time at which the object was created; populated by the system, read-only; null for lists" + }, + "deletionTimestamp": { + "type": "string", + "description": "RFC 3339 date and time at which the object will be deleted; populated by the system when a graceful deletion is requested, read-only; if not set, graceful deletion of the object has not been requested" + }, + "generateName": { + "type": "string", + "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" + }, + "id": { + "type": "string", + "description": "name of the object; must be a DNS_SUBDOMAIN and unique among all objects of the same kind within the same namespace; used in resource URLs; cannot be updated" + }, + "items": { + "type": "array", + "items": { + "$ref": "v1beta1.ComponentStatus" + }, + "description": "list of component status objects" + }, + "kind": { + "type": "string", + "description": "kind of object, in CamelCase; cannot be updated" + }, + "namespace": { + "type": "string", + "description": "namespace to which the object belongs; must be a DNS_SUBDOMAIN; 'default' by default; cannot be updated" + }, + "resourceVersion": { + "$ref": "uint64", + "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" + }, + "selfLink": { + "type": "string", + "description": "URL for the object; populated by the system, read-only" + }, + "uid": { + "type": "string", + "description": "unique UUID across space and time; populated by the system, read-only; cannot be updated" + } + } + }, "v1beta1.Container": { "id": "v1beta1.Container", "required": [ @@ -8551,7 +8805,7 @@ "properties": { "kind": { "type": "string", - "description": "kind of the condition, one of Reachable, Ready, Schedulable" + "description": "kind of the condition, current kinds: Reachable, Ready, Schedulable" }, "lastProbeTime": { "type": "string", @@ -8971,10 +9225,10 @@ "v1beta1.PersistentVolumeSpec": { "id": "v1beta1.PersistentVolumeSpec", "required": [ - "hostPath", - "glusterfs", "persistentDisk", - "awsElasticBlockStore" + "awsElasticBlockStore", + "hostPath", + "glusterfs" ], "properties": { "accessModes": { @@ -10094,4 +10348,4 @@ } } } - } + } \ No newline at end of file diff --git a/api/swagger-spec/v1beta2.json b/api/swagger-spec/v1beta2.json index 58a626423da..6920f89bbe3 100644 --- a/api/swagger-spec/v1beta2.json +++ b/api/swagger-spec/v1beta2.json @@ -47,6 +47,116 @@ } ] }, + { + "path": "/api/v1beta2/componentStatuses", + "description": "API at /api/v1beta2 version v1beta2", + "operations": [ + { + "type": "v1beta2.ComponentStatusList", + "method": "GET", + "summary": "list objects of kind ComponentStatus", + "nickname": "listComponentStatus", + "parameters": [ + { + "type": "string", + "paramType": "query", + "name": "fields", + "description": "a selector to restrict the list of returned objects by their fields; defaults to everything", + "required": false, + "allowMultiple": false + }, + { + "type": "string", + "paramType": "query", + "name": "labels", + "description": "a selector to restrict the list of returned objects by their labels; defaults to everything", + "required": false, + "allowMultiple": false + }, + { + "type": "string", + "paramType": "query", + "name": "namespace", + "description": "object name and auth scope, such as for teams and projects", + "required": false, + "allowMultiple": false + }, + { + "type": "string", + "paramType": "query", + "name": "resourceVersion", + "description": "when specified with a watch call, shows changes that occur after that particular version of a resource; defaults to changes from the beginning of history", + "required": false, + "allowMultiple": false + }, + { + "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", + "required": false, + "allowMultiple": false + } + ], + "responseMessages": [ + { + "code": 200, + "message": "OK", + "responseModel": "v1beta2.ComponentStatusList" + } + ], + "produces": [ + "application/json" + ], + "consumes": [ + "*/*" + ] + } + ] + }, + { + "path": "/api/v1beta2/componentStatuses/{name}", + "description": "API at /api/v1beta2 version v1beta2", + "operations": [ + { + "type": "v1beta2.ComponentStatus", + "method": "GET", + "summary": "read the specified ComponentStatus", + "nickname": "readComponentStatus", + "parameters": [ + { + "type": "string", + "paramType": "path", + "name": "name", + "description": "name of the ComponentStatus", + "required": true, + "allowMultiple": false + }, + { + "type": "string", + "paramType": "query", + "name": "namespace", + "description": "object name and auth scope, such as for teams and projects", + "required": false, + "allowMultiple": false + } + ], + "responseMessages": [ + { + "code": 200, + "message": "OK", + "responseModel": "v1beta2.ComponentStatus" + } + ], + "produces": [ + "application/json" + ], + "consumes": [ + "*/*" + ] + } + ] + }, { "path": "/api/v1beta2/endpoints", "description": "API at /api/v1beta2 version v1beta2", @@ -7233,6 +7343,150 @@ "id": "v1beta2.CapabilityType", "properties": {} }, + "v1beta2.ComponentCondition": { + "id": "v1beta2.ComponentCondition", + "required": [ + "type", + "status" + ], + "properties": { + "error": { + "type": "string", + "description": "error code from health check attempt (if any)" + }, + "message": { + "type": "string", + "description": "health check message received from the component" + }, + "status": { + "type": "string", + "description": "current status of this component condition, one of Full, None, Unknown" + }, + "type": { + "type": "string", + "description": "type of component condition, currently only Healthy" + } + } + }, + "v1beta2.ComponentStatus": { + "id": "v1beta2.ComponentStatus", + "properties": { + "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": { + "type": "string", + "description": "version of the schema the object should have" + }, + "conditions": { + "type": "array", + "items": { + "$ref": "v1beta2.ComponentCondition" + }, + "description": "list of component conditions observed" + }, + "creationTimestamp": { + "type": "string", + "description": "RFC 3339 date and time at which the object was created; populated by the system, read-only; null for lists" + }, + "deletionTimestamp": { + "type": "string", + "description": "RFC 3339 date and time at which the object will be deleted; populated by the system when a graceful deletion is requested, read-only; if not set, graceful deletion of the object has not been requested" + }, + "generateName": { + "type": "string", + "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" + }, + "id": { + "type": "string", + "description": "name of the object; must be a DNS_SUBDOMAIN and unique among all objects of the same kind within the same namespace; used in resource URLs; cannot be updated" + }, + "kind": { + "type": "string", + "description": "kind of object, in CamelCase; cannot be updated" + }, + "name": { + "type": "string", + "description": "name of the component" + }, + "namespace": { + "type": "string", + "description": "namespace to which the object belongs; must be a DNS_SUBDOMAIN; 'default' by default; cannot be updated" + }, + "resourceVersion": { + "$ref": "uint64", + "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" + }, + "selfLink": { + "type": "string", + "description": "URL for the object; populated by the system, read-only" + }, + "uid": { + "type": "string", + "description": "unique UUID across space and time; populated by the system, read-only" + } + } + }, + "v1beta2.ComponentStatusList": { + "id": "v1beta2.ComponentStatusList", + "required": [ + "items" + ], + "properties": { + "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": { + "type": "string", + "description": "version of the schema the object should have" + }, + "creationTimestamp": { + "type": "string", + "description": "RFC 3339 date and time at which the object was created; populated by the system, read-only; null for lists" + }, + "deletionTimestamp": { + "type": "string", + "description": "RFC 3339 date and time at which the object will be deleted; populated by the system when a graceful deletion is requested, read-only; if not set, graceful deletion of the object has not been requested" + }, + "generateName": { + "type": "string", + "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" + }, + "id": { + "type": "string", + "description": "name of the object; must be a DNS_SUBDOMAIN and unique among all objects of the same kind within the same namespace; used in resource URLs; cannot be updated" + }, + "items": { + "type": "array", + "items": { + "$ref": "v1beta2.ComponentStatus" + }, + "description": "list of component status objects" + }, + "kind": { + "type": "string", + "description": "kind of object, in CamelCase; cannot be updated" + }, + "namespace": { + "type": "string", + "description": "namespace to which the object belongs; must be a DNS_SUBDOMAIN; 'default' by default; cannot be updated" + }, + "resourceVersion": { + "$ref": "uint64", + "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" + }, + "selfLink": { + "type": "string", + "description": "URL for the object; populated by the system, read-only" + }, + "uid": { + "type": "string", + "description": "unique UUID across space and time; populated by the system, read-only" + } + } + }, "v1beta2.Container": { "id": "v1beta2.Container", "required": [ @@ -8540,7 +8794,7 @@ "properties": { "kind": { "type": "string", - "description": "kind of the condition, one of Reachable, Ready, Schedulable" + "description": "kind of the condition, current kinds: Reachable, Ready, Schedulable" }, "lastProbeTime": { "type": "string", @@ -8960,10 +9214,10 @@ "v1beta2.PersistentVolumeSpec": { "id": "v1beta2.PersistentVolumeSpec", "required": [ - "persistentDisk", - "awsElasticBlockStore", "hostPath", - "glusterfs" + "glusterfs", + "persistentDisk", + "awsElasticBlockStore" ], "properties": { "accessModes": { @@ -10075,4 +10329,4 @@ } } } - } + } \ No newline at end of file diff --git a/api/swagger-spec/v1beta3.json b/api/swagger-spec/v1beta3.json index 332703f42cf..0c28076237d 100644 --- a/api/swagger-spec/v1beta3.json +++ b/api/swagger-spec/v1beta3.json @@ -47,6 +47,175 @@ } ] }, + { + "path": "/api/v1beta3/namespaces/{namespaces}/componentstatuses", + "description": "API at /api/v1beta3 version v1beta3", + "operations": [ + { + "type": "v1beta3.ComponentStatusList", + "method": "GET", + "summary": "list objects of kind ComponentStatus", + "nickname": "listComponentStatus", + "parameters": [ + { + "type": "string", + "paramType": "path", + "name": "namespaces", + "description": "object name and auth scope, such as for teams and projects", + "required": true, + "allowMultiple": false + }, + { + "type": "string", + "paramType": "query", + "name": "fieldSelector", + "description": "a selector to restrict the list of returned objects by their fields; defaults to everything", + "required": false, + "allowMultiple": false + }, + { + "type": "string", + "paramType": "query", + "name": "labelSelector", + "description": "a selector to restrict the list of returned objects by their labels; defaults to everything", + "required": false, + "allowMultiple": false + }, + { + "type": "string", + "paramType": "query", + "name": "resourceVersion", + "description": "when specified with a watch call, shows changes that occur after that particular version of a resource; defaults to changes from the beginning of history", + "required": false, + "allowMultiple": false + }, + { + "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", + "required": false, + "allowMultiple": false + } + ], + "responseMessages": [ + { + "code": 200, + "message": "OK", + "responseModel": "v1beta3.ComponentStatusList" + } + ], + "produces": [ + "application/json" + ], + "consumes": [ + "*/*" + ] + } + ] + }, + { + "path": "/api/v1beta3/namespaces/{namespaces}/componentstatuses/{name}", + "description": "API at /api/v1beta3 version v1beta3", + "operations": [ + { + "type": "v1beta3.ComponentStatus", + "method": "GET", + "summary": "read the specified ComponentStatus", + "nickname": "readComponentStatus", + "parameters": [ + { + "type": "string", + "paramType": "path", + "name": "name", + "description": "name of the ComponentStatus", + "required": true, + "allowMultiple": false + }, + { + "type": "string", + "paramType": "path", + "name": "namespaces", + "description": "object name and auth scope, such as for teams and projects", + "required": true, + "allowMultiple": false + } + ], + "responseMessages": [ + { + "code": 200, + "message": "OK", + "responseModel": "v1beta3.ComponentStatus" + } + ], + "produces": [ + "application/json" + ], + "consumes": [ + "*/*" + ] + } + ] + }, + { + "path": "/api/v1beta3/componentstatuses", + "description": "API at /api/v1beta3 version v1beta3", + "operations": [ + { + "type": "v1beta3.ComponentStatusList", + "method": "GET", + "summary": "list objects of kind ComponentStatus", + "nickname": "listComponentStatus", + "parameters": [ + { + "type": "string", + "paramType": "query", + "name": "fieldSelector", + "description": "a selector to restrict the list of returned objects by their fields; defaults to everything", + "required": false, + "allowMultiple": false + }, + { + "type": "string", + "paramType": "query", + "name": "labelSelector", + "description": "a selector to restrict the list of returned objects by their labels; defaults to everything", + "required": false, + "allowMultiple": false + }, + { + "type": "string", + "paramType": "query", + "name": "resourceVersion", + "description": "when specified with a watch call, shows changes that occur after that particular version of a resource; defaults to changes from the beginning of history", + "required": false, + "allowMultiple": false + }, + { + "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", + "required": false, + "allowMultiple": false + } + ], + "responseMessages": [ + { + "code": 200, + "message": "OK", + "responseModel": "v1beta3.ComponentStatusList" + } + ], + "produces": [ + "application/json" + ], + "consumes": [ + "*/*" + ] + } + ] + }, { "path": "/api/v1beta3/namespaces/{namespaces}/endpoints", "description": "API at /api/v1beta3 version v1beta3", @@ -8224,6 +8393,122 @@ "id": "v1beta3.CapabilityType", "properties": {} }, + "v1beta3.ComponentCondition": { + "id": "v1beta3.ComponentCondition", + "required": [ + "type", + "status" + ], + "properties": { + "error": { + "type": "string", + "description": "error code from health check attempt (if any)" + }, + "message": { + "type": "string", + "description": "health check message received from the component" + }, + "status": { + "type": "string", + "description": "current status of this component condition, one of True, False, Unknown" + }, + "type": { + "type": "string", + "description": "type of component condition, currently only Healthy" + } + } + }, + "v1beta3.ComponentStatus": { + "id": "v1beta3.ComponentStatus", + "properties": { + "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": { + "type": "string", + "description": "version of the schema the object should have" + }, + "conditions": { + "type": "array", + "items": { + "$ref": "v1beta3.ComponentCondition" + }, + "description": "list of component conditions observed" + }, + "creationTimestamp": { + "type": "string", + "description": "RFC 3339 date and time at which the object was created; populated by the system, read-only; null for lists" + }, + "deletionTimestamp": { + "type": "string", + "description": "RFC 3339 date and time at which the object will be deleted; populated by the system when a graceful deletion is requested, read-only; if not set, graceful deletion of the object has not been requested" + }, + "generateName": { + "type": "string", + "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" + }, + "kind": { + "type": "string", + "description": "kind of object, in CamelCase; cannot be updated" + }, + "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": { + "type": "string", + "description": "string that identifies an object. Must be unique within a namespace; cannot be updated" + }, + "namespace": { + "type": "string", + "description": "namespace of the object; cannot be updated" + }, + "resourceVersion": { + "type": "string", + "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" + }, + "selfLink": { + "type": "string", + "description": "URL for the object; populated by the system, read-only" + }, + "uid": { + "type": "string", + "description": "unique UUID across space and time; populated by the system; read-only" + } + } + }, + "v1beta3.ComponentStatusList": { + "id": "v1beta3.ComponentStatusList", + "required": [ + "items" + ], + "properties": { + "apiVersion": { + "type": "string", + "description": "version of the schema the object should have" + }, + "items": { + "type": "array", + "items": { + "$ref": "v1beta3.ComponentStatus" + }, + "description": "list of component status objects" + }, + "kind": { + "type": "string", + "description": "kind of object, in CamelCase; cannot be updated" + }, + "resourceVersion": { + "type": "string", + "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" + }, + "selfLink": { + "type": "string", + "description": "URL for the object; populated by the system, read-only" + } + } + }, "v1beta3.Container": { "id": "v1beta3.Container", "required": [ @@ -9308,11 +9593,11 @@ }, "status": { "type": "string", - "description": "status of the condition, one of Full, None, Unknown" + "description": "status of the condition, one of True, False, Unknown" }, "type": { "type": "string", - "description": "type of node condition, one of Ready, Schedulable" + "description": "type of node condition, currently only Ready" } } }, @@ -9822,11 +10107,11 @@ "properties": { "status": { "type": "string", - "description": "status of the condition, one of Full, None, Unknown" + "description": "status of the condition, one of True, False, Unknown" }, "type": { "type": "string", - "description": "kind of the condition" + "description": "kind of the condition, currently only Ready" } } }, @@ -10724,15 +11009,15 @@ "id": "v1beta3.Volume", "required": [ "name", - "emptyDir", - "secret", + "gcePersistentDisk", + "iscsi", "glusterfs", "hostPath", + "emptyDir", "awsElasticBlockStore", "gitRepo", - "nfs", - "iscsi", - "gcePersistentDisk" + "secret", + "nfs" ], "properties": { "awsElasticBlockStore": { @@ -10803,4 +11088,4 @@ } } } - } + } \ No newline at end of file diff --git a/api/swagger-spec/version.json b/api/swagger-spec/version.json index 99287ea15bf..b7da015b840 100644 --- a/api/swagger-spec/version.json +++ b/api/swagger-spec/version.json @@ -24,4 +24,4 @@ ] } ] - } + } \ No newline at end of file diff --git a/pkg/api/v1beta1/types.go b/pkg/api/v1beta1/types.go index 493d59eedeb..4975718123d 100644 --- a/pkg/api/v1beta1/types.go +++ b/pkg/api/v1beta1/types.go @@ -993,7 +993,7 @@ const ( ) type NodeCondition struct { - Kind NodeConditionKind `json:"kind" description:"kind of the condition, one of Reachable, Ready, Schedulable"` + Kind NodeConditionKind `json:"kind" description:"kind of the condition, current kinds: 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"` @@ -1607,7 +1607,7 @@ const ( type ComponentCondition struct { Type ComponentConditionType `json:"type" description:"type of component condition, currently only Healthy"` - Status ConditionStatus `json:"status" description:"current status of this component condition, one of True, False, Unknown"` + Status ConditionStatus `json:"status" description:"current status of this component condition, one of Full, None, Unknown"` Message string `json:"message,omitempty" description:"health check message received from the component"` Error string `json:"error,omitempty" description:"error code from health check attempt (if any)"` } diff --git a/pkg/api/v1beta2/types.go b/pkg/api/v1beta2/types.go index 14fab56566e..83a1f98037b 100644 --- a/pkg/api/v1beta2/types.go +++ b/pkg/api/v1beta2/types.go @@ -1018,7 +1018,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, Schedulable"` + Kind NodeConditionKind `json:"kind" description:"kind of the condition, current kinds: 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"` @@ -1670,7 +1670,7 @@ const ( type ComponentCondition struct { Type ComponentConditionType `json:"type" description:"type of component condition, currently only Healthy"` - Status ConditionStatus `json:"status" description:"current status of this component condition, one of True, False, Unknown"` + Status ConditionStatus `json:"status" description:"current status of this component condition, one of Full, None, Unknown"` Message string `json:"message,omitempty" description:"health check message received from the component"` Error string `json:"error,omitempty" description:"error code from health check attempt (if any)"` } diff --git a/pkg/api/v1beta3/types.go b/pkg/api/v1beta3/types.go index 065fe3bb37d..3db63126844 100644 --- a/pkg/api/v1beta3/types.go +++ b/pkg/api/v1beta3/types.go @@ -741,9 +741,9 @@ const ( // TODO: add LastTransitionTime, Reason, Message to match NodeCondition api. type PodCondition struct { // Type is the type of the condition - Type PodConditionType `json:"type" description:"kind of the condition"` + Type PodConditionType `json:"type" description:"kind of the condition, currently only Ready"` // Status is the status of the condition - Status ConditionStatus `json:"status" description:"status of the condition, one of Full, None, Unknown"` + Status ConditionStatus `json:"status" description:"status of the condition, one of True, False, Unknown"` } // RestartPolicy describes how the container should be restarted. @@ -1137,8 +1137,8 @@ const ( ) type NodeCondition struct { - 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"` + Type NodeConditionType `json:"type" description:"type of node condition, currently only Ready"` + Status ConditionStatus `json:"status" description:"status of the condition, one of True, False, Unknown"` LastHeartbeatTime util.Time `json:"lastHeartbeatTime,omitempty" description:"last time we got an update on a given condition"` LastTransitionTime util.Time `json:"lastTransitionTime,omitempty" description:"last time the condition transit from one status to another"` Reason string `json:"reason,omitempty" description:"(brief) reason for the condition's last transition"`