Merge pull request #41541 from asa3311/sync-zh-5

[zh-cn] sync kubelet-credentialprovider.v1alpha1 kubelet-credentialprovider kube-scheduler-config.v1
pull/41557/head
Kubernetes Prow Robot 2023-06-08 07:22:13 -07:00 committed by GitHub
commit 2172ca7a70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 20 deletions

View File

@ -104,6 +104,18 @@ matching hard affinity to the incoming pod.
带有与新 Pod 匹配的硬性亲和性设置的 Pods 计算亲和性得分。
</td>
</tr>
<tr><td><code>ignorePreferredTermsOfExistingPods</code> <B><!--[Required]-->[必需]</B><br/>
<code>bool</code>
</td>
<td>
<!--
IgnorePreferredTermsOfExistingPods configures the scheduler to ignore existing pods' preferred affinity
rules when scoring candidate nodes, unless the incoming pod has inter-pod affinities.
-->
<p>ignorePreferredTermsOfExistingPods 配置调度器在为候选节点评分时忽略现有 Pod 的优选亲和性规则,
除非传入的 Pod 具有 Pod 间的亲和性。</p>
</td>
</tr>
</tbody>
</table>
@ -268,7 +280,7 @@ NodeAffinityArgs holds arguments to configure the NodeAffinity plugin.
<tr><td><code>kind</code><br/>string</td><td><code>NodeAffinityArgs</code></td></tr>
<tr><td><code>addedAffinity</code><br/>
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.26/#nodeaffinity-v1-core"><code>core/v1.NodeAffinity</code></a>
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#nodeaffinity-v1-core"><code>core/v1.NodeAffinity</code></a>
</td>
<td>
<!--
@ -389,7 +401,7 @@ PodTopologySpreadArgs holds arguments used to configure the PodTopologySpread pl
<tr><td><code>kind</code><br/>string</td><td><code>PodTopologySpreadArgs</code></td></tr>
<tr><td><code>defaultConstraints</code><br/>
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.26/#topologyspreadconstraint-v1-core"><code>[]core/v1.TopologySpreadConstraint</code></a>
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#topologyspreadconstraint-v1-core"><code>[]core/v1.TopologySpreadConstraint</code></a>
</td>
<td>
<!--
@ -1582,11 +1594,11 @@ DebuggingConfiguration holds configuration for Debugging related features.
</td>
<td>
<!--
enableContentionProfiling enables lock contention profiling, if
enableContentionProfiling enables block profiling, if
enableProfiling is true.
-->
<p><code>enableContentionProfiling</code> 字段在
<code>enableProfiling</code> 为 true 时允许执行锁竞争分析。</p>
<code>enableProfiling</code> 为 true 时启用阻塞分析。</p>
</td>
</tr>
</tbody>

View File

@ -132,16 +132,16 @@ auth 是一个映射,包含传递给 kubelet 的身份验证信息。
<!--
Each key in the map is a pattern which can optionally contain a port and a path.
Globs can be used in the domain, but not in the port or the path. Globs are supported
as subdomains like '<em>.k8s.io' or 'k8s.</em>.io', and top-level-domains such as 'k8s.<em>'.
Matching partial subdomains like 'app</em>.k8s.io' is also supported. Each glob can only match
a single subdomain segment, so *.io does not match *.k8s.io.
as subdomains like <code>&ast;.k8s.io</code> or <code>k8s.&ast;.io</code>, and top-level-domains such as <code>k8s.&ast;</code>.
Matching partial subdomains like <code>app&ast;.k8s.io</code> is also supported. Each glob can only match
a single subdomain segment, so <code>&ast;.io</code> does not match <code>&ast;.k8s.io</code>.</p>
-->
<p>
映射中的每个主键都可以包含端口和路径。
域名中可以使用 Glob 通配,但不能在端口或路径中使用 Glob。
Glob 支持类似 “\*.k8s.io” 或 “k8s.\*.io” 这类子域以及 “k8s.\*” 这类顶级域。
也支持匹配的部分子域,例如 “app\*.k8s.io”
每个 Glob 只能匹配一个子域段,因此 *.io 与 *.k8s.io 不匹配。
Glob 支持类似 <code>&ast;.k8s.io</code><code>k8s.&ast;.io</code> 这类子域以及 <code>k8s.&ast;</code> 这类顶级域。
也支持匹配的部分子域,例如 <code>app&ast;.k8s.io</code>
每个 Glob 只能匹配一个子域段,因此 <code>&ast;.io</code><code>&ast;.k8s.io</code> 不匹配。
</p>
<!--
The kubelet will match images against the key when all of the below are true:
@ -190,9 +190,9 @@ Example keys:
<p>示例键:</p>
<ul>
<li>123456789.dkr.ecr.us-east-1.amazonaws.com</li>
<li>*.azurecr.io</li>
<li>&ast;.azurecr.io</li>
<li>gcr.io</li>
<li>*.registry.io</li>
<li>&ast;.&ast;.registry.io</li>
<li>registry.io:8080/path</li>
</ul>
</td>

View File

@ -127,16 +127,16 @@ this field to null if no valid credentials can be returned for the requested ima
<!--
Each key in the map is a pattern which can optionally contain a port and a path.
Globs can be used in the domain, but not in the port or the path. Globs are supported
as subdomains like '<em>.k8s.io' or 'k8s.</em>.io', and top-level-domains such as 'k8s.<em>'.
Matching partial subdomains like 'app</em>.k8s.io' is also supported. Each glob can only match
a single subdomain segment, so *.io does not match *.k8s.io.
as subdomains like <code>&ast;.k8s.io</code> or <code>k8s.&ast;.io</code>, and top-level-domains such as <code>k8s.&ast;</code>.
Matching partial subdomains like <code>app&ast;.k8s.io</code> is also supported. Each glob can only match
a single subdomain segment, so <code>&ast;.io</code> does not match <code>&ast;.k8s.io</code>.</p>
-->
<p>
映射中每个键值都是一个正则表达式,可以选择包含端口和路径。
域名部分可以包含通配符,但在端口或路径中不能使用通配符。
支持通配符作为子域,如 <code>*.k8s.io</code><code>k8s.*.io</code>,以及顶级域,如 <code>k8s.*</code>
还支持匹配部分子域,如 <code>app*.k8s.io</code>。每个通配符只能匹配一个子域段,
因此 <code>*.io</code> 不匹配 <code>*.k8s.io</code>
支持通配符作为子域,如 <code>&ast;.k8s.io</code><code>k8s.&ast;.io</code>,以及顶级域,如 <code>k8s.&ast;</code>
还支持匹配部分子域,如 <code>app&ast;.k8s.io</code>。每个通配符只能匹配一个子域段,
因此 <code>&ast;.io</code> 不匹配 <code>&ast;.k8s.io</code>
</p>
<!--
<p>The kubelet will match images against the key when all of the below are true:</p>
@ -179,9 +179,9 @@ stopping after the first successfully authenticated pull.</p>
<p>键值示例:</p>
<ul>
<li>123456789.dkr.ecr.us-east-1.amazonaws.com</li>
<li>*.azurecr.io</li>
<li>&ast;.azurecr.io</li>
<li>gcr.io</li>
<li><em>.</em>.registry.io</li>
<li>&ast;.&ast;.registry.io</li>
<li>registry.io:8080/path</li>
</ul>
</td>