Merge pull request kubernetes#7039 from tengqm/env-override

Add note about environment variable overriding

Author: heckj

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
+will override any environment variables specified in the container image.
+{: .note}
+
 {% endcapture %}
 
 {% capture whatsnext %}