Skip to content

Commit 22fb83d

Browse files
committed
Bumping versions
1 parent 2600cb6 commit 22fb83d

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

README.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -965,6 +965,11 @@ such a method. This, in turn, could be configured via environment properties. Fo
965965

966966
Failure to find a namespace from the above steps will result in an Exception being raised.
967967

968+
[[order_of_configMaps_and_secrets]]
969+
=== Order of ConfigMaps and Secrets
970+
971+
If, for whatever reason, you enabled both configmaps and secrets, and there is a common property between them, the value from the ConfigMap will have a higher precedence. That is: it will override whatever values are found in secrets.
972+
968973
=== `PropertySource` Reload
969974

970975
WARNING: This functionality has been deprecated in the 2020.0 release. Please see

0 commit comments

Comments
 (0)