Skip to content

Commit 0764bbe

Browse files
committed
sync kubelet-credentialprovider.v1alpha1 kubelet-credentialprovider kube-scheduler-config.v1
1 parent db6d1e0 commit 0764bbe

File tree

3 files changed

+32
-20
lines changed

3 files changed

+32
-20
lines changed

content/zh-cn/docs/reference/config-api/kube-scheduler-config.v1.md

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,18 @@ matching hard affinity to the incoming pod.
104104
带有与新 Pod 匹配的硬性亲和性设置的 Pods 计算亲和性得分。
105105
</td>
106106
</tr>
107+
<tr><td><code>ignorePreferredTermsOfExistingPods</code> <B><!--[Required]-->[必需]</B><br/>
108+
<code>bool</code>
109+
</td>
110+
<td>
111+
<!--
112+
IgnorePreferredTermsOfExistingPods configures the scheduler to ignore existing pods' preferred affinity
113+
rules when scoring candidate nodes, unless the incoming pod has inter-pod affinities.
114+
-->
115+
<p>ignorePreferredTermsOfExistingPods 配置调度器在为候选节点评分时忽略现有 Pod 的优选亲和性规则,
116+
除非传入的 Pod 具有 Pod 间的亲和性。</p>
117+
</td>
118+
</tr>
107119
</tbody>
108120
</table>
109121

@@ -268,7 +280,7 @@ NodeAffinityArgs holds arguments to configure the NodeAffinity plugin.
268280
<tr><td><code>kind</code><br/>string</td><td><code>NodeAffinityArgs</code></td></tr>
269281

270282
<tr><td><code>addedAffinity</code><br/>
271-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.26/#nodeaffinity-v1-core"><code>core/v1.NodeAffinity</code></a>
283+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#nodeaffinity-v1-core"><code>core/v1.NodeAffinity</code></a>
272284
</td>
273285
<td>
274286
<!--
@@ -389,7 +401,7 @@ PodTopologySpreadArgs holds arguments used to configure the PodTopologySpread pl
389401
<tr><td><code>kind</code><br/>string</td><td><code>PodTopologySpreadArgs</code></td></tr>
390402

391403
<tr><td><code>defaultConstraints</code><br/>
392-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.26/#topologyspreadconstraint-v1-core"><code>[]core/v1.TopologySpreadConstraint</code></a>
404+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#topologyspreadconstraint-v1-core"><code>[]core/v1.TopologySpreadConstraint</code></a>
393405
</td>
394406
<td>
395407
<!--
@@ -1582,11 +1594,11 @@ DebuggingConfiguration holds configuration for Debugging related features.
15821594
</td>
15831595
<td>
15841596
<!--
1585-
enableContentionProfiling enables lock contention profiling, if
1597+
enableContentionProfiling enables block profiling, if
15861598
enableProfiling is true.
15871599
-->
15881600
<p><code>enableContentionProfiling</code> 字段在
1589-
<code>enableProfiling</code> 为 true 时允许执行锁竞争分析。</p>
1601+
<code>enableProfiling</code> 为 true 时启用阻塞分析。</p>
15901602
</td>
15911603
</tr>
15921604
</tbody>

content/zh-cn/docs/reference/config-api/kubelet-credentialprovider.v1.md

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

content/zh-cn/docs/reference/config-api/kubelet-credentialprovider.v1alpha1.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -127,16 +127,16 @@ this field to null if no valid credentials can be returned for the requested ima
127127
<!--
128128
Each key in the map is a pattern which can optionally contain a port and a path.
129129
Globs can be used in the domain, but not in the port or the path. Globs are supported
130-
as subdomains like '<em>.k8s.io' or 'k8s.</em>.io', and top-level-domains such as 'k8s.<em>'.
131-
Matching partial subdomains like 'app</em>.k8s.io' is also supported. Each glob can only match
132-
a single subdomain segment, so *.io does not match *.k8s.io.
130+
as subdomains like <code>&ast;.k8s.io</code> or <code>k8s.&ast;.io</code>, and top-level-domains such as <code>k8s.&ast;</code>.
131+
Matching partial subdomains like <code>app&ast;.k8s.io</code> is also supported. Each glob can only match
132+
a single subdomain segment, so <code>&ast;.io</code> does not match <code>&ast;.k8s.io</code>.</p>
133133
-->
134134
<p>
135135
映射中每个键值都是一个正则表达式,可以选择包含端口和路径。
136136
域名部分可以包含通配符,但在端口或路径中不能使用通配符。
137-
支持通配符作为子域,如 <code>*.k8s.io</code> 或 <code>k8s.*.io</code>,以及顶级域,如 <code>k8s.*</code>。
138-
还支持匹配部分子域,如 <code>app*.k8s.io</code>。每个通配符只能匹配一个子域段,
139-
因此 <code>*.io</code> 不匹配 <code>*.k8s.io</code>。
137+
支持通配符作为子域,如 <code>&ast;.k8s.io</code> 或 <code>k8s.&ast;.io</code>,以及顶级域,如 <code>k8s.&ast;</code>。
138+
还支持匹配部分子域,如 <code>app&ast;.k8s.io</code>。每个通配符只能匹配一个子域段,
139+
因此 <code>&ast;.io</code> 不匹配 <code>&ast;.k8s.io</code>。
140140
</p>
141141
<!--
142142
<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>
179179
<p>键值示例:</p>
180180
<ul>
181181
<li>123456789.dkr.ecr.us-east-1.amazonaws.com</li>
182-
<li>*.azurecr.io</li>
182+
<li>&ast;.azurecr.io</li>
183183
<li>gcr.io</li>
184-
<li><em>.</em>.registry.io</li>
184+
<li>&ast;.&ast;.registry.io</li>
185185
<li>registry.io:8080/path</li>
186186
</ul>
187187
</td>

0 commit comments

Comments
 (0)