Merge master into dev-1.22 to keep in sync

This commit is contained in:
Victor Palade
2021-08-04 19:43:06 +02:00
31 changed files with 417 additions and 149 deletions
@@ -146,7 +146,7 @@ For information about passing flags to control plane components see:
By default, kubeadm pulls images from `k8s.gcr.io`. If the
requested Kubernetes version is a CI label (such as `ci/latest`)
`gcr.io/kubernetes-ci-images` is used.
`gcr.io/k8s-staging-ci-images` is used.
You can override this behavior by using [kubeadm with a configuration file](#config-file).
Allowed customization are: