Merge master into dev-1.22 to keep in sync.

2021-06-22 19:52:26 +02:00
parent 4840d9c0b4 5288513b58
commit 1064c8dcff
301 changed files with 6243 additions and 1967 deletions
@@ -41,7 +41,7 @@ the container starts.

        kubectl apply -f https://k8s.io/examples/debug/termination.yaml

-    In the YAML file, in the `cmd` and `args` fields, you can see that the
+    In the YAML file, in the `command` and `args` fields, you can see that the
    container sleeps for 10 seconds and then writes "Sleep expired" to
    the `/dev/termination-log` file. After the container writes
    the "Sleep expired" message, it terminates.