From 8fa52da2fa9454adccd0fd824c30e7829c25a677 Mon Sep 17 00:00:00 2001 From: Qiming Teng Date: Sun, 21 Jan 2018 17:10:59 +0800 Subject: [PATCH 1/2] Add note about environment variable overriding Closes: #3195 --- .../define-environment-variable-container.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/tasks/inject-data-application/define-environment-variable-container.md b/docs/tasks/inject-data-application/define-environment-variable-container.md index 80a43527f0..00c672c55f 100644 --- a/docs/tasks/inject-data-application/define-environment-variable-container.md +++ b/docs/tasks/inject-data-application/define-environment-variable-container.md @@ -64,6 +64,10 @@ Pod: 1. To exit the shell, enter `exit`. +**Note:** The environment variables set using the `env` or `envFrom` field +would override the ones specified in the container image. +{: .note} + {% endcapture %} {% capture whatsnext %} From f7801fcacb48999596b7db93087c387a8c1eaa5c Mon Sep 17 00:00:00 2001 From: Joseph Heck Date: Sun, 21 Jan 2018 11:41:25 -0800 Subject: [PATCH 2/2] tweaking language just slightly --- .../define-environment-variable-container.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tasks/inject-data-application/define-environment-variable-container.md b/docs/tasks/inject-data-application/define-environment-variable-container.md index 00c672c55f..5e019e7e55 100644 --- a/docs/tasks/inject-data-application/define-environment-variable-container.md +++ b/docs/tasks/inject-data-application/define-environment-variable-container.md @@ -65,7 +65,7 @@ Pod: 1. To exit the shell, enter `exit`. **Note:** The environment variables set using the `env` or `envFrom` field -would override the ones specified in the container image. +will override any environment variables specified in the container image. {: .note} {% endcapture %}