Merge master into dev-1.21 to keep in sync - SIG-Release 1.21 Docs team 3/17/21

Fixed merge conflict with /docs/reference/command-line-tools-reference/kube-apiserver.md and preferred master
2021-03-17 21:29:04 -07:00
parent 7afd404212 cb7edbf398
commit 9d56683e8b
60 changed files with 1705 additions and 698 deletions
@@ -54,7 +54,7 @@ In this example:
  {{< note >}}
  The `.spec.selector.matchLabels` field is a map of {key,value} pairs.
  A single {key,value} in the `matchLabels` map is equivalent to an element of `matchExpressions`,
-  whose key field is "key" the operator is "In", and the values array contains only "value".
+  whose `key` field is "key", the `operator` is "In", and the `values` array contains only "value".
  All of the requirements, from both `matchLabels` and `matchExpressions`, must be satisfied in order to match.
  {{< /note >}}