Skip to content

Commit 4df18d9

Browse files
committed
sync kubelet-config.v1 kubelet-credentialprovider.v1alpha1 kubelet-credentialprovider.v1beta1
1 parent be43fc0 commit 4df18d9

File tree

3 files changed

+19
-20
lines changed

3 files changed

+19
-20
lines changed

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,15 @@ and URL path.
110110
<!--
111111
Each entry in matchImages is a pattern which can optionally contain a port and a path.
112112
Globs can be used in the domain, but not in the port or the path. Globs are supported
113-
as subdomains like <code>&ast;.k8s.io</code> or <code>k8s.&ast;.io</code>, and top-level-domains such as <code>k8s.&ast;</code>.
114-
Matching partial subdomains like <code>app&ast;.k8s.io</code> is also supported. Each glob can only match
115-
a single subdomain segment, so <code>&ast;.io</code> does not match <code>&ast;.k8s.io</code>.
113+
as subdomains like '&ast;.k8s.io' or 'k8s.&ast;.io', and top-level-domains such as 'k8s.&ast;'.
114+
Matching partial subdomains like 'app</em>.k8s.io' is also supported. Each glob can only match
115+
a single subdomain segment, so &ast;.io does not match &ast;.k8s.io.
116116
-->
117117
<p><code>matchImages</code> 中的每个条目都是一个模式字符串,其中可以包含端口号和路径。
118-
域名部分可以包含通配符,但端口或路径部分不可以。
119-
<code>&ast;.k8s.io</code> 或 <code>k8s.&ast;.io</code> 等子域名以及
120-
<code>k8s.&ast;</code> 这类顶级域名都支持通配符。</p>
121-
<p>对于 <code>app&ast;.k8s.io</code> 这类部分子域名的匹配也是支持的。
122-
每个通配符只能用来匹配一个子域名段,所以 <code>&ast;.io</code> 不会匹配 <code>&ast;.k8s.io</code>。</p>
118+
域名部分可以包含通配符,但端口或路径部分不可以。'&ast;.k8s.io' 或 'k8s.&ast;.io' 等子域名以及
119+
'k8s.&ast;' 这类顶级域名都支持通配符。</p>
120+
<p>对于 'app</em>.k8s.io' 这类部分子域名的匹配也是支持的。
121+
每个通配符只能用来匹配一个子域名段,所以 &ast;.io 不会匹配 &ast;.k8s.io。</p>
123122
<!--
124123
A match exists between an image and a matchImage when all of the below are true:
125124
-->

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

Lines changed: 6 additions & 6 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 <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>
130+
as subdomains like '&ast;.k8s.io' or 'k8s.&ast;.io', and top-level-domains such as 'k8s.&ast;'.
131+
Matching partial subdomains like 'app&ast;.k8s.io' is also supported. Each glob can only match
132+
a single subdomain segment, so &ast;.io does not match &ast;.k8s.io.</p>
133133
-->
134134
<p>
135135
映射中每个键值都是一个正则表达式,可以选择包含端口和路径。
136136
域名部分可以包含通配符,但在端口或路径中不能使用通配符。
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>
137+
支持通配符作为子域,如 '&ast;.k8s.io''k8s.&ast;.io',以及顶级域,如 'k8s.&ast;'
138+
还支持匹配部分子域,如 'app&ast;.k8s.io'。每个通配符只能匹配一个子域段,
139+
因此 &ast;.io 不匹配 &ast;.k8s.io。
140140
</p>
141141
<!--
142142
<p>The kubelet will match images against the key when all of the below are true:</p>

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

Lines changed: 6 additions & 6 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 <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>
130+
as subdomains like '&ast;.k8s.io' or 'k8s.&ast;.io', and top-level-domains such as 'k8s.&ast;'.
131+
Matching partial subdomains like 'app&ast;.k8s.io' is also supported. Each glob can only match
132+
a single subdomain segment, so &ast;.io does not match &ast;.k8s.io.</p>
133133
-->
134134
<p>
135135
映射中每个键值都是一个正则表达式,可以选择包含端口和路径。
136136
域名部分可以包含通配符,但在端口或路径中不能使用通配符。
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>
137+
支持通配符作为子域,如 '&ast;.k8s.io''k8s.&ast;.io',以及顶级域,如 'k8s.&ast;'
138+
还支持匹配部分子域,如 'app&ast;.k8s.io'。每个通配符只能匹配一个子域段,
139+
因此 &ast;.io 不匹配 &ast;.k8s.io。
140140
</p>
141141
<!--
142142
<p>The kubelet will match images against the key when all of the below are true:</p>

0 commit comments

Comments
 (0)