Skip to content

Commit a425182

Browse files
authored
Merge pull request #43000 from tengqm/fix-configapi
Fix stars in the generated configuration APIs
2 parents e3645c5 + 3e6ebb3 commit a425182

7 files changed

+41
-41
lines changed

content/en/docs/reference/config-api/apiserver-audit.v1.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,9 @@ The empty string represents the core API group.</p>
325325
<p>For example:
326326
'pods' matches pods.
327327
'pods/log' matches the log subresource of pods.
328-
'<em>' matches all resources and their subresources.
329-
'pods/</em>' matches all subresources of pods.
330-
'*/scale' matches all scale subresources.</p>
328+
'&ast;' matches all resources and their subresources.
329+
'pods/&ast;' matches all subresources of pods.
330+
'&ast;/scale' matches all scale subresources.</p>
331331
<p>If wildcard is present, the validation rule will ensure resources do not
332332
overlap with each other.</p>
333333
<p>An empty list implies all resources and subresources in this API groups apply.</p>
@@ -501,10 +501,10 @@ An empty list implies every namespace.</p>
501501
</td>
502502
<td>
503503
<p>NonResourceURLs is a set of URL paths that should be audited.
504-
<em>s are allowed, but only as the full, final step in the path.
504+
&ast;s are allowed, but only as the full, final step in the path.
505505
Examples:
506506
&quot;/metrics&quot; - Log requests for apiserver metrics
507-
&quot;/healthz</em>&quot; - Log all health checks</p>
507+
&quot;/healthz&ast;&quot; - Log all health checks</p>
508508
</td>
509509
</tr>
510510
<tr><td><code>omitStages</code><br/>
@@ -552,4 +552,4 @@ Policy.OmitManagedFields will stand.</li>
552552

553553

554554

555-
555+

content/en/docs/reference/config-api/apiserver-encryption.v1.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ auto_generated: true
2020

2121
<p>EncryptionConfiguration stores the complete configuration for encryption providers.
2222
It also allows the use of wildcards to specify the resources that should be encrypted.
23-
Use '<em>.<!-- raw HTML omitted -->' to encrypt all resources within a group or '</em>.<em>' to encrypt all resources.
24-
'</em>.' can be used to encrypt all resource in the core group. '<em>.</em>' will encrypt all
23+
Use '&ast;.&lt;group&gt;' to encrypt all resources within a group or '&ast;.&ast;' to encrypt all resources.
24+
'&ast;.' can be used to encrypt all resource in the core group. '&ast;.&ast;' will encrypt all
2525
resources, even custom resources that are added after API server start.
2626
Use of wildcards that overlap within the same resource list or across multiple
2727
entries are not allowed since part of the configuration would be ineffective.
@@ -283,9 +283,9 @@ Set to a negative value to disable caching. This field is only allowed for KMS v
283283
<td>
284284
<p>resources is a list of kubernetes resources which have to be encrypted. The resource names are derived from <code>resource</code> or <code>resource.group</code> of the group/version/resource.
285285
eg: pandas.awesome.bears.example is a custom resource with 'group': awesome.bears.example, 'resource': pandas.
286-
Use '<em>.</em>' to encrypt all resources and '<em>.<!-- raw HTML omitted -->' to encrypt all resources in a specific group.
287-
eg: '</em>.awesome.bears.example' will encrypt all resources in the group 'awesome.bears.example'.
288-
eg: '*.' will encrypt all resources in the core group (such as pods, configmaps, etc).</p>
286+
Use '&ast;.&ast;' to encrypt all resources and '&ast;.&lt;group&gt;' to encrypt all resources in a specific group.
287+
eg: '&ast;.awesome.bears.example' will encrypt all resources in the group 'awesome.bears.example'.
288+
eg: '&ast;.' will encrypt all resources in the core group (such as pods, configmaps, etc).</p>
289289
</td>
290290
</tr>
291291
<tr><td><code>providers</code> <B>[Required]</B><br/>
@@ -325,4 +325,4 @@ Each key has to be 32 bytes long.</p>
325325
</tr>
326326
</tbody>
327327
</table>
328-
328+

content/en/docs/reference/config-api/kubelet-config.v1.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ to provide credentials. Images are expected to contain the registry domain
8181
and URL path.</p>
8282
<p>Each entry in matchImages is a pattern which can optionally contain a port and a path.
8383
Globs can be used in the domain, but not in the port or the path. Globs are supported
84-
as subdomains like '<em>.k8s.io' or 'k8s.</em>.io', and top-level-domains such as 'k8s.<em>'.
85-
Matching partial subdomains like 'app</em>.k8s.io' is also supported. Each glob can only match
86-
a single subdomain segment, so *.io does not match *.k8s.io.</p>
84+
as subdomains like '&ast;.k8s.io' or 'k8s.&ast;.io', and top-level-domains such as 'k8s.&ast;'.
85+
Matching partial subdomains like 'app&ast;.k8s.io' is also supported. Each glob can only match
86+
a single subdomain segment, so &ast;.io does not match &ast;.k8s.io.</p>
8787
<p>A match exists between an image and a matchImage when all of the below are true:</p>
8888
<ul>
8989
<li>Both contain the same number of domain parts and each part matches.</li>
@@ -93,9 +93,9 @@ a single subdomain segment, so *.io does not match *.k8s.io.</p>
9393
<p>Example values of matchImages:</p>
9494
<ul>
9595
<li>123456789.dkr.ecr.us-east-1.amazonaws.com</li>
96-
<li>*.azurecr.io</li>
96+
<li>&ast;.azurecr.io</li>
9797
<li>gcr.io</li>
98-
<li><em>.</em>.registry.io</li>
98+
<li>&ast;.&ast;.registry.io</li>
9999
<li>registry.io:8080/path</li>
100100
</ul>
101101
</td>
@@ -169,4 +169,4 @@ credential plugin.</p>
169169
</tr>
170170
</tbody>
171171
</table>
172-
172+

content/en/docs/reference/config-api/kubelet-config.v1beta1.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,9 +1301,9 @@ to provide credentials. Images are expected to contain the registry domain
13011301
and URL path.</p>
13021302
<p>Each entry in matchImages is a pattern which can optionally contain a port and a path.
13031303
Globs can be used in the domain, but not in the port or the path. Globs are supported
1304-
as subdomains like '<em>.k8s.io' or 'k8s.</em>.io', and top-level-domains such as 'k8s.<em>'.
1305-
Matching partial subdomains like 'app</em>.k8s.io' is also supported. Each glob can only match
1306-
a single subdomain segment, so *.io does not match *.k8s.io.</p>
1304+
as subdomains like '&ast;.k8s.io' or 'k8s.&ast;.io', and top-level-domains such as 'k8s.&ast;'.
1305+
Matching partial subdomains like 'app&ast;.k8s.io' is also supported. Each glob can only match
1306+
a single subdomain segment, so &ast;.io does not match &ast;.k8s.io.</p>
13071307
<p>A match exists between an image and a matchImage when all of the below are true:</p>
13081308
<ul>
13091309
<li>Both contain the same number of domain parts and each part matches.</li>
@@ -1313,9 +1313,9 @@ a single subdomain segment, so *.io does not match *.k8s.io.</p>
13131313
<p>Example values of matchImages:</p>
13141314
<ul>
13151315
<li>123456789.dkr.ecr.us-east-1.amazonaws.com</li>
1316-
<li>*.azurecr.io</li>
1316+
<li>&ast;.azurecr.io</li>
13171317
<li>gcr.io</li>
1318-
<li><em>.</em>.registry.io</li>
1318+
<li>&ast;.&ast;.registry.io</li>
13191319
<li>registry.io:8080/path</li>
13201320
</ul>
13211321
</td>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ should be valid for all images that match against this key. A plugin should set
8989
this field to null if no valid credentials can be returned for the requested image.</p>
9090
<p>Each key in the map is a pattern which can optionally contain a port and a path.
9191
Globs can be used in the domain, but not in the port or the path. Globs are supported
92-
as subdomains like '<em>.k8s.io' or 'k8s.</em>.io', and top-level-domains such as 'k8s.<em>'.
93-
Matching partial subdomains like 'app</em>.k8s.io' is also supported. Each glob can only match
94-
a single subdomain segment, so *.io does not match *.k8s.io.</p>
92+
as subdomains like '&ast;.k8s.io' or 'k8s.&ast;.io', and top-level-domains such as 'k8s.&ast;'.
93+
Matching partial subdomains like 'app&ast;.k8s.io' is also supported. Each glob can only match
94+
a single subdomain segment, so &ast;.io does not match &ast;.k8s.io.</p>
9595
<p>The kubelet will match images against the key when all of the below are true:</p>
9696
<ul>
9797
<li>Both contain the same number of domain parts and each part matches.</li>
@@ -108,9 +108,9 @@ stopping after the first successfully authenticated pull.</p>
108108
<p>Example keys:</p>
109109
<ul>
110110
<li>123456789.dkr.ecr.us-east-1.amazonaws.com</li>
111-
<li>*.azurecr.io</li>
111+
<li>&ast;.azurecr.io</li>
112112
<li>gcr.io</li>
113-
<li><em>.</em>.registry.io</li>
113+
<li>&ast;.&ast;.registry.io</li>
114114
<li>registry.io:8080/path</li>
115115
</ul>
116116
</td>
@@ -166,4 +166,4 @@ An empty password is valid.</p>
166166

167167

168168

169-
169+

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ should be valid for all images that match against this key. A plugin should set
8989
this field to null if no valid credentials can be returned for the requested image.</p>
9090
<p>Each key in the map is a pattern which can optionally contain a port and a path.
9191
Globs can be used in the domain, but not in the port or the path. Globs are supported
92-
as subdomains like '<em>.k8s.io' or 'k8s.</em>.io', and top-level-domains such as 'k8s.<em>'.
93-
Matching partial subdomains like 'app</em>.k8s.io' is also supported. Each glob can only match
94-
a single subdomain segment, so *.io does not match *.k8s.io.</p>
92+
as subdomains like '&ast;.k8s.io' or 'k8s.&ast;.io', and top-level-domains such as 'k8s.&ast;'.
93+
Matching partial subdomains like 'app&ast;.k8s.io' is also supported. Each glob can only match
94+
a single subdomain segment, so &ast;.io does not match &ast;.k8s.io.</p>
9595
<p>The kubelet will match images against the key when all of the below are true:</p>
9696
<ul>
9797
<li>Both contain the same number of domain parts and each part matches.</li>
@@ -108,9 +108,9 @@ stopping after the first successfully authenticated pull.</p>
108108
<p>Example keys:</p>
109109
<ul>
110110
<li>123456789.dkr.ecr.us-east-1.amazonaws.com</li>
111-
<li>*.azurecr.io</li>
111+
<li>&ast;.azurecr.io</li>
112112
<li>gcr.io</li>
113-
<li><em>.</em>.registry.io</li>
113+
<li>&ast;.&ast;.registry.io</li>
114114
<li>registry.io:8080/path</li>
115115
</ul>
116116
</td>
@@ -166,4 +166,4 @@ An empty password is valid.</p>
166166

167167

168168

169-
169+

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ should be valid for all images that match against this key. A plugin should set
8989
this field to null if no valid credentials can be returned for the requested image.</p>
9090
<p>Each key in the map is a pattern which can optionally contain a port and a path.
9191
Globs can be used in the domain, but not in the port or the path. Globs are supported
92-
as subdomains like '<em>.k8s.io' or 'k8s.</em>.io', and top-level-domains such as 'k8s.<em>'.
93-
Matching partial subdomains like 'app</em>.k8s.io' is also supported. Each glob can only match
94-
a single subdomain segment, so *.io does not match *.k8s.io.</p>
92+
as subdomains like '&ast;.k8s.io' or 'k8s.&ast;.io', and top-level-domains such as 'k8s.&ast;'.
93+
Matching partial subdomains like 'app&ast;.k8s.io' is also supported. Each glob can only match
94+
a single subdomain segment, so &ast;.io does not match &ast;.k8s.io.</p>
9595
<p>The kubelet will match images against the key when all of the below are true:</p>
9696
<ul>
9797
<li>Both contain the same number of domain parts and each part matches.</li>
@@ -108,9 +108,9 @@ stopping after the first successfully authenticated pull.</p>
108108
<p>Example keys:</p>
109109
<ul>
110110
<li>123456789.dkr.ecr.us-east-1.amazonaws.com</li>
111-
<li>*.azurecr.io</li>
111+
<li>&ast;.azurecr.io</li>
112112
<li>gcr.io</li>
113-
<li><em>.</em>.registry.io</li>
113+
<li>&ast;.&ast;registry.io</li>
114114
<li>registry.io:8080/path</li>
115115
</ul>
116116
</td>
@@ -166,4 +166,4 @@ An empty password is valid.</p>
166166

167167

168168

169-
169+

0 commit comments

Comments
 (0)