Merge remote-tracking branch 'upstream/main' into dev-1.24

2022-04-04 09:40:29 -07:00
parent 0b4f78f671 016148039b
commit 22643121ff
42 changed files with 1163 additions and 653 deletions
@@ -15,7 +15,6 @@ If the data you want to store are confidential, use a
 or use additional (third party) tools to keep your data private.
 {{< /caution >}}

-
 <!-- body -->
 ## Motivation

@@ -282,5 +281,3 @@ to the deleted ConfigMap, it is recommended to recreate these pods.
 * Read [Configure a Pod to Use a ConfigMap](/docs/tasks/configure-pod-container/configure-pod-configmap/).
 * Read [The Twelve-Factor App](https://12factor.net/) to understand the motivation for
  separating code from configuration.
-
-