Skip to content

Commit

Permalink
Merge pull request kubernetes#29159 from spiffxp/use-k8s-staging-ci-i…
Browse files Browse the repository at this point in the history
…mages

kubeadm: use k8s-staging-ci-images instead of kubernetes-ci-images
  • Loading branch information
k8s-ci-robot authored Aug 3, 2021
2 parents 756c2fd + be9926d commit a54e81e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ Pour de l'information sur comment passer des options aux composants du control p

### Utiliser des images personnalisées {#custom-images}

Par défaut, kubeadm télécharge les images depuis `k8s.gcr.io`, à moins que la version demandée de Kubernetes soit une version Intégration Continue (CI). Dans ce cas, `gcr.io/kubernetes-ci-images` est utilisé.
Par défaut, kubeadm télécharge les images depuis `k8s.gcr.io`, à moins que la version demandée de Kubernetes soit une version Intégration Continue (CI). Dans ce cas, `gcr.io/k8s-staging-ci-images` est utilisé.

Vous pouvez outrepasser ce comportement en utilisant [kubeadm avec un fichier de configuration](#config-file).
Les personnalisations permises sont :
Expand Down
4 changes: 2 additions & 2 deletions content/zh/docs/reference/setup-tools/kubeadm/kubeadm-init.md
Original file line number Diff line number Diff line change
Expand Up @@ -293,10 +293,10 @@ 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.
-->
默认情况下, kubeadm 会从 `k8s.gcr.io` 仓库拉取镜像。如果请求的 Kubernetes 版本是 CI 标签
(例如 `ci/latest`),则使用 `gcr.io/kubernetes-ci-images`
(例如 `ci/latest`),则使用 `gcr.io/k8s-staging-ci-images`

<!--
You can override this behavior by using [kubeadm with a configuration file](#config-file).
Expand Down

0 comments on commit a54e81e

Please sign in to comment.