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

This commit is contained in:
Jesse Butler
2021-12-07 09:28:42 -05:00
2 changed files with 5 additions and 5 deletions
@@ -259,7 +259,7 @@ Other API server flags that are set unconditionally are:
#### Controller manager
The static Pod manifest for the API server is affected by following parameters provided by the users:
The static Pod manifest for the controller manager is affected by following parameters provided by the users:
- If kubeadm is invoked specifying a `--pod-network-cidr`, the subnet manager feature required for some CNI network plugins is enabled by
setting: