scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Versioning docs and examples for 1.0.0"

Browse Source 
This reverts commit efe72fd580.
This commit is contained in:
Brendan Burns
2015-07-10 21:03:27 -07:00
parent fcb7c8c15d
commit 9c84d0118f
6 changed files with 582 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

508
api/swagger-spec/v1.json
View File

File diff suppressed because it is too large Load Diff

104
api/swagger-spec/v1beta3.json
View File

@@ -11041,7 +11041,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ObjectMeta", "$ref": "v1beta3.ObjectMeta",
"description": "standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"target": { "target": {
"$ref": "v1beta3.ObjectReference", "$ref": "v1beta3.ObjectReference",
@@ -11074,7 +11074,7 @@
}, },
"resourceVersion": { "resourceVersion": {
"type": "string", "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: http://releases.k8s.io/v1.0.0/docs/api-conventions.md#concurrency-control-and-consistency" "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: http://releases.k8s.io/HEAD/docs/api-conventions.md#concurrency-control-and-consistency"
}, },
"generation": { "generation": {
"type": "integer", "type": "integer",
@@ -11124,7 +11124,7 @@
}, },
"resourceVersion": { "resourceVersion": {
"type": "string", "type": "string",
"description": "specific resourceVersion to which this reference is made, if any: http://releases.k8s.io/v1.0.0/docs/api-conventions.md#concurrency-control-and-consistency" "description": "specific resourceVersion to which this reference is made, if any: http://releases.k8s.io/HEAD/docs/api-conventions.md#concurrency-control-and-consistency"
}, },
"fieldPath": { "fieldPath": {
"type": "string", "type": "string",
@@ -11148,7 +11148,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ListMeta", "$ref": "v1beta3.ListMeta",
"description": "standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"items": { "items": {
"type": "array", "type": "array",
@@ -11168,7 +11168,7 @@
}, },
"resourceVersion": { "resourceVersion": {
"type": "string", "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: http://releases.k8s.io/v1.0.0/docs/api-conventions.md#concurrency-control-and-consistency" "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: http://releases.k8s.io/HEAD/docs/api-conventions.md#concurrency-control-and-consistency"
} }
} }
}, },
@@ -11185,7 +11185,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ObjectMeta", "$ref": "v1beta3.ObjectMeta",
"description": "standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"conditions": { "conditions": {
"type": "array", "type": "array",
@@ -11237,7 +11237,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ListMeta", "$ref": "v1beta3.ListMeta",
"description": "standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"items": { "items": {
"type": "array", "type": "array",
@@ -11264,7 +11264,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ObjectMeta", "$ref": "v1beta3.ObjectMeta",
"description": "standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"subsets": { "subsets": {
"type": "array", "type": "array",
@@ -11361,7 +11361,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ListMeta", "$ref": "v1beta3.ListMeta",
"description": "standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"status": { "status": {
"type": "string", "type": "string",
@@ -11462,7 +11462,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ListMeta", "$ref": "v1beta3.ListMeta",
"description": "standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"items": { "items": {
"type": "array", "type": "array",
@@ -11490,7 +11490,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ObjectMeta", "$ref": "v1beta3.ObjectMeta",
"description": "standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"involvedObject": { "involvedObject": {
"$ref": "v1beta3.ObjectReference", "$ref": "v1beta3.ObjectReference",
@@ -11552,7 +11552,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ListMeta", "$ref": "v1beta3.ListMeta",
"description": "standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"items": { "items": {
"type": "array", "type": "array",
@@ -11576,11 +11576,11 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ObjectMeta", "$ref": "v1beta3.ObjectMeta",
"description": "standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"spec": { "spec": {
"$ref": "v1beta3.LimitRangeSpec", "$ref": "v1beta3.LimitRangeSpec",
"description": "spec defines the limits enforced; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status" "description": "spec defines the limits enforced; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"
} }
} }
}, },
@@ -11636,7 +11636,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ListMeta", "$ref": "v1beta3.ListMeta",
"description": "standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"items": { "items": {
"type": "array", "type": "array",
@@ -11660,15 +11660,15 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ObjectMeta", "$ref": "v1beta3.ObjectMeta",
"description": "standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"spec": { "spec": {
"$ref": "v1beta3.NamespaceSpec", "$ref": "v1beta3.NamespaceSpec",
"description": "spec defines the behavior of the Namespace; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status" "description": "spec defines the behavior of the Namespace; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"
}, },
"status": { "status": {
"$ref": "v1beta3.NamespaceStatus", "$ref": "v1beta3.NamespaceStatus",
"description": "status describes the current status of a Namespace; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status" "description": "status describes the current status of a Namespace; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"
} }
} }
}, },
@@ -11713,7 +11713,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ListMeta", "$ref": "v1beta3.ListMeta",
"description": "standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"items": { "items": {
"type": "array", "type": "array",
@@ -11737,15 +11737,15 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ObjectMeta", "$ref": "v1beta3.ObjectMeta",
"description": "standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"spec": { "spec": {
"$ref": "v1beta3.NodeSpec", "$ref": "v1beta3.NodeSpec",
"description": "specification of a node; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status" "description": "specification of a node; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"
}, },
"status": { "status": {
"$ref": "v1beta3.NodeStatus", "$ref": "v1beta3.NodeStatus",
"description": "most recently observed status of the node; populated by the system, read-only; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status" "description": "most recently observed status of the node; populated by the system, read-only; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"
} }
} }
}, },
@@ -11775,7 +11775,7 @@
"properties": { "properties": {
"capacity": { "capacity": {
"type": "any", "type": "any",
"description": "compute resource capacity of the node; http://releases.k8s.io/v1.0.0/docs/resources.md" "description": "compute resource capacity of the node; http://releases.k8s.io/HEAD/docs/resources.md"
}, },
"phase": { "phase": {
"type": "string", "type": "string",
@@ -11911,7 +11911,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ListMeta", "$ref": "v1beta3.ListMeta",
"description": "standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#types-kinds" "description": "standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#types-kinds"
}, },
"items": { "items": {
"type": "array", "type": "array",
@@ -11935,7 +11935,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ObjectMeta", "$ref": "v1beta3.ObjectMeta",
"description": "standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"spec": { "spec": {
"$ref": "v1beta3.PersistentVolumeClaimSpec", "$ref": "v1beta3.PersistentVolumeClaimSpec",
@@ -12017,7 +12017,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ListMeta", "$ref": "v1beta3.ListMeta",
"description": "standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#types-kinds" "description": "standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#types-kinds"
}, },
"items": { "items": {
"type": "array", "type": "array",
@@ -12041,7 +12041,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ObjectMeta", "$ref": "v1beta3.ObjectMeta",
"description": "standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"spec": { "spec": {
"$ref": "v1beta3.PersistentVolumeSpec", "$ref": "v1beta3.PersistentVolumeSpec",
@@ -12333,7 +12333,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ListMeta", "$ref": "v1beta3.ListMeta",
"description": "standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#types-kinds" "description": "standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#types-kinds"
}, },
"items": { "items": {
"type": "array", "type": "array",
@@ -12357,15 +12357,15 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ObjectMeta", "$ref": "v1beta3.ObjectMeta",
"description": "standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"spec": { "spec": {
"$ref": "v1beta3.PodSpec", "$ref": "v1beta3.PodSpec",
"description": "specification of the desired behavior of the pod; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status" "description": "specification of the desired behavior of the pod; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"
}, },
"status": { "status": {
"$ref": "v1beta3.PodStatus", "$ref": "v1beta3.PodStatus",
"description": "most recently observed status of the pod; populated by the system, read-only; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status" "description": "most recently observed status of the pod; populated by the system, read-only; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"
} }
} }
}, },
@@ -13093,7 +13093,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ListMeta", "$ref": "v1beta3.ListMeta",
"description": "standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"items": { "items": {
"type": "array", "type": "array",
@@ -13117,11 +13117,11 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ObjectMeta", "$ref": "v1beta3.ObjectMeta",
"description": "standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"template": { "template": {
"$ref": "v1beta3.PodTemplateSpec", "$ref": "v1beta3.PodTemplateSpec",
"description": "the template of the desired behavior of the pod; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status" "description": "the template of the desired behavior of the pod; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"
} }
} }
}, },
@@ -13130,11 +13130,11 @@
"properties": { "properties": {
"metadata": { "metadata": {
"$ref": "v1beta3.ObjectMeta", "$ref": "v1beta3.ObjectMeta",
"description": "standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"spec": { "spec": {
"$ref": "v1beta3.PodSpec", "$ref": "v1beta3.PodSpec",
"description": "specification of the desired behavior of the pod; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status" "description": "specification of the desired behavior of the pod; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"
} }
} }
}, },
@@ -13154,7 +13154,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ListMeta", "$ref": "v1beta3.ListMeta",
"description": "standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"items": { "items": {
"type": "array", "type": "array",
@@ -13178,15 +13178,15 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ObjectMeta", "$ref": "v1beta3.ObjectMeta",
"description": "standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"spec": { "spec": {
"$ref": "v1beta3.ReplicationControllerSpec", "$ref": "v1beta3.ReplicationControllerSpec",
"description": "specification of the desired behavior of the replication controller; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status" "description": "specification of the desired behavior of the replication controller; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"
}, },
"status": { "status": {
"$ref": "v1beta3.ReplicationControllerStatus", "$ref": "v1beta3.ReplicationControllerStatus",
"description": "most recently observed status of the replication controller; populated by the system, read-only; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status" "description": "most recently observed status of the replication controller; populated by the system, read-only; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"
} }
} }
}, },
@@ -13242,7 +13242,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ListMeta", "$ref": "v1beta3.ListMeta",
"description": "standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"items": { "items": {
"type": "array", "type": "array",
@@ -13266,15 +13266,15 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ObjectMeta", "$ref": "v1beta3.ObjectMeta",
"description": "standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"spec": { "spec": {
"$ref": "v1beta3.ResourceQuotaSpec", "$ref": "v1beta3.ResourceQuotaSpec",
"description": "spec defines the desired quota; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status" "description": "spec defines the desired quota; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"
}, },
"status": { "status": {
"$ref": "v1beta3.ResourceQuotaStatus", "$ref": "v1beta3.ResourceQuotaStatus",
"description": "status defines the actual enforced quota and current usage; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status" "description": "status defines the actual enforced quota and current usage; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"
} }
} }
}, },
@@ -13316,7 +13316,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ListMeta", "$ref": "v1beta3.ListMeta",
"description": "standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"items": { "items": {
"type": "array", "type": "array",
@@ -13340,7 +13340,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ObjectMeta", "$ref": "v1beta3.ObjectMeta",
"description": "standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"data": { "data": {
"type": "any", "type": "any",
@@ -13368,7 +13368,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ListMeta", "$ref": "v1beta3.ListMeta",
"description": "standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"items": { "items": {
"type": "array", "type": "array",
@@ -13392,7 +13392,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ObjectMeta", "$ref": "v1beta3.ObjectMeta",
"description": "standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"secrets": { "secrets": {
"type": "array", "type": "array",
@@ -13426,7 +13426,7 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ListMeta", "$ref": "v1beta3.ListMeta",
"description": "standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"items": { "items": {
"type": "array", "type": "array",
@@ -13450,15 +13450,15 @@
}, },
"metadata": { "metadata": {
"$ref": "v1beta3.ObjectMeta", "$ref": "v1beta3.ObjectMeta",
"description": "standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata" "description": "standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"
}, },
"spec": { "spec": {
"$ref": "v1beta3.ServiceSpec", "$ref": "v1beta3.ServiceSpec",
"description": "specification of the desired behavior of the service; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status" "description": "specification of the desired behavior of the service; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"
}, },
"status": { "status": {
"$ref": "v1beta3.ServiceStatus", "$ref": "v1beta3.ServiceStatus",
"description": "most recently observed status of the service; populated by the system, read-only; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status" "description": "most recently observed status of the service; populated by the system, read-only; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"
} }
} }
}, },

12
docs/README.md
View File

@@ -1,5 +1,15 @@
# Kubernetes Documentation: releases.k8s.io/v1.0.0 # Kubernetes Documentation: releases.k8s.io/HEAD
<!-- BEGIN STRIP_FOR_RELEASE -->
<h1>*** PLEASE NOTE: This documentation applies to the HEAD of the source
tree only. If you are using a released version of Kubernetes, you almost
certainly want the docs that go with that version.</h1>
<strong>Documentation for specific releases can be found at
[releases.k8s.io](http://releases.k8s.io).</strong>
<!-- END STRIP_FOR_RELEASE -->
## Where to start ## Where to start

12
examples/README.md
View File

@@ -1,5 +1,15 @@
# Kubernetes Examples: releases.k8s.io/v1.0.0 # Kubernetes Examples: releases.k8s.io/HEAD
<!-- BEGIN STRIP_FOR_RELEASE -->
<h1>*** PLEASE NOTE: These examples apply to the HEAD of the source
tree only. If you are using a released version of Kubernetes, you almost
certainly want the examples that go with that version.</h1>
<strong>Examples for specific releases can be found at
[releases.k8s.io](http://releases.k8s.io).</strong>
<!-- END STRIP_FOR_RELEASE -->
## ##

392
pkg/api/v1/types.go
View File

File diff suppressed because it is too large Load Diff

116
pkg/api/v1beta3/types.go
View File

@@ -76,7 +76,7 @@ type ListMeta struct {
// concurrency and change monitoring endpoints. Clients must treat these values as opaque // concurrency and change monitoring endpoints. Clients must treat these values as opaque
// and values may only be valid for a particular resource or set of resources. Only servers // and values may only be valid for a particular resource or set of resources. Only servers
// will generate resource versions. // will generate resource versions.
ResourceVersion string `json:"resourceVersion,omitempty" 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: http://releases.k8s.io/v1.0.0/docs/api-conventions.md#concurrency-control-and-consistency"` ResourceVersion string `json:"resourceVersion,omitempty" 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: http://releases.k8s.io/HEAD/docs/api-conventions.md#concurrency-control-and-consistency"`
} }
// ObjectMeta is metadata that all persisted resources must have, which includes all objects // ObjectMeta is metadata that all persisted resources must have, which includes all objects
@@ -119,7 +119,7 @@ type ObjectMeta struct {
// concurrency, change detection, and the watch operation on a resource or set of resources. // concurrency, change detection, and the watch operation on a resource or set of resources.
// Clients must treat these values as opaque and values may only be valid for a particular // Clients must treat these values as opaque and values may only be valid for a particular
// resource or set of resources. Only servers will generate resource versions. // resource or set of resources. Only servers will generate resource versions.
ResourceVersion string `json:"resourceVersion,omitempty" 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: http://releases.k8s.io/v1.0.0/docs/api-conventions.md#concurrency-control-and-consistency"` ResourceVersion string `json:"resourceVersion,omitempty" 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: http://releases.k8s.io/HEAD/docs/api-conventions.md#concurrency-control-and-consistency"`
// A sequence number representing a specific generation of the desired state. // A sequence number representing a specific generation of the desired state.
// Currently only implemented by replication controllers. // Currently only implemented by replication controllers.
@@ -238,7 +238,7 @@ type PersistentVolumeSource struct {
type PersistentVolume struct { type PersistentVolume struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
//Spec defines a persistent volume owned by the cluster //Spec defines a persistent volume owned by the cluster
Spec PersistentVolumeSpec `json:"spec,omitempty" description:"specification of a persistent volume as provisioned by an administrator"` Spec PersistentVolumeSpec `json:"spec,omitempty" description:"specification of a persistent volume as provisioned by an administrator"`
@@ -289,14 +289,14 @@ type PersistentVolumeStatus struct {
type PersistentVolumeList struct { type PersistentVolumeList struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#types-kinds"` ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#types-kinds"`
Items []PersistentVolume `json:"items,omitempty" description:"list of persistent volumes"` Items []PersistentVolume `json:"items,omitempty" description:"list of persistent volumes"`
} }
// PersistentVolumeClaim is a user's request for and claim to a persistent volume // PersistentVolumeClaim is a user's request for and claim to a persistent volume
type PersistentVolumeClaim struct { type PersistentVolumeClaim struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
// Spec defines the volume requested by a pod author // Spec defines the volume requested by a pod author
Spec PersistentVolumeClaimSpec `json:"spec,omitempty" description:"the desired characteristics of a volume"` Spec PersistentVolumeClaimSpec `json:"spec,omitempty" description:"the desired characteristics of a volume"`
@@ -307,7 +307,7 @@ type PersistentVolumeClaim struct {
type PersistentVolumeClaimList struct { type PersistentVolumeClaimList struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#types-kinds"` ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#types-kinds"`
Items []PersistentVolumeClaim `json:"items,omitempty" description:"a list of persistent volume claims"` Items []PersistentVolumeClaim `json:"items,omitempty" description:"a list of persistent volume claims"`
} }
@@ -489,7 +489,7 @@ type GitRepoVolumeSource struct {
// SecretVolumeSource adapts a Secret into a VolumeSource // SecretVolumeSource adapts a Secret into a VolumeSource
// //
// http://releases.k8s.io/v1.0.0/docs/design/secrets.md // http://releases.k8s.io/HEAD/docs/design/secrets.md
type SecretVolumeSource struct { type SecretVolumeSource struct {
// Name of the secret in the pod's namespace to use // Name of the secret in the pod's namespace to use
SecretName string `json:"secretName" description:"secretName is the name of a secret in the pod's namespace"` SecretName string `json:"secretName" description:"secretName is the name of a secret in the pod's namespace"`
@@ -919,30 +919,30 @@ type PodStatus struct {
// PodStatusResult is a wrapper for PodStatus returned by kubelet that can be encode/decoded // PodStatusResult is a wrapper for PodStatus returned by kubelet that can be encode/decoded
type PodStatusResult struct { type PodStatusResult struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
// Status represents the current information about a pod. This data may not be up // Status represents the current information about a pod. This data may not be up
// to date. // to date.
Status PodStatus `json:"status,omitempty" description:"most recently observed status of the pod; populated by the system, read-only; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status"` Status PodStatus `json:"status,omitempty" description:"most recently observed status of the pod; populated by the system, read-only; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"`
} }
// Pod is a collection of containers that can run on a host. This resource is created // Pod is a collection of containers that can run on a host. This resource is created
// by clients and scheduled onto hosts. // by clients and scheduled onto hosts.
type Pod struct { type Pod struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
// Spec defines the behavior of a pod. // Spec defines the behavior of a pod.
Spec PodSpec `json:"spec,omitempty" description:"specification of the desired behavior of the pod; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status"` Spec PodSpec `json:"spec,omitempty" description:"specification of the desired behavior of the pod; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"`
// Status represents the current information about a pod. This data may not be up // Status represents the current information about a pod. This data may not be up
// to date. // to date.
Status PodStatus `json:"status,omitempty" description:"most recently observed status of the pod; populated by the system, read-only; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status"` Status PodStatus `json:"status,omitempty" description:"most recently observed status of the pod; populated by the system, read-only; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"`
} }
// PodList is a list of Pods. // PodList is a list of Pods.
type PodList struct { type PodList struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#types-kinds"` ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#types-kinds"`
Items []Pod `json:"items" description:"list of pods"` Items []Pod `json:"items" description:"list of pods"`
} }
@@ -950,25 +950,25 @@ type PodList struct {
// PodTemplateSpec describes the data a pod should have when created from a template // PodTemplateSpec describes the data a pod should have when created from a template
type PodTemplateSpec struct { type PodTemplateSpec struct {
// Metadata of the pods created from this template. // Metadata of the pods created from this template.
ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
// Spec defines the behavior of a pod. // Spec defines the behavior of a pod.
Spec PodSpec `json:"spec,omitempty" description:"specification of the desired behavior of the pod; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status"` Spec PodSpec `json:"spec,omitempty" description:"specification of the desired behavior of the pod; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"`
} }
// PodTemplate describes a template for creating copies of a predefined pod. // PodTemplate describes a template for creating copies of a predefined pod.
type PodTemplate struct { type PodTemplate struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
// Template defines the pods that will be created from this pod template // Template defines the pods that will be created from this pod template
Template PodTemplateSpec `json:"template,omitempty" description:"the template of the desired behavior of the pod; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status"` Template PodTemplateSpec `json:"template,omitempty" description:"the template of the desired behavior of the pod; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"`
} }
// PodTemplateList is a list of PodTemplates. // PodTemplateList is a list of PodTemplates.
type PodTemplateList struct { type PodTemplateList struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
Items []PodTemplate `json:"items" description:"list of pod templates"` Items []PodTemplate `json:"items" description:"list of pod templates"`
} }
@@ -1006,20 +1006,20 @@ type ReplicationControllerStatus struct {
type ReplicationController struct { type ReplicationController struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
// If the Labels of a ReplicationController are empty, they are defaulted to be the same as the Pod(s) that the replication controller manages. // If the Labels of a ReplicationController are empty, they are defaulted to be the same as the Pod(s) that the replication controller manages.
ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
// Spec defines the desired behavior of this replication controller. // Spec defines the desired behavior of this replication controller.
Spec ReplicationControllerSpec `json:"spec,omitempty" description:"specification of the desired behavior of the replication controller; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status"` Spec ReplicationControllerSpec `json:"spec,omitempty" description:"specification of the desired behavior of the replication controller; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"`
// Status is the current status of this replication controller. This data may be // Status is the current status of this replication controller. This data may be
// out of date by some window of time. // out of date by some window of time.
Status ReplicationControllerStatus `json:"status,omitempty" description:"most recently observed status of the replication controller; populated by the system, read-only; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status"` Status ReplicationControllerStatus `json:"status,omitempty" description:"most recently observed status of the replication controller; populated by the system, read-only; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"`
} }
// ReplicationControllerList is a collection of replication controllers. // ReplicationControllerList is a collection of replication controllers.
type ReplicationControllerList struct { type ReplicationControllerList struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
Items []ReplicationController `json:"items" description:"list of replication controllers"` Items []ReplicationController `json:"items" description:"list of replication controllers"`
} }
@@ -1138,13 +1138,13 @@ type ServicePort struct {
// will answer requests sent through the proxy. // will answer requests sent through the proxy.
type Service struct { type Service struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
// Spec defines the behavior of a service. // Spec defines the behavior of a service.
Spec ServiceSpec `json:"spec,omitempty" description:"specification of the desired behavior of the service; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status"` Spec ServiceSpec `json:"spec,omitempty" description:"specification of the desired behavior of the service; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"`
// Status represents the current status of a service. // Status represents the current status of a service.
Status ServiceStatus `json:"status,omitempty" description:"most recently observed status of the service; populated by the system, read-only; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status"` Status ServiceStatus `json:"status,omitempty" description:"most recently observed status of the service; populated by the system, read-only; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"`
} }
const ( const (
@@ -1156,7 +1156,7 @@ const (
// ServiceList holds a list of services. // ServiceList holds a list of services.
type ServiceList struct { type ServiceList struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
Items []Service `json:"items" description:"list of services"` Items []Service `json:"items" description:"list of services"`
} }
@@ -1167,7 +1167,7 @@ type ServiceList struct {
// * a set of secrets // * a set of secrets
type ServiceAccount struct { type ServiceAccount struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
// Secrets is the list of secrets allowed to be used by pods running using this ServiceAccount // Secrets is the list of secrets allowed to be used by pods running using this ServiceAccount
Secrets []ObjectReference `json:"secrets,omitempty" description:"list of secrets that can be used by pods running as this service account" patchStrategy:"merge" patchMergeKey:"name"` Secrets []ObjectReference `json:"secrets,omitempty" description:"list of secrets that can be used by pods running as this service account" patchStrategy:"merge" patchMergeKey:"name"`
@@ -1181,7 +1181,7 @@ type ServiceAccount struct {
// ServiceAccountList is a list of ServiceAccount objects // ServiceAccountList is a list of ServiceAccount objects
type ServiceAccountList struct { type ServiceAccountList struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
Items []ServiceAccount `json:"items" description:"list of ServiceAccounts"` Items []ServiceAccount `json:"items" description:"list of ServiceAccounts"`
} }
@@ -1200,7 +1200,7 @@ type ServiceAccountList struct {
// ] // ]
type Endpoints struct { type Endpoints struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
// The set of all endpoints is the union of all subsets. // The set of all endpoints is the union of all subsets.
Subsets []EndpointSubset `json:"subsets" description:"sets of addresses and ports that comprise a service"` Subsets []EndpointSubset `json:"subsets" description:"sets of addresses and ports that comprise a service"`
@@ -1247,7 +1247,7 @@ type EndpointPort struct {
// EndpointsList is a list of endpoints. // EndpointsList is a list of endpoints.
type EndpointsList struct { type EndpointsList struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
Items []Endpoints `json:"items" description:"list of endpoints"` Items []Endpoints `json:"items" description:"list of endpoints"`
} }
@@ -1287,8 +1287,8 @@ type NodeSystemInfo struct {
// NodeStatus is information about the current status of a node. // NodeStatus is information about the current status of a node.
type NodeStatus struct { type NodeStatus struct {
// Capacity represents the available resources of a node. // Capacity represents the available resources of a node.
// see http://releases.k8s.io/v1.0.0/docs/resources.md for more details. // see http://releases.k8s.io/HEAD/docs/resources.md for more details.
Capacity ResourceList `json:"capacity,omitempty" description:"compute resource capacity of the node; http://releases.k8s.io/v1.0.0/docs/resources.md"` Capacity ResourceList `json:"capacity,omitempty" description:"compute resource capacity of the node; http://releases.k8s.io/HEAD/docs/resources.md"`
// NodePhase is the current lifecycle phase of the node. // NodePhase is the current lifecycle phase of the node.
Phase NodePhase `json:"phase,omitempty" description:"most recently observed lifecycle phase of the node"` Phase NodePhase `json:"phase,omitempty" description:"most recently observed lifecycle phase of the node"`
// Conditions is an array of current node conditions. // Conditions is an array of current node conditions.
@@ -1363,19 +1363,19 @@ type ResourceList map[ResourceName]resource.Quantity
// The name of the node according to etcd is in ID. // The name of the node according to etcd is in ID.
type Node struct { type Node struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
// Spec defines the behavior of a node. // Spec defines the behavior of a node.
Spec NodeSpec `json:"spec,omitempty" description:"specification of a node; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status"` Spec NodeSpec `json:"spec,omitempty" description:"specification of a node; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"`
// Status describes the current status of a Node // Status describes the current status of a Node
Status NodeStatus `json:"status,omitempty" description:"most recently observed status of the node; populated by the system, read-only; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status"` Status NodeStatus `json:"status,omitempty" description:"most recently observed status of the node; populated by the system, read-only; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"`
} }
// NodeList is a list of minions. // NodeList is a list of minions.
type NodeList struct { type NodeList struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
Items []Node `json:"items" description:"list of nodes"` Items []Node `json:"items" description:"list of nodes"`
} }
@@ -1413,19 +1413,19 @@ const (
// Use of multiple namespaces is optional // Use of multiple namespaces is optional
type Namespace struct { type Namespace struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
// Spec defines the behavior of the Namespace. // Spec defines the behavior of the Namespace.
Spec NamespaceSpec `json:"spec,omitempty" description:"spec defines the behavior of the Namespace; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status"` Spec NamespaceSpec `json:"spec,omitempty" description:"spec defines the behavior of the Namespace; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"`
// Status describes the current status of a Namespace // Status describes the current status of a Namespace
Status NamespaceStatus `json:"status,omitempty" description:"status describes the current status of a Namespace; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status"` Status NamespaceStatus `json:"status,omitempty" description:"status describes the current status of a Namespace; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"`
} }
// NamespaceList is a list of Namespaces. // NamespaceList is a list of Namespaces.
type NamespaceList struct { type NamespaceList struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
// Items is the list of Namespace objects in the list // Items is the list of Namespace objects in the list
Items []Namespace `json:"items" description:"items is the list of Namespace objects in the list"` Items []Namespace `json:"items" description:"items is the list of Namespace objects in the list"`
@@ -1435,7 +1435,7 @@ type NamespaceList struct {
type Binding struct { type Binding struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
// ObjectMeta describes the object that is being bound. // ObjectMeta describes the object that is being bound.
ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
// Target is the object to bind to. // Target is the object to bind to.
Target ObjectReference `json:"target" description:"an object to bind to"` Target ObjectReference `json:"target" description:"an object to bind to"`
@@ -1513,7 +1513,7 @@ type PodProxyOptions struct {
// Status is a return value for calls that don't return other objects. // Status is a return value for calls that don't return other objects.
type Status struct { type Status struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
// One of: "Success" or "Failure" // One of: "Success" or "Failure"
Status string `json:"status,omitempty" description:"status of the operation; either Success, or Failure"` Status string `json:"status,omitempty" description:"status of the operation; either Success, or Failure"`
@@ -1671,7 +1671,7 @@ type ObjectReference struct {
Name string `json:"name,omitempty" description:"name of the referent"` Name string `json:"name,omitempty" description:"name of the referent"`
UID types.UID `json:"uid,omitempty" description:"uid of the referent"` UID types.UID `json:"uid,omitempty" description:"uid of the referent"`
APIVersion string `json:"apiVersion,omitempty" description:"API version of the referent"` APIVersion string `json:"apiVersion,omitempty" description:"API version of the referent"`
ResourceVersion string `json:"resourceVersion,omitempty" description:"specific resourceVersion to which this reference is made, if any: http://releases.k8s.io/v1.0.0/docs/api-conventions.md#concurrency-control-and-consistency"` ResourceVersion string `json:"resourceVersion,omitempty" description:"specific resourceVersion to which this reference is made, if any: http://releases.k8s.io/HEAD/docs/api-conventions.md#concurrency-control-and-consistency"`
// Optional. If referring to a piece of an object instead of an entire object, this string // Optional. If referring to a piece of an object instead of an entire object, this string
// should contain information to identify the sub-object. For example, if the object // should contain information to identify the sub-object. For example, if the object
@@ -1706,7 +1706,7 @@ type EventSource struct {
// TODO: Decide whether to store these separately or with the object they apply to. // TODO: Decide whether to store these separately or with the object they apply to.
type Event struct { type Event struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ObjectMeta `json:"metadata" description:"standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ObjectMeta `json:"metadata" description:"standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
// Required. The object that this event is about. // Required. The object that this event is about.
InvolvedObject ObjectReference `json:"involvedObject" description:"object this event is about"` InvolvedObject ObjectReference `json:"involvedObject" description:"object this event is about"`
@@ -1736,7 +1736,7 @@ type Event struct {
// EventList is a list of events. // EventList is a list of events.
type EventList struct { type EventList struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
Items []Event `json:"items" description:"list of events"` Items []Event `json:"items" description:"list of events"`
} }
@@ -1744,7 +1744,7 @@ type EventList struct {
// List holds a list of objects, which may not be known by the server. // List holds a list of objects, which may not be known by the server.
type List struct { type List struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
Items []runtime.RawExtension `json:"items" description:"list of objects"` Items []runtime.RawExtension `json:"items" description:"list of objects"`
} }
@@ -1780,16 +1780,16 @@ type LimitRangeSpec struct {
// LimitRange sets resource usage limits for each kind of resource in a Namespace // LimitRange sets resource usage limits for each kind of resource in a Namespace
type LimitRange struct { type LimitRange struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
// Spec defines the limits enforced // Spec defines the limits enforced
Spec LimitRangeSpec `json:"spec,omitempty" description:"spec defines the limits enforced; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status"` Spec LimitRangeSpec `json:"spec,omitempty" description:"spec defines the limits enforced; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"`
} }
// LimitRangeList is a list of LimitRange items. // LimitRangeList is a list of LimitRange items.
type LimitRangeList struct { type LimitRangeList struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
// Items is a list of LimitRange objects // Items is a list of LimitRange objects
Items []LimitRange `json:"items" description:"items is a list of LimitRange objects"` Items []LimitRange `json:"items" description:"items is a list of LimitRange objects"`
@@ -1828,19 +1828,19 @@ type ResourceQuotaStatus struct {
// ResourceQuota sets aggregate quota restrictions enforced per namespace // ResourceQuota sets aggregate quota restrictions enforced per namespace
type ResourceQuota struct { type ResourceQuota struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
// Spec defines the desired quota // Spec defines the desired quota
Spec ResourceQuotaSpec `json:"spec,omitempty" description:"spec defines the desired quota; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status"` Spec ResourceQuotaSpec `json:"spec,omitempty" description:"spec defines the desired quota; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"`
// Status defines the actual enforced quota and its current usage // Status defines the actual enforced quota and its current usage
Status ResourceQuotaStatus `json:"status,omitempty" description:"status defines the actual enforced quota and current usage; http://releases.k8s.io/v1.0.0/docs/api-conventions.md#spec-and-status"` Status ResourceQuotaStatus `json:"status,omitempty" description:"status defines the actual enforced quota and current usage; http://releases.k8s.io/HEAD/docs/api-conventions.md#spec-and-status"`
} }
// ResourceQuotaList is a list of ResourceQuota items // ResourceQuotaList is a list of ResourceQuota items
type ResourceQuotaList struct { type ResourceQuotaList struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
// Items is a list of ResourceQuota objects // Items is a list of ResourceQuota objects
Items []ResourceQuota `json:"items" description:"items is a list of ResourceQuota objects"` Items []ResourceQuota `json:"items" description:"items is a list of ResourceQuota objects"`
@@ -1850,7 +1850,7 @@ type ResourceQuotaList struct {
// the Data field must be less than MaxSecretSize bytes. // the Data field must be less than MaxSecretSize bytes.
type Secret struct { type Secret struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
// Data contains the secret data. Each key must be a valid DNS_SUBDOMAIN // Data contains the secret data. Each key must be a valid DNS_SUBDOMAIN
// or leading dot followed by valid DNS_SUBDOMAIN. // or leading dot followed by valid DNS_SUBDOMAIN.
@@ -1901,7 +1901,7 @@ const (
type SecretList struct { type SecretList struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
Items []Secret `json:"items" description:"items is a list of secret objects"` Items []Secret `json:"items" description:"items is a list of secret objects"`
} }
@@ -1924,14 +1924,14 @@ type ComponentCondition struct {
// ComponentStatus (and ComponentStatusList) holds the cluster validation info. // ComponentStatus (and ComponentStatusList) holds the cluster validation info.
type ComponentStatus struct { type ComponentStatus struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
Conditions []ComponentCondition `json:"conditions,omitempty" description:"list of component conditions observed" patchStrategy:"merge" patchMergeKey:"type"` Conditions []ComponentCondition `json:"conditions,omitempty" description:"list of component conditions observed" patchStrategy:"merge" patchMergeKey:"type"`
} }
type ComponentStatusList struct { type ComponentStatusList struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
Items []ComponentStatus `json:"items" description:"list of component status objects"` Items []ComponentStatus `json:"items" description:"list of component status objects"`
} }
@@ -1975,7 +1975,7 @@ type SELinuxOptions struct {
// RangeAllocation is not a public type // RangeAllocation is not a public type
type RangeAllocation struct { type RangeAllocation struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
ObjectMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/v1.0.0/docs/api-conventions.md#metadata"` ObjectMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/api-conventions.md#metadata"`
Range string `json:"range" description:"a range string that identifies the range represented by 'data'; required"` Range string `json:"range" description:"a range string that identifies the range represented by 'data'; required"`
Data []byte `json:"data" description:"a bit array containing all allocated addresses in the previous segment"` Data []byte `json:"data" description:"a bit array containing all allocated addresses in the previous segment"`