sync implementation-details kubelet-credentialprovider.v1beta1 intro

asa3311 · asa3311 · commit e26fc90fc3cf · 2023-06-12T10:29:44.000+08:00
diff --git a/content/zh-cn/docs/concepts/windows/intro.md b/content/zh-cn/docs/concepts/windows/intro.md
@@ -545,7 +545,7 @@ Kubernetes &#20351;&#29992; pause &#23481;&#22120;&#20197;&#20801;&#35768;&#24037;&#20316;&#23481;&#22120;&#23849;&#28291;&#25110;&#37325;&#21551;&#65292;&#32780;&#19981;&#20250;
 
 <!--
 Kubernetes maintains a multi-architecture image that includes support for Windows.
-For Kubernetes v{{< skew currentVersion >}} the recommended pause image is `registry.k8s.io/pause:3.6`.
+For Kubernetes v{{< skew currentPatchVersion >}} the recommended pause image is `registry.k8s.io/pause:3.6`.
 The [source code](https://github.com/kubernetes/kubernetes/tree/master/build/pause)
 is available on GitHub.
 
@@ -558,7 +558,7 @@ deploying to a production or production-like environment that requires signed
 binaries.
 -->
 Kubernetes &#32500;&#25252;&#19968;&#20010;&#22810;&#20307;&#31995;&#32467;&#26500;&#30340;&#38236;&#20687;&#65292;&#21253;&#25324;&#23545; Windows &#30340;&#25903;&#25345;&#12290;
-&#23545;&#20110; Kubernetes v{{< skew currentVersion >}}&#65292;&#25512;&#33616;&#30340; pause &#38236;&#20687;&#20026; `registry.k8s.io/pause:3.6`&#12290;
+&#23545;&#20110; Kubernetes v{{< skew currentPatchVersion >}}&#65292;&#25512;&#33616;&#30340; pause &#38236;&#20687;&#20026; `registry.k8s.io/pause:3.6`&#12290;
 &#21487;&#22312; GitHub &#19978;&#33719;&#24471;[&#28304;&#20195;&#30721;](https://github.com/kubernetes/kubernetes/tree/master/build/pause)&#12290;
 
 Microsoft &#32500;&#25252;&#19968;&#20010;&#19981;&#21516;&#30340;&#22810;&#20307;&#31995;&#32467;&#26500;&#38236;&#20687;&#65292;&#25903;&#25345; Linux &#21644; Windows amd64&#65292;
diff --git a/content/zh-cn/docs/reference/config-api/kubelet-credentialprovider.v1beta1.md b/content/zh-cn/docs/reference/config-api/kubelet-credentialprovider.v1beta1.md
@@ -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>
    &#26144;&#23556;&#20013;&#27599;&#20010;&#38190;&#20540;&#37117;&#26159;&#19968;&#20010;&#27491;&#21017;&#34920;&#36798;&#24335;&#65292;&#21487;&#20197;&#36873;&#25321;&#21253;&#21547;&#31471;&#21475;&#21644;&#36335;&#24452;&#12290;
    &#22495;&#21517;&#37096;&#20998;&#21487;&#20197;&#21253;&#21547;&#36890;&#37197;&#31526;&#65292;&#20294;&#22312;&#31471;&#21475;&#25110;&#36335;&#24452;&#20013;&#19981;&#33021;&#20351;&#29992;&#36890;&#37197;&#31526;&#12290;
-   &#25903;&#25345;&#36890;&#37197;&#31526;&#20316;&#20026;&#23376;&#22495;&#65292;&#22914; <code>*.k8s.io</code> &#25110; <code>k8s.*.io</code>&#65292;&#20197;&#21450;&#39030;&#32423;&#22495;&#65292;&#22914; <code>k8s.*</code>&#12290;
-   &#36824;&#25903;&#25345;&#21305;&#37197;&#37096;&#20998;&#23376;&#22495;&#65292;&#22914; <code>app*.k8s.io</code>&#12290;&#27599;&#20010;&#36890;&#37197;&#31526;&#21482;&#33021;&#21305;&#37197;&#19968;&#20010;&#23376;&#22495;&#27573;&#65292;
-   &#22240;&#27492; <code>*.io</code> &#19981;&#21305;&#37197; <code>*.k8s.io</code>&#12290;
+   &#25903;&#25345;&#36890;&#37197;&#31526;&#20316;&#20026;&#23376;&#22495;&#65292;&#22914; <code>&ast;.k8s.io</code> &#25110; <code>k8s.&ast;.io</code>&#65292;&#20197;&#21450;&#39030;&#32423;&#22495;&#65292;&#22914; <code>k8s.&ast;</code>&#12290;
+   &#36824;&#25903;&#25345;&#21305;&#37197;&#37096;&#20998;&#23376;&#22495;&#65292;&#22914; <code>app&ast;.k8s.io</code>&#12290;&#27599;&#20010;&#36890;&#37197;&#31526;&#21482;&#33021;&#21305;&#37197;&#19968;&#20010;&#23376;&#22495;&#27573;&#65292;
+   &#22240;&#27492; <code>&ast;.io</code> &#19981;&#21305;&#37197; <code>&ast;.k8s.io</code>&#12290;
    </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>&#38190;&#20540;&#31034;&#20363;&#65306;</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>
diff --git a/content/zh-cn/docs/reference/setup-tools/kubeadm/implementation-details.md b/content/zh-cn/docs/reference/setup-tools/kubeadm/implementation-details.md
@@ -896,7 +896,7 @@ Please note that:
 
 <!-- 
 1. The `node-role.kubernetes.io/master` taint is deprecated and will be removed in kubeadm version 1.25
-1. Mark control-plane phase phase can be invoked individually with the command
+1. Mark control-plane phase can be invoked individually with the command
    [`kubeadm init phase mark-control-plane`](/docs/reference/setup-tools/kubeadm/kubeadm-init-phase/#cmd-phase-mark-control-plane)
 -->
 1. `node-role.kubernetes.io/master` &#27745;&#28857;&#26159;&#24050;&#24223;&#24323;&#30340;&#65292;&#23558;&#20250;&#22312; kubeadm 1.25 &#29256;&#26412;&#20013;&#31227;&#38500;

-Original file line number
+Diff line change
 <!--
 Kubernetes maintains a multi-architecture image that includes support for Windows.
 -For Kubernetes v{{< skew currentVersion >}} the recommended pause image is `registry.k8s.io/pause:3.6`.
 +For Kubernetes v{{< skew currentPatchVersion >}} the recommended pause image is `registry.k8s.io/pause:3.6`.
 The [source code](https://github.com/kubernetes/kubernetes/tree/master/build/pause)
 is available on GitHub.
 binaries.
 -->
 Kubernetes 维护一个多体系结构的镜像，包括对 Windows 的支持。
 -对于 Kubernetes v{{< skew currentVersion >}}，推荐的 pause 镜像为 `registry.k8s.io/pause:3.6`。
 +对于 Kubernetes v{{< skew currentPatchVersion >}}，推荐的 pause 镜像为 `registry.k8s.io/pause:3.6`。
 可在 GitHub 上获得[源代码](https://github.com/kubernetes/kubernetes/tree/master/build/pause)。
 Microsoft 维护一个不同的多体系结构镜像，支持 Linux 和 Windows amd64，