diff --git a/api/swagger-spec/api.json b/api/swagger-spec/api.json index f86dea5dea4..08cfc5a5cac 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 f387f1fc70a..252566c2ba8 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 03e56febf7f..dc1a6fc7e3d 100644 --- a/api/swagger-spec/v1beta1.json +++ b/api/swagger-spec/v1beta1.json @@ -47,7 +47,7 @@ { "type": "v1beta1.EndpointsList", "method": "GET", - "summary": "list objects of kind Endpoints", + "summary": "list or watch objects of kind Endpoints", "nickname": "listEndpoints", "parameters": [ { @@ -135,7 +135,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Endpoints", "nickname": "watchEndpointslist", @@ -347,7 +347,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Endpoints", "nickname": "watchEndpoints", @@ -417,7 +417,7 @@ { "type": "v1beta1.EventList", "method": "GET", - "summary": "list objects of kind Event", + "summary": "list or watch objects of kind Event", "nickname": "listEvent", "parameters": [ { @@ -505,7 +505,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Event", "nickname": "watchEventlist", @@ -709,7 +709,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Event", "nickname": "watchEvent", @@ -779,7 +779,7 @@ { "type": "v1beta1.LimitRangeList", "method": "GET", - "summary": "list objects of kind LimitRange", + "summary": "list or watch objects of kind LimitRange", "nickname": "listLimitRange", "parameters": [ { @@ -867,7 +867,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of LimitRange", "nickname": "watchLimitRangelist", @@ -1071,7 +1071,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind LimitRange", "nickname": "watchLimitRange", @@ -1141,7 +1141,7 @@ { "type": "v1beta1.MinionList", "method": "GET", - "summary": "list objects of kind Node", + "summary": "list or watch objects of kind Node", "nickname": "listNode", "parameters": [ { @@ -1213,7 +1213,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Node", "nickname": "watchNodelist", @@ -1385,7 +1385,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Node", "nickname": "watchNode", @@ -1695,7 +1695,7 @@ { "type": "v1beta1.NamespaceList", "method": "GET", - "summary": "list objects of kind Namespace", + "summary": "list or watch objects of kind Namespace", "nickname": "listNamespace", "parameters": [ { @@ -1767,7 +1767,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Namespace", "nickname": "watchNamespacelist", @@ -1939,7 +1939,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Namespace", "nickname": "watchNamespace", @@ -2073,7 +2073,7 @@ { "type": "v1beta1.MinionList", "method": "GET", - "summary": "list objects of kind Node", + "summary": "list or watch objects of kind Node", "nickname": "listNode", "parameters": [ { @@ -2145,7 +2145,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Node", "nickname": "watchNodelist", @@ -2317,7 +2317,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Node", "nickname": "watchNode", @@ -2627,7 +2627,7 @@ { "type": "v1beta1.PersistentVolumeClaimList", "method": "GET", - "summary": "list objects of kind PersistentVolumeClaim", + "summary": "list or watch objects of kind PersistentVolumeClaim", "nickname": "listPersistentVolumeClaim", "parameters": [ { @@ -2715,7 +2715,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of PersistentVolumeClaim", "nickname": "watchPersistentVolumeClaimlist", @@ -2927,7 +2927,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind PersistentVolumeClaim", "nickname": "watchPersistentVolumeClaim", @@ -2997,7 +2997,7 @@ { "type": "v1beta1.PersistentVolumeList", "method": "GET", - "summary": "list objects of kind PersistentVolume", + "summary": "list or watch objects of kind PersistentVolume", "nickname": "listPersistentVolume", "parameters": [ { @@ -3069,7 +3069,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of PersistentVolume", "nickname": "watchPersistentVolumelist", @@ -3241,7 +3241,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind PersistentVolume", "nickname": "watchPersistentVolume", @@ -3339,7 +3339,7 @@ { "type": "v1beta1.PodList", "method": "GET", - "summary": "list objects of kind Pod", + "summary": "list or watch objects of kind Pod", "nickname": "listPod", "parameters": [ { @@ -3427,7 +3427,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Pod", "nickname": "watchPodlist", @@ -3639,7 +3639,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Pod", "nickname": "watchPod", @@ -4058,6 +4058,42 @@ } ] }, + { + "path": "/api/v1beta1/pods/{name}/log", + "description": "API at /api/v1beta1 version v1beta1", + "operations": [ + { + "type": "v1beta1.PodLogOptions", + "method": "GET", + "summary": "read the specified PodLogOptions", + "nickname": "readPodLogOptions", + "parameters": [ + { + "type": "string", + "paramType": "path", + "name": "name", + "description": "name of the PodLogOptions", + "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 + } + ], + "produces": [ + "application/json" + ], + "consumes": [ + "*/*" + ] + } + ] + }, { "path": "/api/v1beta1/pods/{name}/status", "description": "API at /api/v1beta1 version v1beta1", @@ -4109,7 +4145,7 @@ { "type": "v1beta1.ReplicationControllerList", "method": "GET", - "summary": "list objects of kind ReplicationController", + "summary": "list or watch objects of kind ReplicationController", "nickname": "listReplicationController", "parameters": [ { @@ -4197,7 +4233,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of ReplicationController", "nickname": "watchReplicationControllerlist", @@ -4409,7 +4445,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind ReplicationController", "nickname": "watchReplicationController", @@ -4479,7 +4515,7 @@ { "type": "v1beta1.ResourceQuotaList", "method": "GET", - "summary": "list objects of kind ResourceQuota", + "summary": "list or watch objects of kind ResourceQuota", "nickname": "listResourceQuota", "parameters": [ { @@ -4567,7 +4603,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of ResourceQuota", "nickname": "watchResourceQuotalist", @@ -4779,7 +4815,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind ResourceQuota", "nickname": "watchResourceQuota", @@ -4893,7 +4929,7 @@ { "type": "v1beta1.SecretList", "method": "GET", - "summary": "list objects of kind Secret", + "summary": "list or watch objects of kind Secret", "nickname": "listSecret", "parameters": [ { @@ -4981,7 +5017,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Secret", "nickname": "watchSecretlist", @@ -5185,7 +5221,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Secret", "nickname": "watchSecret", @@ -5255,7 +5291,7 @@ { "type": "v1beta1.ServiceList", "method": "GET", - "summary": "list objects of kind Service", + "summary": "list or watch objects of kind Service", "nickname": "listService", "parameters": [ { @@ -5343,7 +5379,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Service", "nickname": "watchServicelist", @@ -5547,7 +5583,7 @@ "description": "API at /api/v1beta1 version v1beta1", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Service", "nickname": "watchService", @@ -5932,14 +5968,23 @@ } ], "models": { - "*json.watchEvent": { - "id": "*json.watchEvent", - "properties": {} - }, "*v1beta1.DeleteOptions": { "id": "*v1beta1.DeleteOptions", "properties": {} }, + "json.WatchEvent": { + "id": "json.WatchEvent", + "properties": { + "object": { + "type": "string", + "description": "the object being watched; will match the type of the resource endpoint or be a Status object if the type is ERROR" + }, + "type": { + "type": "string", + "description": "the type of watch event; may be ADDED, MODIFIED, DELETED, or ERROR" + } + } + }, "uint64": { "id": "", "properties": null @@ -6683,32 +6728,6 @@ } } }, - "v1beta1.ISCSIVolumeSource": { - "id": "v1beta1.ISCSIVolumeSource", - "properties": { - "fsType": { - "type": "string", - "description": "file system type to mount, such as ext4, xfs, ntfs" - }, - "iqn": { - "type": "string", - "description": "iSCSI Qualified Name" - }, - "lun": { - "type": "integer", - "format": "int32", - "description": "iscsi target lun number" - }, - "readOnly": { - "type": "boolean", - "description": "read-only if true, read-write otherwise (false or unspecified)" - }, - "targetPortal": { - "type": "string", - "description": "iSCSI target portal" - } - } - }, "v1beta1.HTTPGetAction": { "id": "v1beta1.HTTPGetAction", "properties": { @@ -6755,6 +6774,32 @@ } } }, + "v1beta1.ISCSIVolumeSource": { + "id": "v1beta1.ISCSIVolumeSource", + "properties": { + "fsType": { + "type": "string", + "description": "file system type to mount, such as ext4, xfs, ntfs" + }, + "iqn": { + "type": "string", + "description": "iSCSI Qualified Name" + }, + "lun": { + "type": "integer", + "format": "int32", + "description": "iscsi target lun number" + }, + "readOnly": { + "type": "boolean", + "description": "read-only if true, read-write otherwise (false or unspecified)" + }, + "targetPortal": { + "type": "string", + "description": "iSCSI target portal" + } + } + }, "v1beta1.Lifecycle": { "id": "v1beta1.Lifecycle", "properties": { @@ -7860,6 +7905,63 @@ } } }, + "v1beta1.PodLogOptions": { + "id": "v1beta1.PodLogOptions", + "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" + }, + "container": { + "type": "string", + "description": "the container for which to stream logs; defaults to only container if there is one container in the pod" + }, + "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" + }, + "follow": { + "type": "boolean", + "description": "follow the log stream of the pod; defaults to false" + }, + "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" + }, + "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.PodState": { "id": "v1beta1.PodState", "properties": { @@ -8633,8 +8735,8 @@ "persistentDisk", "gitRepo", "secret", - "iscsi", - "nfs" + "nfs", + "iscsi" ], "properties": { "emptyDir": { @@ -8649,6 +8751,10 @@ "$ref": "v1beta1.HostPathVolumeSource", "description": "pre-existing host file or directory; generally for privileged system daemons or other agents tied to the host" }, + "iscsi": { + "$ref": "v1beta1.ISCSIVolumeSource", + "description": "iSCSI disk attached to host machine on demand" + }, "nfs": { "$ref": "v1beta1.NFSVolumeSource", "description": "NFS volume that will be mounted in the host machine " @@ -8657,10 +8763,6 @@ "$ref": "v1beta1.GCEPersistentDiskVolumeSource", "description": "GCE disk resource attached to the host machine on demand" }, - "iscsi": { - "$ref": "v1beta1.ISCSIVolumeSource", - "description": "iSCSI disk attached to host machine on demand" - }, "secret": { "$ref": "v1beta1.SecretVolumeSource", "description": "secret to populate volume with" @@ -8668,4 +8770,4 @@ } } } - } \ No newline at end of file + } diff --git a/api/swagger-spec/v1beta2.json b/api/swagger-spec/v1beta2.json index e6c97a09caf..41b19776cd3 100644 --- a/api/swagger-spec/v1beta2.json +++ b/api/swagger-spec/v1beta2.json @@ -47,7 +47,7 @@ { "type": "v1beta2.EndpointsList", "method": "GET", - "summary": "list objects of kind Endpoints", + "summary": "list or watch objects of kind Endpoints", "nickname": "listEndpoints", "parameters": [ { @@ -135,7 +135,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Endpoints", "nickname": "watchEndpointslist", @@ -347,7 +347,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Endpoints", "nickname": "watchEndpoints", @@ -417,7 +417,7 @@ { "type": "v1beta2.EventList", "method": "GET", - "summary": "list objects of kind Event", + "summary": "list or watch objects of kind Event", "nickname": "listEvent", "parameters": [ { @@ -505,7 +505,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Event", "nickname": "watchEventlist", @@ -709,7 +709,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Event", "nickname": "watchEvent", @@ -779,7 +779,7 @@ { "type": "v1beta2.LimitRangeList", "method": "GET", - "summary": "list objects of kind LimitRange", + "summary": "list or watch objects of kind LimitRange", "nickname": "listLimitRange", "parameters": [ { @@ -867,7 +867,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of LimitRange", "nickname": "watchLimitRangelist", @@ -1071,7 +1071,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind LimitRange", "nickname": "watchLimitRange", @@ -1141,7 +1141,7 @@ { "type": "v1beta2.MinionList", "method": "GET", - "summary": "list objects of kind Node", + "summary": "list or watch objects of kind Node", "nickname": "listNode", "parameters": [ { @@ -1213,7 +1213,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Node", "nickname": "watchNodelist", @@ -1385,7 +1385,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Node", "nickname": "watchNode", @@ -1695,7 +1695,7 @@ { "type": "v1beta2.NamespaceList", "method": "GET", - "summary": "list objects of kind Namespace", + "summary": "list or watch objects of kind Namespace", "nickname": "listNamespace", "parameters": [ { @@ -1767,7 +1767,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Namespace", "nickname": "watchNamespacelist", @@ -1939,7 +1939,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Namespace", "nickname": "watchNamespace", @@ -2073,7 +2073,7 @@ { "type": "v1beta2.MinionList", "method": "GET", - "summary": "list objects of kind Node", + "summary": "list or watch objects of kind Node", "nickname": "listNode", "parameters": [ { @@ -2145,7 +2145,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Node", "nickname": "watchNodelist", @@ -2317,7 +2317,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Node", "nickname": "watchNode", @@ -2627,7 +2627,7 @@ { "type": "v1beta2.PersistentVolumeClaimList", "method": "GET", - "summary": "list objects of kind PersistentVolumeClaim", + "summary": "list or watch objects of kind PersistentVolumeClaim", "nickname": "listPersistentVolumeClaim", "parameters": [ { @@ -2715,7 +2715,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of PersistentVolumeClaim", "nickname": "watchPersistentVolumeClaimlist", @@ -2927,7 +2927,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind PersistentVolumeClaim", "nickname": "watchPersistentVolumeClaim", @@ -2997,7 +2997,7 @@ { "type": "v1beta2.PersistentVolumeList", "method": "GET", - "summary": "list objects of kind PersistentVolume", + "summary": "list or watch objects of kind PersistentVolume", "nickname": "listPersistentVolume", "parameters": [ { @@ -3069,7 +3069,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of PersistentVolume", "nickname": "watchPersistentVolumelist", @@ -3241,7 +3241,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind PersistentVolume", "nickname": "watchPersistentVolume", @@ -3339,7 +3339,7 @@ { "type": "v1beta2.PodList", "method": "GET", - "summary": "list objects of kind Pod", + "summary": "list or watch objects of kind Pod", "nickname": "listPod", "parameters": [ { @@ -3427,7 +3427,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Pod", "nickname": "watchPodlist", @@ -3639,7 +3639,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Pod", "nickname": "watchPod", @@ -4058,6 +4058,42 @@ } ] }, + { + "path": "/api/v1beta2/pods/{name}/log", + "description": "API at /api/v1beta2 version v1beta2", + "operations": [ + { + "type": "v1beta2.PodLogOptions", + "method": "GET", + "summary": "read the specified PodLogOptions", + "nickname": "readPodLogOptions", + "parameters": [ + { + "type": "string", + "paramType": "path", + "name": "name", + "description": "name of the PodLogOptions", + "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 + } + ], + "produces": [ + "application/json" + ], + "consumes": [ + "*/*" + ] + } + ] + }, { "path": "/api/v1beta2/pods/{name}/status", "description": "API at /api/v1beta2 version v1beta2", @@ -4109,7 +4145,7 @@ { "type": "v1beta2.ReplicationControllerList", "method": "GET", - "summary": "list objects of kind ReplicationController", + "summary": "list or watch objects of kind ReplicationController", "nickname": "listReplicationController", "parameters": [ { @@ -4197,7 +4233,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of ReplicationController", "nickname": "watchReplicationControllerlist", @@ -4409,7 +4445,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind ReplicationController", "nickname": "watchReplicationController", @@ -4479,7 +4515,7 @@ { "type": "v1beta2.ResourceQuotaList", "method": "GET", - "summary": "list objects of kind ResourceQuota", + "summary": "list or watch objects of kind ResourceQuota", "nickname": "listResourceQuota", "parameters": [ { @@ -4567,7 +4603,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of ResourceQuota", "nickname": "watchResourceQuotalist", @@ -4779,7 +4815,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind ResourceQuota", "nickname": "watchResourceQuota", @@ -4893,7 +4929,7 @@ { "type": "v1beta2.SecretList", "method": "GET", - "summary": "list objects of kind Secret", + "summary": "list or watch objects of kind Secret", "nickname": "listSecret", "parameters": [ { @@ -4981,7 +5017,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Secret", "nickname": "watchSecretlist", @@ -5185,7 +5221,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Secret", "nickname": "watchSecret", @@ -5255,7 +5291,7 @@ { "type": "v1beta2.ServiceList", "method": "GET", - "summary": "list objects of kind Service", + "summary": "list or watch objects of kind Service", "nickname": "listService", "parameters": [ { @@ -5343,7 +5379,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Service", "nickname": "watchServicelist", @@ -5547,7 +5583,7 @@ "description": "API at /api/v1beta2 version v1beta2", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Service", "nickname": "watchService", @@ -5932,14 +5968,23 @@ } ], "models": { - "*json.watchEvent": { - "id": "*json.watchEvent", - "properties": {} - }, "*v1beta2.DeleteOptions": { "id": "*v1beta2.DeleteOptions", "properties": {} }, + "json.WatchEvent": { + "id": "json.WatchEvent", + "properties": { + "object": { + "type": "string", + "description": "the object being watched; will match the type of the resource endpoint or be a Status object if the type is ERROR" + }, + "type": { + "type": "string", + "description": "the type of watch event; may be ADDED, MODIFIED, DELETED, or ERROR" + } + } + }, "uint64": { "id": "", "properties": null @@ -6679,32 +6724,6 @@ } } }, - "v1beta2.ISCSIVolumeSource": { - "id": "v1beta2.ISCSIVolumeSource", - "properties": { - "fsType": { - "type": "string", - "description": "file system type to mount, such as ext4, xfs, ntfs" - }, - "iqn": { - "type": "string", - "description": "iSCSI Qualified Name" - }, - "lun": { - "type": "integer", - "format": "int32", - "description": "iscsi target lun number" - }, - "readOnly": { - "type": "boolean", - "description": "read-only if true, read-write otherwise (false or unspecified)" - }, - "targetPortal": { - "type": "string", - "description": "iSCSI target portal" - } - } - }, "v1beta2.HTTPGetAction": { "id": "v1beta2.HTTPGetAction", "properties": { @@ -6751,6 +6770,32 @@ } } }, + "v1beta2.ISCSIVolumeSource": { + "id": "v1beta2.ISCSIVolumeSource", + "properties": { + "fsType": { + "type": "string", + "description": "file system type to mount, such as ext4, xfs, ntfs" + }, + "iqn": { + "type": "string", + "description": "iSCSI Qualified Name" + }, + "lun": { + "type": "integer", + "format": "int32", + "description": "iscsi target lun number" + }, + "readOnly": { + "type": "boolean", + "description": "read-only if true, read-write otherwise (false or unspecified)" + }, + "targetPortal": { + "type": "string", + "description": "iSCSI target portal" + } + } + }, "v1beta2.Lifecycle": { "id": "v1beta2.Lifecycle", "properties": { @@ -7849,6 +7894,63 @@ } } }, + "v1beta2.PodLogOptions": { + "id": "v1beta2.PodLogOptions", + "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" + }, + "container": { + "type": "string", + "description": "the container for which to stream logs; defaults to only container if there is one container in the pod" + }, + "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" + }, + "follow": { + "type": "boolean", + "description": "follow the log stream of the pod; defaults to false" + }, + "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" + }, + "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.PodState": { "id": "v1beta2.PodState", "properties": { @@ -8614,8 +8716,8 @@ "persistentDisk", "gitRepo", "secret", - "iscsi", - "nfs" + "nfs", + "iscsi" ], "properties": { "emptyDir": { @@ -8630,6 +8732,10 @@ "$ref": "v1beta2.HostPathVolumeSource", "description": "pre-existing host file or directory; generally for privileged system daemons or other agents tied to the host" }, + "iscsi": { + "$ref": "v1beta2.ISCSIVolumeSource", + "description": "iSCSI disk attached to host machine on demand" + }, "nfs": { "$ref": "v1beta2.NFSVolumeSource", "description": "NFS volume that will be mounted in the host machine" @@ -8638,10 +8744,6 @@ "$ref": "v1beta2.GCEPersistentDiskVolumeSource", "description": "GCE disk resource attached to the host machine on demand" }, - "iscsi": { - "$ref": "v1beta2.ISCSIVolumeSource", - "description": "iSCSI disk attached to host machine on demand" - }, "secret": { "$ref": "v1beta2.SecretVolumeSource", "description": "secret to populate volume" @@ -8649,4 +8751,4 @@ } } } - } \ No newline at end of file + } diff --git a/api/swagger-spec/v1beta3.json b/api/swagger-spec/v1beta3.json index 6f708e060bc..aa32c73bb2b 100644 --- a/api/swagger-spec/v1beta3.json +++ b/api/swagger-spec/v1beta3.json @@ -47,7 +47,7 @@ { "type": "v1beta3.EndpointsList", "method": "GET", - "summary": "list objects of kind Endpoints", + "summary": "list or watch objects of kind Endpoints", "nickname": "listEndpoints", "parameters": [ { @@ -135,7 +135,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Endpoints", "nickname": "watchEndpointslist", @@ -347,7 +347,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Endpoints", "nickname": "watchEndpoints", @@ -417,7 +417,7 @@ { "type": "v1beta3.EndpointsList", "method": "GET", - "summary": "list objects of kind Endpoints", + "summary": "list or watch objects of kind Endpoints", "nickname": "listEndpoints", "parameters": [ { @@ -467,7 +467,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Endpoints", "nickname": "watchEndpointslist", @@ -521,7 +521,7 @@ { "type": "v1beta3.EventList", "method": "GET", - "summary": "list objects of kind Event", + "summary": "list or watch objects of kind Event", "nickname": "listEvent", "parameters": [ { @@ -609,7 +609,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Event", "nickname": "watchEventlist", @@ -813,7 +813,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Event", "nickname": "watchEvent", @@ -883,7 +883,7 @@ { "type": "v1beta3.EventList", "method": "GET", - "summary": "list objects of kind Event", + "summary": "list or watch objects of kind Event", "nickname": "listEvent", "parameters": [ { @@ -933,7 +933,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Event", "nickname": "watchEventlist", @@ -987,7 +987,7 @@ { "type": "v1beta3.LimitRangeList", "method": "GET", - "summary": "list objects of kind LimitRange", + "summary": "list or watch objects of kind LimitRange", "nickname": "listLimitRange", "parameters": [ { @@ -1075,7 +1075,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of LimitRange", "nickname": "watchLimitRangelist", @@ -1279,7 +1279,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind LimitRange", "nickname": "watchLimitRange", @@ -1349,7 +1349,7 @@ { "type": "v1beta3.LimitRangeList", "method": "GET", - "summary": "list objects of kind LimitRange", + "summary": "list or watch objects of kind LimitRange", "nickname": "listLimitRange", "parameters": [ { @@ -1399,7 +1399,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of LimitRange", "nickname": "watchLimitRangelist", @@ -1453,7 +1453,7 @@ { "type": "v1beta3.NamespaceList", "method": "GET", - "summary": "list objects of kind Namespace", + "summary": "list or watch objects of kind Namespace", "nickname": "listNamespace", "parameters": [ { @@ -1525,7 +1525,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Namespace", "nickname": "watchNamespacelist", @@ -1697,7 +1697,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Namespace", "nickname": "watchNamespace", @@ -1831,7 +1831,7 @@ { "type": "v1beta3.NodeList", "method": "GET", - "summary": "list objects of kind Node", + "summary": "list or watch objects of kind Node", "nickname": "listNode", "parameters": [ { @@ -1903,7 +1903,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Node", "nickname": "watchNodelist", @@ -2075,7 +2075,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Node", "nickname": "watchNode", @@ -2385,7 +2385,7 @@ { "type": "v1beta3.PersistentVolumeClaimList", "method": "GET", - "summary": "list objects of kind PersistentVolumeClaim", + "summary": "list or watch objects of kind PersistentVolumeClaim", "nickname": "listPersistentVolumeClaim", "parameters": [ { @@ -2473,7 +2473,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of PersistentVolumeClaim", "nickname": "watchPersistentVolumeClaimlist", @@ -2685,7 +2685,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind PersistentVolumeClaim", "nickname": "watchPersistentVolumeClaim", @@ -2755,7 +2755,7 @@ { "type": "v1beta3.PersistentVolumeClaimList", "method": "GET", - "summary": "list objects of kind PersistentVolumeClaim", + "summary": "list or watch objects of kind PersistentVolumeClaim", "nickname": "listPersistentVolumeClaim", "parameters": [ { @@ -2805,7 +2805,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of PersistentVolumeClaim", "nickname": "watchPersistentVolumeClaimlist", @@ -2859,7 +2859,7 @@ { "type": "v1beta3.PersistentVolumeList", "method": "GET", - "summary": "list objects of kind PersistentVolume", + "summary": "list or watch objects of kind PersistentVolume", "nickname": "listPersistentVolume", "parameters": [ { @@ -2931,7 +2931,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of PersistentVolume", "nickname": "watchPersistentVolumelist", @@ -3103,7 +3103,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind PersistentVolume", "nickname": "watchPersistentVolume", @@ -3201,7 +3201,7 @@ { "type": "v1beta3.PodList", "method": "GET", - "summary": "list objects of kind Pod", + "summary": "list or watch objects of kind Pod", "nickname": "listPod", "parameters": [ { @@ -3289,7 +3289,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Pod", "nickname": "watchPodlist", @@ -3501,7 +3501,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Pod", "nickname": "watchPod", @@ -3891,7 +3891,7 @@ { "type": "v1beta3.PodList", "method": "GET", - "summary": "list objects of kind Pod", + "summary": "list or watch objects of kind Pod", "nickname": "listPod", "parameters": [ { @@ -3941,7 +3941,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Pod", "nickname": "watchPodlist", @@ -4032,6 +4032,42 @@ } ] }, + { + "path": "/api/v1beta3/namespaces/{namespaces}/pods/{name}/log", + "description": "API at /api/v1beta3 version v1beta3", + "operations": [ + { + "type": "v1beta3.PodLogOptions", + "method": "GET", + "summary": "read the specified PodLogOptions", + "nickname": "readPodLogOptions", + "parameters": [ + { + "type": "string", + "paramType": "path", + "name": "name", + "description": "name of the PodLogOptions", + "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 + } + ], + "produces": [ + "application/json" + ], + "consumes": [ + "*/*" + ] + } + ] + }, { "path": "/api/v1beta3/namespaces/{namespaces}/pods/{name}/status", "description": "API at /api/v1beta3 version v1beta3", @@ -4083,7 +4119,7 @@ { "type": "v1beta3.ReplicationControllerList", "method": "GET", - "summary": "list objects of kind ReplicationController", + "summary": "list or watch objects of kind ReplicationController", "nickname": "listReplicationController", "parameters": [ { @@ -4171,7 +4207,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of ReplicationController", "nickname": "watchReplicationControllerlist", @@ -4383,7 +4419,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind ReplicationController", "nickname": "watchReplicationController", @@ -4453,7 +4489,7 @@ { "type": "v1beta3.ReplicationControllerList", "method": "GET", - "summary": "list objects of kind ReplicationController", + "summary": "list or watch objects of kind ReplicationController", "nickname": "listReplicationController", "parameters": [ { @@ -4503,7 +4539,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of ReplicationController", "nickname": "watchReplicationControllerlist", @@ -4557,7 +4593,7 @@ { "type": "v1beta3.ResourceQuotaList", "method": "GET", - "summary": "list objects of kind ResourceQuota", + "summary": "list or watch objects of kind ResourceQuota", "nickname": "listResourceQuota", "parameters": [ { @@ -4645,7 +4681,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of ResourceQuota", "nickname": "watchResourceQuotalist", @@ -4857,7 +4893,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind ResourceQuota", "nickname": "watchResourceQuota", @@ -4927,7 +4963,7 @@ { "type": "v1beta3.ResourceQuotaList", "method": "GET", - "summary": "list objects of kind ResourceQuota", + "summary": "list or watch objects of kind ResourceQuota", "nickname": "listResourceQuota", "parameters": [ { @@ -4977,7 +5013,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of ResourceQuota", "nickname": "watchResourceQuotalist", @@ -5075,7 +5111,7 @@ { "type": "v1beta3.SecretList", "method": "GET", - "summary": "list objects of kind Secret", + "summary": "list or watch objects of kind Secret", "nickname": "listSecret", "parameters": [ { @@ -5163,7 +5199,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Secret", "nickname": "watchSecretlist", @@ -5367,7 +5403,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Secret", "nickname": "watchSecret", @@ -5437,7 +5473,7 @@ { "type": "v1beta3.SecretList", "method": "GET", - "summary": "list objects of kind Secret", + "summary": "list or watch objects of kind Secret", "nickname": "listSecret", "parameters": [ { @@ -5487,7 +5523,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Secret", "nickname": "watchSecretlist", @@ -5541,7 +5577,7 @@ { "type": "v1beta3.ServiceList", "method": "GET", - "summary": "list objects of kind Service", + "summary": "list or watch objects of kind Service", "nickname": "listService", "parameters": [ { @@ -5629,7 +5665,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Service", "nickname": "watchServicelist", @@ -5833,7 +5869,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch changes to an object of kind Service", "nickname": "watchService", @@ -6223,7 +6259,7 @@ { "type": "v1beta3.ServiceList", "method": "GET", - "summary": "list objects of kind Service", + "summary": "list or watch objects of kind Service", "nickname": "listService", "parameters": [ { @@ -6273,7 +6309,7 @@ "description": "API at /api/v1beta3 version v1beta3", "operations": [ { - "type": "*json.watchEvent", + "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Service", "nickname": "watchServicelist", @@ -6322,14 +6358,23 @@ } ], "models": { - "*json.watchEvent": { - "id": "*json.watchEvent", - "properties": {} - }, "*v1beta3.DeleteOptions": { "id": "*v1beta3.DeleteOptions", "properties": {} }, + "json.WatchEvent": { + "id": "json.WatchEvent", + "properties": { + "object": { + "type": "string", + "description": "the object being watched; will match the type of the resource endpoint or be a Status object if the type is ERROR" + }, + "type": { + "type": "string", + "description": "the type of watch event; may be ADDED, MODIFIED, DELETED, or ERROR" + } + } + }, "v1beta3.AccessModeType": { "id": "v1beta3.AccessModeType", "properties": {} @@ -7016,32 +7061,6 @@ } } }, - "v1beta3.ISCSIVolumeSource": { - "id": "v1beta3.ISCSIVolumeSource", - "properties": { - "fsType": { - "type": "string", - "description": "file system type to mount, such as ext4, xfs, ntfs" - }, - "iqn": { - "type": "string", - "description": "iSCSI Qualified Name" - }, - "lun": { - "type": "integer", - "format": "int32", - "description": "iscsi target lun number" - }, - "readOnly": { - "type": "boolean", - "description": "read-only if true, read-write otherwise (false or unspecified)" - }, - "targetPortal": { - "type": "string", - "description": "iSCSI target portal" - } - } - }, "v1beta3.HTTPGetAction": { "id": "v1beta3.HTTPGetAction", "properties": { @@ -7088,6 +7107,32 @@ } } }, + "v1beta3.ISCSIVolumeSource": { + "id": "v1beta3.ISCSIVolumeSource", + "properties": { + "fsType": { + "type": "string", + "description": "file system type to mount, such as ext4, xfs, ntfs" + }, + "iqn": { + "type": "string", + "description": "iSCSI Qualified Name" + }, + "lun": { + "type": "integer", + "format": "int32", + "description": "iscsi target lun number" + }, + "readOnly": { + "type": "boolean", + "description": "read-only if true, read-write otherwise (false or unspecified)" + }, + "targetPortal": { + "type": "string", + "description": "iSCSI target portal" + } + } + }, "v1beta3.Lifecycle": { "id": "v1beta3.Lifecycle", "properties": { @@ -7843,8 +7888,8 @@ "v1beta3.PersistentVolumeSpec": { "id": "v1beta3.PersistentVolumeSpec", "required": [ - "gcePersistentDisk", - "hostPath" + "hostPath", + "gcePersistentDisk" ], "properties": { "accessModes": { @@ -7990,6 +8035,27 @@ } } }, + "v1beta3.PodLogOptions": { + "id": "v1beta3.PodLogOptions", + "properties": { + "apiVersion": { + "type": "string", + "description": "version of the schema the object should have" + }, + "container": { + "type": "string", + "description": "the container for which to stream logs; defaults to only container if there is one container in the pod" + }, + "follow": { + "type": "boolean", + "description": "follow the log stream of the pod; defaults to false" + }, + "kind": { + "type": "string", + "description": "kind of object, in CamelCase; cannot be updated" + } + } + }, "v1beta3.PodSpec": { "id": "v1beta3.PodSpec", "required": [ @@ -8681,13 +8747,13 @@ "id": "v1beta3.Volume", "required": [ "name", + "emptyDir", "gcePersistentDisk", "gitRepo", "secret", "nfs", - "hostPath", "iscsi", - "emptyDir" + "hostPath" ], "properties": { "emptyDir": { @@ -8706,6 +8772,10 @@ "$ref": "v1beta3.HostPathVolumeSource", "description": "pre-existing host file or directory; generally for privileged system daemons or other agents tied to the host" }, + "iscsi": { + "$ref": "v1beta3.ISCSIVolumeSource", + "description": "iSCSI disk attached to host machine on demand" + }, "name": { "type": "string", "description": "volume name; must be a DNS_LABEL and unique within the pod" @@ -8714,10 +8784,6 @@ "$ref": "v1beta3.NFSVolumeSource", "description": "NFS volume that will be mounted in the host machine" }, - "iscsi": { - "$ref": "v1beta3.ISCSIVolumeSource", - "description": "iSCSI disk attached to host machine on demand" - }, "secret": { "$ref": "v1beta3.SecretVolumeSource", "description": "secret to populate volume" @@ -8746,4 +8812,4 @@ } } } - } \ No newline at end of file + } diff --git a/api/swagger-spec/version.json b/api/swagger-spec/version.json index b7da015b840..99287ea15bf 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/apiserver/api_installer.go b/pkg/apiserver/api_installer.go index 92c861d5624..7552d8ef2dc 100644 --- a/pkg/apiserver/api_installer.go +++ b/pkg/apiserver/api_installer.go @@ -357,6 +357,12 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag if err := addObjectParams(ws, route, versionedListOptions); err != nil { return err } + switch { + case isLister && isWatcher: + route.Doc("list or watch objects of kind " + kind) + case isWatcher: + route.Doc("watch objects of kind " + kind) + } addParams(route, action.Params) ws.Route(route) case "PUT": // Update a resource. @@ -405,7 +411,7 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag Doc("watch changes to an object of kind " + kind). Operation("watch" + kind). Produces("application/json"). - Writes(watchjson.NewWatchEvent()) + Writes(watchjson.WatchEvent{}) if err := addObjectParams(ws, route, versionedListOptions); err != nil { return err } @@ -418,7 +424,7 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag Doc("watch individual changes to a list of " + kind). Operation("watch" + kind + "list"). Produces("application/json"). - Writes(watchjson.NewWatchEvent()) + Writes(watchjson.WatchEvent{}) if err := addObjectParams(ws, route, versionedListOptions); err != nil { return err } diff --git a/pkg/watch/json/decoder.go b/pkg/watch/json/decoder.go index 416ef110953..805272e2078 100644 --- a/pkg/watch/json/decoder.go +++ b/pkg/watch/json/decoder.go @@ -46,7 +46,7 @@ func NewDecoder(r io.ReadCloser, codec runtime.Codec) *Decoder { // Decode blocks until it can return the next object in the writer. Returns an error // if the writer is closed or an object can't be decoded. func (d *Decoder) Decode() (watch.EventType, runtime.Object, error) { - var got watchEvent + var got WatchEvent if err := d.decoder.Decode(&got); err != nil { return "", nil, err } diff --git a/pkg/watch/json/decoder_test.go b/pkg/watch/json/decoder_test.go index 91eeb5936c7..636c932ea5f 100644 --- a/pkg/watch/json/decoder_test.go +++ b/pkg/watch/json/decoder_test.go @@ -42,7 +42,7 @@ func TestDecoder(t *testing.T) { if err != nil { t.Fatalf("Unexpected error %v", err) } - if err := encoder.Encode(&watchEvent{eventType, runtime.RawExtension{json.RawMessage(data)}}); err != nil { + if err := encoder.Encode(&WatchEvent{eventType, runtime.RawExtension{json.RawMessage(data)}}); err != nil { t.Errorf("Unexpected error %v", err) } in.Close() diff --git a/pkg/watch/json/encoder.go b/pkg/watch/json/encoder.go index f6895f6e485..fc57ac1c7c4 100644 --- a/pkg/watch/json/encoder.go +++ b/pkg/watch/json/encoder.go @@ -25,7 +25,7 @@ import ( ) // Encoder implements the json.Encoder interface for io.Writers that -// should serialize watchEvent objects into JSON. It will encode any object +// should serialize WatchEvent objects into JSON. It will encode any object // registered in the supplied codec and return an error otherwies. type Encoder struct { w io.Writer diff --git a/pkg/watch/json/types.go b/pkg/watch/json/types.go index 66c297a029a..ae82fb85368 100644 --- a/pkg/watch/json/types.go +++ b/pkg/watch/json/types.go @@ -25,21 +25,18 @@ import ( "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" ) -// watchEvent objects are streamed from the api server in response to a watch request. -// These are not API objects and are unversioned today. -type watchEvent struct { - // The type of the watch event; added, modified, or deleted. - Type watch.EventType `json:"type,omitempty"` +// WatchEvent objects are streamed from the api server in response to a watch request. +// These are not API objects and may not be changed in a backward-incompatible way. +// TODO: move to a public, versioned object now that RawExtension conversions are possible +// in the schema. +type WatchEvent struct { + // The type of the watch event; added, modified, deleted, or error. + Type watch.EventType `json:"type,omitempty" description:"the type of watch event; may be ADDED, MODIFIED, DELETED, or ERROR"` // For added or modified objects, this is the new object; for deleted objects, // it's the state of the object immediately prior to its deletion. // For errors, it's an api.Status. - Object runtime.RawExtension `json:"object,omitempty"` -} - -// NewWatchEvent returns the serialization form of watchEvent for structured schemas -func NewWatchEvent() interface{} { - return &watchEvent{} + Object runtime.RawExtension `json:"object,omitempty" description:"the object being watched; will match the type of the resource endpoint or be a Status object if the type is ERROR"` } // Object converts a watch.Event into an appropriately serializable JSON object @@ -52,5 +49,5 @@ func Object(codec runtime.Codec, event *watch.Event) (interface{}, error) { if err != nil { return nil, err } - return &watchEvent{event.Type, runtime.RawExtension{json.RawMessage(data)}}, nil + return &WatchEvent{event.Type, runtime.RawExtension{json.RawMessage(data)}}, nil }