diff --git a/api/swagger-spec/extensions_v1beta1.json b/api/swagger-spec/extensions_v1beta1.json
index 3d04a499760..cf8bd2f4abe 100644
--- a/api/swagger-spec/extensions_v1beta1.json
+++ b/api/swagger-spec/extensions_v1beta1.json
@@ -4760,6 +4760,10 @@
"azureFile": {
"$ref": "v1.AzureFileVolumeSource",
"description": "AzureFile represents an Azure File Service mount on the host and bind mount to the pod."
+ },
+ "configMap": {
+ "$ref": "v1.ConfigMapVolumeSource",
+ "description": "ConfigMap represents a configMap that should populate this volume"
}
}
},
@@ -5224,6 +5228,41 @@
}
}
},
+ "v1.ConfigMapVolumeSource": {
+ "id": "v1.ConfigMapVolumeSource",
+ "description": "Adapts a ConfigMap into a volume.\n\nThe contents of the target ConfigMap's Data field will be presented in a volume as files using the keys in the Data field as the file names, unless the items element is populated with specific mappings of keys to paths. ConfigMap volumes support ownership management and SELinux relabeling.",
+ "properties": {
+ "name": {
+ "type": "string",
+ "description": "Name of the referent. More info: http://releases.k8s.io/HEAD/docs/user-guide/identifiers.md#names"
+ },
+ "items": {
+ "type": "array",
+ "items": {
+ "$ref": "v1.KeyToPath"
+ },
+ "description": "If unspecified, each key-value pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the ConfigMap, the volume setup will error. Paths must be relative and may not contain the '..' path or start with '..'."
+ }
+ }
+ },
+ "v1.KeyToPath": {
+ "id": "v1.KeyToPath",
+ "description": "Maps a string key to a path within a volume.",
+ "required": [
+ "key",
+ "path"
+ ],
+ "properties": {
+ "key": {
+ "type": "string",
+ "description": "The key to project."
+ },
+ "path": {
+ "type": "string",
+ "description": "The relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'."
+ }
+ }
+ },
"v1.Container": {
"id": "v1.Container",
"description": "A single application container that you want to run within a pod.",
diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json
index a22ec44e894..1f10e2a1cda 100644
--- a/api/swagger-spec/v1.json
+++ b/api/swagger-spec/v1.json
@@ -15524,6 +15524,10 @@
"azureFile": {
"$ref": "v1.AzureFileVolumeSource",
"description": "AzureFile represents an Azure File Service mount on the host and bind mount to the pod."
+ },
+ "configMap": {
+ "$ref": "v1.ConfigMapVolumeSource",
+ "description": "ConfigMap represents a configMap that should populate this volume"
}
}
},
@@ -15633,6 +15637,41 @@
}
}
},
+ "v1.ConfigMapVolumeSource": {
+ "id": "v1.ConfigMapVolumeSource",
+ "description": "Adapts a ConfigMap into a volume.\n\nThe contents of the target ConfigMap's Data field will be presented in a volume as files using the keys in the Data field as the file names, unless the items element is populated with specific mappings of keys to paths. ConfigMap volumes support ownership management and SELinux relabeling.",
+ "properties": {
+ "name": {
+ "type": "string",
+ "description": "Name of the referent. More info: http://releases.k8s.io/HEAD/docs/user-guide/identifiers.md#names"
+ },
+ "items": {
+ "type": "array",
+ "items": {
+ "$ref": "v1.KeyToPath"
+ },
+ "description": "If unspecified, each key-value pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the ConfigMap, the volume setup will error. Paths must be relative and may not contain the '..' path or start with '..'."
+ }
+ }
+ },
+ "v1.KeyToPath": {
+ "id": "v1.KeyToPath",
+ "description": "Maps a string key to a path within a volume.",
+ "required": [
+ "key",
+ "path"
+ ],
+ "properties": {
+ "key": {
+ "type": "string",
+ "description": "The key to project."
+ },
+ "path": {
+ "type": "string",
+ "description": "The relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'."
+ }
+ }
+ },
"v1.Container": {
"id": "v1.Container",
"description": "A single application container that you want to run within a pod.",
diff --git a/cmd/kubelet/app/plugins.go b/cmd/kubelet/app/plugins.go
index 40eb75c09c3..c9388d1278a 100644
--- a/cmd/kubelet/app/plugins.go
+++ b/cmd/kubelet/app/plugins.go
@@ -32,6 +32,7 @@ import (
"k8s.io/kubernetes/pkg/volume/azure_file"
"k8s.io/kubernetes/pkg/volume/cephfs"
"k8s.io/kubernetes/pkg/volume/cinder"
+ "k8s.io/kubernetes/pkg/volume/configmap"
"k8s.io/kubernetes/pkg/volume/downwardapi"
"k8s.io/kubernetes/pkg/volume/empty_dir"
"k8s.io/kubernetes/pkg/volume/fc"
@@ -80,6 +81,7 @@ func ProbeVolumePlugins(pluginDir string) []volume.VolumePlugin {
allPlugins = append(allPlugins, flocker.ProbeVolumePlugins()...)
allPlugins = append(allPlugins, flexvolume.ProbeVolumePlugins(pluginDir)...)
allPlugins = append(allPlugins, azure_file.ProbeVolumePlugins()...)
+ allPlugins = append(allPlugins, configmap.ProbeVolumePlugins()...)
return allPlugins
}
diff --git a/docs/api-reference/extensions/v1beta1/definitions.html b/docs/api-reference/extensions/v1beta1/definitions.html
index 6c8cf934c65..cb378740600 100755
--- a/docs/api-reference/extensions/v1beta1/definitions.html
+++ b/docs/api-reference/extensions/v1beta1/definitions.html
@@ -1678,6 +1678,50 @@ Both these may change in the future. Incoming requests are matched against the h
+
+
+
v1.ConfigMapVolumeSource
+
+
Adapts a ConfigMap into a volume.
+
+
+
The contents of the target ConfigMap’s Data field will be presented in a volume as files using the keys in the Data field as the file names, unless the items element is populated with specific mappings of keys to paths. ConfigMap volumes support ownership management and SELinux relabeling.
+
+
+
+
+
+
+
+
+
+
+
+| Name |
+Description |
+Required |
+Schema |
+Default |
+
+
+
+
+name |
+Name of the referent. More info: http://releases.k8s.io/HEAD/docs/user-guide/identifiers.md#names |
+false |
+string |
+ |
+
+
+items |
+If unspecified, each key-value pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the ConfigMap, the volume setup will error. Paths must be relative and may not contain the .. path or start with ... |
+false |
+v1.KeyToPath array |
+ |
+
+
+
+
unversioned.StatusDetails
@@ -3881,6 +3925,47 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
+
+
+
v1.KeyToPath
+
+
Maps a string key to a path within a volume.
+
+
+
+
+
+
+
+
+
+
+
+| Name |
+Description |
+Required |
+Schema |
+Default |
+
+
+
+
+key |
+The key to project. |
+true |
+string |
+ |
+
+
+path |
+The relative path of the file to map the key to. May not be an absolute path. May not contain the path element ... May not start with the string ... |
+true |
+string |
+ |
+
+
+
+
v1.DeleteOptions
@@ -4086,6 +4171,13 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
v1.AzureFileVolumeSource |
|
+
+configMap |
+ConfigMap represents a configMap that should populate this volume |
+false |
+v1.ConfigMapVolumeSource |
+ |
+
@@ -5273,7 +5365,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
diff --git a/docs/api-reference/v1/definitions.html b/docs/api-reference/v1/definitions.html
index 7c7f1e448e0..eaabcb460e2 100755
--- a/docs/api-reference/v1/definitions.html
+++ b/docs/api-reference/v1/definitions.html
@@ -594,47 +594,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-
-