Skip to content

Commit 029bf82

Browse files
authored
Merge pull request #37789 from kinzhi/kinzhi227
[zh-cn]Update kubeadm-config.v1beta2.md
2 parents 0537ca9 + 6e3d093 commit 029bf82

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

content/zh-cn/docs/reference/config-api/kubeadm-config.v1beta2.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ https://godoc.org/k8s.io/kubelet/config/v1beta1#KubeletConfiguration。</p>
308308
</span><span style="color:#bbb"></span><span style="color:#000;font-weight:bold">etcd</span>:<span style="color:#bbb">
309309
</span><span style="color:#bbb"> </span><span style="color:#998;font-style:italic"># one of local or external</span><span style="color:#bbb">
310310
</span><span style="color:#bbb"> </span><span style="color:#000;font-weight:bold">local</span>:<span style="color:#bbb">
311-
</span><span style="color:#bbb"> </span><span style="color:#000;font-weight:bold">imageRepository</span>:<span style="color:#bbb"> </span><span style="color:#d14">&#34;k8s.gcr.io&#34;</span><span style="color:#bbb">
311+
</span><span style="color:#bbb"> </span><span style="color:#000;font-weight:bold">imageRepository</span>:<span style="color:#bbb"> </span><span style="color:#d14">&#34;registry.k8s.io&#34;</span><span style="color:#bbb">
312312
</span><span style="color:#bbb"> </span><span style="color:#000;font-weight:bold">imageTag</span>:<span style="color:#bbb"> </span><span style="color:#d14">&#34;3.2.24&#34;</span><span style="color:#bbb">
313313
</span><span style="color:#bbb"> </span><span style="color:#000;font-weight:bold">dataDir</span>:<span style="color:#bbb"> </span><span style="color:#d14">&#34;/var/lib/etcd&#34;</span><span style="color:#bbb">
314314
</span><span style="color:#bbb"> </span><span style="color:#000;font-weight:bold">extraArgs</span>:<span style="color:#bbb">
@@ -362,7 +362,7 @@ https://godoc.org/k8s.io/kubelet/config/v1beta1#KubeletConfiguration。</p>
362362
</span><span style="color:#bbb"> </span><span style="color:#000;font-weight:bold">readOnly</span>:<span style="color:#bbb"> </span><span style="color:#000;font-weight:bold">false</span><span style="color:#bbb">
363363
</span><span style="color:#bbb"> </span><span style="color:#000;font-weight:bold">pathType</span>:<span style="color:#bbb"> </span>File<span style="color:#bbb">
364364
</span><span style="color:#bbb"></span><span style="color:#000;font-weight:bold">certificatesDir</span>:<span style="color:#bbb"> </span><span style="color:#d14">&#34;/etc/kubernetes/pki&#34;</span><span style="color:#bbb">
365-
</span><span style="color:#bbb"></span><span style="color:#000;font-weight:bold">imageRepository</span>:<span style="color:#bbb"> </span><span style="color:#d14">&#34;k8s.gcr.io&#34;</span><span style="color:#bbb">
365+
</span><span style="color:#bbb"></span><span style="color:#000;font-weight:bold">imageRepository</span>:<span style="color:#bbb"> </span><span style="color:#d14">&#34;registry.k8s.io&#34;</span><span style="color:#bbb">
366366
</span><span style="color:#bbb"></span><span style="color:#000;font-weight:bold">useHyperKubeImage</span>:<span style="color:#bbb"> </span><span style="color:#000;font-weight:bold">false</span><span style="color:#bbb">
367367
</span><span style="color:#bbb"></span><span style="color:#000;font-weight:bold">clusterName</span>:<span style="color:#bbb"> </span><span style="color:#d14">&#34;example-cluster&#34;</span><span style="color:#bbb">
368368
</span><span style="color:#bbb"></span>---<span style="color:#bbb">
@@ -563,16 +563,17 @@ be used for assigning a stable DNS to the control plane.</li>
563563
<td>
564564
<!--
565565
<p><code>imageRepository</code> sets the container registry to pull images from.
566-
If empty, <code>k8s.gcr.io</code> will be used by default; in case of kubernetes version is
566+
If empty, <code>registry.k8s.io</code> will be used by default;
567+
in case of kubernetes version is
567568
a CI build (kubernetes version starts with <code>ci/</code>) <code>gcr.io/k8s-staging-ci-images</code>
568569
is used as a default for control plane components and for kube-proxy, while
569-
<code>k8s.gcr.io</code> will be used for all the other images.</p>
570+
<code>registry.k8s.io</code> will be used for all the other images.</p>
570571
-->
571572
<p><code>imageRepository</code> 设置用来拉取镜像的容器仓库。
572-
如果此字段为空,默认使用 <code>k8s.gcr.io</code>;
573+
如果此字段为空,默认使用 <code>registry.k8s.io</code>;
573574
当 Kubernetes 用来执行 CI 构造时(Kubernetes 版本以 <code>ci/</code> 开头),
574575
将默认使用 <code>gcr.io/k8s-staging-ci-images</code> 来拉取控制面组件镜像,
575-
而使用 <code>k8s.gcr.io</code> 来拉取所有其他镜像。</p>
576+
而使用 <code>registry.k8s.io</code> 来拉取所有其他镜像。</p>
576577
</td>
577578
</tr>
578579
<tr><td><code>useHyperKubeImage</code> <B><!--[Required]-->[必需]</B><br/>

0 commit comments

Comments
 (0)