Merge branch 'sdminonne-container_sidecar'

This commit is contained in:
Brendan Burns
2015-09-02 10:11:25 -07:00
25 changed files with 1925 additions and 43 deletions

View File

@@ -12557,6 +12557,10 @@
"cephfs": {
"$ref": "v1.CephFSVolumeSource",
"description": "CephFS represents a Ceph FS mount on the host that shares a pod's lifetime"
},
"downwardAPI": {
"$ref": "v1.DownwardAPIVolumeSource",
"description": "DownwardAPI represents downward API about the pod that should populate this volume"
}
}
},
@@ -12618,6 +12622,54 @@
}
}
},
"v1.DownwardAPIVolumeSource": {
"id": "v1.DownwardAPIVolumeSource",
"description": "DownwardAPIVolumeSource represents a volume containing downward API info",
"properties": {
"items": {
"type": "array",
"items": {
"$ref": "v1.DownwardAPIVolumeFile"
},
"description": "Items is a list of downward API volume file"
}
}
},
"v1.DownwardAPIVolumeFile": {
"id": "v1.DownwardAPIVolumeFile",
"description": "DownwardAPIVolumeFile represents information to create the file containing the pod field",
"required": [
"path",
"fieldRef"
],
"properties": {
"path": {
"type": "string",
"description": "Required: Path is the relative path name of the file to be created. Must not be absolute or contain the '..' path. Must be utf-8 encoded. The first item of the relative path must not start with '..'"
},
"fieldRef": {
"$ref": "v1.ObjectFieldSelector",
"description": "Required: Selects a field of the pod: only annotations, labels, name and namespace are supported."
}
}
},
"v1.ObjectFieldSelector": {
"id": "v1.ObjectFieldSelector",
"description": "ObjectFieldSelector selects an APIVersioned field of an object.",
"required": [
"fieldPath"
],
"properties": {
"apiVersion": {
"type": "string",
"description": "Version of the schema the FieldPath is written in terms of, defaults to \"v1\"."
},
"fieldPath": {
"type": "string",
"description": "Path of the field to select in the specified API version."
}
}
},
"v1.Container": {
"id": "v1.Container",
"description": "A single application container that you want to run within a pod.",
@@ -12775,23 +12827,6 @@
}
}
},
"v1.ObjectFieldSelector": {
"id": "v1.ObjectFieldSelector",
"description": "ObjectFieldSelector selects an APIVersioned field of an object.",
"required": [
"fieldPath"
],
"properties": {
"apiVersion": {
"type": "string",
"description": "Version of the schema the FieldPath is written in terms of, defaults to \"v1\"."
},
"fieldPath": {
"type": "string",
"description": "Path of the field to select in the specified API version."
}
}
},
"v1.VolumeMount": {
"id": "v1.VolumeMount",
"description": "VolumeMount describes a mounting of a Volume within a container.",