whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33599 from nameYULI/yl24

Browse Source 
[zh]Sync reference-7
This commit is contained in:
Kubernetes Prow Robot
2022-05-11 01:40:51 -07:00
committed by GitHub
parent 07e1929b49 842c411ce9
commit 07ef1c26ee
2 changed files with 70 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/en/docs/reference/config-api/kubeadm-config.v1beta2.md
+4 -4
View File
@@ -348,7 +348,7 @@ could be used for assigning a stable DNS to the control plane.</li>
<code>string</code>
</td>
<td>
<p><code>mageRepository</code> sets the container registry to pull images from.
<p><code>imageRepository</code> sets the container registry to pull images from.
If empty, <code>k8s.gcr.io</code> will be used by default; in case of kubernetes version is
a CI build (kubernetes version starts with <code>ci/</code>) <code>gcr.io/k8s-staging-ci-images</code>
is used as a default for control plane components and for kube-proxy, while
@@ -876,7 +876,7 @@ cluster information.
</td>
<td>
<p><code>tlsBootstrapToken</code> is a token used for TLS bootstrapping.
If <code>bootstrapToken</code> is set, this field is defaulted to <code>.bootstrapToken.token, but can be overridden. If </code>file` is set, this field <strong>must be set</strong> in case the KubeConfigFile does not
If <code>bootstrapToken</code> is set, this field is defaulted to <code>.bootstrapToken.token</code>, but can be overridden. If <code>file</code> is set, this field <strong>must be set</strong> in case the KubeConfigFile does not
contain any other authentication information.</p>
</td>
</tr>
@@ -1080,7 +1080,7 @@ originated from the Kubernetes/Kubernetes release process</p>
<code>string</code>
</td>
<td>
<p><code>mageRepository</code> sets the container registry to pull images from.
<p><code>imageRepository</code> sets the container registry to pull images from.
If not set, the <code>imageRepository</code> defined in ClusterConfiguration will be used.</p>
</td>
</tr>
@@ -1267,7 +1267,7 @@ Defaults to the hostname of the node if not provided.</p>
<code>string</code>
</td>
<td>
<p>`criSocket is used to retrieve container runtime information. This information will
<p><code>criSocket<code> is used to retrieve container runtime information. This information will
be annotated to the Node API object, for later re-use.</p>
</td>
</tr>