Skip to content

Commit 62afa2e

Browse files
committed
Fix issues in generated config API references
This PR fixes some issues caused by the bad format in source code comments that confuse the reference generator. Problems are related to the use of `*` in comment text as literal string rather than emphasis.
1 parent a5cbdf0 commit 62afa2e

File tree

6 files changed

+43
-39
lines changed

6 files changed

+43
-39
lines changed

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

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,14 @@ The empty string represents the core API group.</p>
322322
</td>
323323
<td>
324324
<p>Resources is a list of resources this rule applies to.</p>
325-
<p>For example:
326-
'pods' matches pods.
327-
'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>
325+
<p>For example:</p>
326+
<ul>
327+
<li><code>pods</code> matches pods.</li>
328+
<li><code>pods/log</code> matches the log subresource of pods.</li>
329+
<li><code>&ast;<code> matches all resources and their subresources.</li>
330+
<li><code>pods/&ast;</code> matches all subresources of pods.</li>
331+
<li><code>&ast;/scale</code> matches all scale subresources.</li>
332+
</ul>
331333
<p>If wildcard is present, the validation rule will ensure resources do not
332334
overlap with each other.</p>
333335
<p>An empty list implies all resources and subresources in this API groups apply.</p>
@@ -501,10 +503,12 @@ An empty list implies every namespace.</p>
501503
</td>
502504
<td>
503505
<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.
505-
Examples:
506-
&quot;/metrics&quot; - Log requests for apiserver metrics
507-
&quot;/healthz</em>&quot; - Log all health checks</p>
506+
<code>&ast;<code>s are allowed, but only as the full, final step in the path.
507+
Examples:</p>
508+
<ul>
509+
<li>&quot;/metrics&quot; - Log requests for apiserver metrics</li>
510+
<li>&quot;/healthz&ast;&quot; - Log all health checks</li>
511+
</ul>
508512
</td>
509513
</tr>
510514
<tr><td><code>omitStages</code><br/>
@@ -552,4 +556,4 @@ Policy.OmitManagedFields will stand.</li>
552556

553557

554558

555-
559+

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

Lines changed: 5 additions & 5 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 '&#42;.k8s.io' or 'k8s.&#42;.io', and top-level-domains such as 'k8s.&#42;'.
85-
Matching partial subdomains like 'app&#42;.k8s.io' is also supported. Each glob can only match
86-
a single subdomain segment, so &#42;.io does not match &#42;.k8s.io.</p>
84+
as subdomains like <code>&ast;.k8s.io</code> or <code>k8s.&ast;.io</code>, and top-level-domains such as <code>k8s.&ast;</code>.
85+
Matching partial subdomains like <code>app&ast;.k8s.io<code> is also supported. Each glob can only match
86+
a single subdomain segment, so <code>&ast;.io</code> does not match <code>&ast;.k8s.io</code>.</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 &#42;.io does not match &#42;.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>&#42;.azurecr.io</li>
96+
<li>&ast;.azurecr.io</li>
9797
<li>gcr.io</li>
98-
<li>&#42;.registry.io</li>
98+
<li>&ast;.&ast;.registry.io</li>
9999
<li>registry.io:8080/path</li>
100100
</ul>
101101
</td>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,9 +1303,9 @@ to provide credentials. Images are expected to contain the registry domain
13031303
and URL path.</p>
13041304
<p>Each entry in matchImages is a pattern which can optionally contain a port and a path.
13051305
Globs can be used in the domain, but not in the port or the path. Globs are supported
1306-
as subdomains like '&#42;.k8s.io' or 'k8s.&#42;.io', and top-level-domains such as 'k8s.&#42;'.
1307-
Matching partial subdomains like 'app&#42;.k8s.io' is also supported. Each glob can only match
1308-
a single subdomain segment, so &#42;.io does not match &#42;.k8s.io.</p>
1306+
as subdomains like <code>&ast;.k8s.io</code> or <code>k8s.&ast;.io</code>, and top-level-domains such as <code>k8s.&ast;</code>.
1307+
Matching partial subdomains like <code>app&ast;.k8s.io</code> is also supported. Each glob can only match
1308+
a single subdomain segment, so <code>&ast;.io</code> does not match <code>&ast;.k8s.io</code>.</p>
13091309
<p>A match exists between an image and a matchImage when all of the below are true:</p>
13101310
<ul>
13111311
<li>Both contain the same number of domain parts and each part matches.</li>
@@ -1315,9 +1315,9 @@ a single subdomain segment, so &#42;.io does not match &#42;.k8s.io.</p>
13151315
<p>Example values of matchImages:</p>
13161316
<ul>
13171317
<li>123456789.dkr.ecr.us-east-1.amazonaws.com</li>
1318-
<li>&#42;.azurecr.io</li>
1318+
<li>&ast;.azurecr.io</li>
13191319
<li>gcr.io</li>
1320-
<li>&#42;.registry.io</li>
1320+
<li>&ast;.&ast;.registry.io</li>
13211321
<li>registry.io:8080/path</li>
13221322
</ul>
13231323
</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 <code>&ast;.k8s.io</code> or <code>k8s.&ast;.io</code>, and top-level-domains such as <code>k8s.&ast;</code>.
93+
Matching partial subdomains like <code>app&ast;.k8s.io</code> is also supported. Each glob can only match
94+
a single subdomain segment, so <code>&ast;.io</code> does not match <code>&ast;.k8s.io</code>.</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 <code>&ast;.k8s.io</code> or <code>k8s.&ast;.io</code>, and top-level-domains such as <code>k8s.&ast;</code>.
93+
Matching partial subdomains like <code>app&ast;.k8s.io</code> is also supported. Each glob can only match
94+
a single subdomain segment, so <code>&ast;.io</code> does not match <code>&ast;.k8s.io</code>.</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 <code>&ast;.k8s.io</code> or <code>k8s.&ast;.io</code>, and top-level-domains such as <code>k8s.&ast;</code>.
93+
Matching partial subdomains like <code>app&ast;.k8s.io</code> is also supported. Each glob can only match
94+
a single subdomain segment, so <code>&ast;.io</code> does not match <code>&ast;.k8s.io</code>.</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)