From 968cc459f4b247d3a1398ffeacf7abd91f280432 Mon Sep 17 00:00:00 2001 From: Xiaoyu Zhang Date: Wed, 26 Apr 2017 06:34:12 +0800 Subject: [PATCH] configmap.md: add v1.6 reminding (#3511) * configmap.md: add v1.6 reminding configmap.md: add v1.6 reminding * update configmap-envfrom update configmap-envfrom --- docs/tasks/configure-pod-container/configmap.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tasks/configure-pod-container/configmap.md b/docs/tasks/configure-pod-container/configmap.md index 1284ab18dd..e803e42148 100644 --- a/docs/tasks/configure-pod-container/configmap.md +++ b/docs/tasks/configure-pod-container/configmap.md @@ -271,7 +271,7 @@ data: log_level: INFO ``` -We can consume the keys of this ConfigMap in a pod like so: +`envFrom` is a feature introduced in Kubernetes 1.6. Consequently, if you are using v1.6 or above, you can consume the keys of that ConfigMap in a pod; otherwise, ignore `envFrom` in the following example: ```yaml apiVersion: v1