Merge pull request #44286 from sftim/20231209_dev_1.29_sync

Update dev-1.29 branch to sync with main
2023-12-10 01:29:49 +01:00 · 2023-12-10 01:29:49 +01:00 · 58a6a19712
parent 9b007ed000 0f9c965105
commit 58a6a19712
12 changed files with 38 additions and 32 deletions
--- a/content/en/docs/concepts/architecture/garbage-collection.md
+++ b/content/en/docs/concepts/architecture/garbage-collection.md
@ -111,7 +111,7 @@ to override this behaviour, see [Delete owner objects and orphan dependents](/do
 ## Garbage collection of unused containers and images {#containers-images}

 The {{<glossary_tooltip text="kubelet" term_id="kubelet">}} performs garbage
-collection on unused images every five minutes and on unused containers every
+collection on unused images every two minutes and on unused containers every
 minute. You should avoid using external garbage collection tools, as these can
 break the kubelet behavior and remove containers that should exist.

--- a/content/en/docs/concepts/configuration/secret.md
+++ b/content/en/docs/concepts/configuration/secret.md
@ -381,7 +381,7 @@ The following YAML contains an example config for a TLS Secret:

 The TLS Secret type is provided only for convenience.
 You can create an `Opaque` type for credentials used for TLS authentication.
-However, using the defined and public Secret type (`kubernetes.io/ssh-auth`)
+However, using the defined and public Secret type (`kubernetes.io/tls`)
 helps ensure the consistency of Secret format in your project. The API server
 verifies if the required keys are set for a Secret of this type.

--- a/content/en/docs/reference/kubectl/_index.md
+++ b/content/en/docs/reference/kubectl/_index.md
@ -171,7 +171,7 @@ Operation       | Syntax    |       Description
 `scale`        | <code>kubectl scale (-f FILENAME &#124; TYPE NAME &#124; TYPE/NAME) --replicas=COUNT [--resource-version=version] [--current-replicas=count] [flags]</code> | Update the size of the specified replication controller.
 `set`    | `kubectl set SUBCOMMAND [options]` | Configure application resources.
 `taint`    | `kubectl taint NODE NAME KEY_1=VAL_1:TAINT_EFFECT_1 ... KEY_N=VAL_N:TAINT_EFFECT_N [options]` | Update the taints on one or more nodes.
-`top`    | `kubectl top (POD | NODE) [flags] [options]` | Display Resource (CPU/Memory/Storage) usage of pod or node.
+`top`    | <code>kubectl top (POD &#124; NODE) [flags] [options]</code> | Display Resource (CPU/Memory/Storage) usage of pod or node.
 `uncordon`    | `kubectl uncordon NODE [options]` | Mark node as schedulable.
 `version`        | `kubectl version [--client] [flags]` | Display the Kubernetes version running on the client and server.
 `wait`    | <code>kubectl wait ([-f FILENAME] &#124; resource.group/resource.name &#124; resource.group [(-l label &#124; --all)]) [--for=delete&#124;--for condition=available] [options]</code> | Experimental: Wait for a specific condition on one or many resources.
--- a/content/en/docs/tasks/configmap-secret/managing-secret-using-kubectl.md
+++ b/content/en/docs/tasks/configmap-secret/managing-secret-using-kubectl.md
@ -40,6 +40,10 @@ You must use single quotes `''` to escape special characters such as `$`, `\`,
 `*`, `=`, and `!` in your strings. If you don't, your shell will interpret these
 characters.

+{{< note >}}
+The `stringData` field for a Secret does not work well with server-side apply.
+{{< /note >}}
+
 ### Use source files

 1. Store the credentials in files:
--- a/content/en/docs/tasks/configmap-secret/managing-secret-using-kustomize.md
+++ b/content/en/docs/tasks/configmap-secret/managing-secret-using-kustomize.md
@ -24,6 +24,10 @@ You can generate a Secret by defining a `secretGenerator` in a
 literal values. For example, the following instructions create a Kustomization
 file for the username `admin` and the password `1f2d1e2e67df`.

+{{< note >}}
+The `stringData` field for a Secret does not work well with server-side apply.
+{{< /note >}}
+
 ### Create the Kustomization file

 {{< tabs name="Secret data" >}}
--- a/content/en/docs/tutorials/stateful-application/basic-stateful-set.md
+++ b/content/en/docs/tutorials/stateful-application/basic-stateful-set.md
@ -76,9 +76,7 @@ It creates a [headless Service](/docs/concepts/services-networking/service/#head

 {{% code_sample file="application/web/web.yaml" %}}

-Download the example above, and save it to a file named `web.yaml`
-
-You will need to use two terminal windows. In the first terminal, use
+You will need to use at least two terminal windows. In the first terminal, use
 [`kubectl get`](/docs/reference/generated/kubectl/kubectl-commands/#get) to watch the creation
 of the StatefulSet's Pods.

@ -88,10 +86,10 @@ kubectl get pods -w -l app=nginx

 In the second terminal, use
 [`kubectl apply`](/docs/reference/generated/kubectl/kubectl-commands/#apply) to create the
-headless Service and StatefulSet defined in `web.yaml`.
+headless Service and StatefulSet:

 ```shell
-kubectl apply -f web.yaml
+kubectl apply -f https://k8s.io/examples/application/web/web.yaml
 ```
 ```
 service/nginx created
@ -919,7 +917,7 @@ you deleted the `nginx` Service (which you should not have), you will see
 an error indicating that the Service already exists.

 ```shell
-kubectl apply -f web.yaml
+kubectl apply -f https://k8s.io/examples/application/web/web.yaml
 ```
 ```
 statefulset.apps/web created
@ -1038,7 +1036,7 @@ service "nginx" deleted
 Recreate the StatefulSet and headless Service one more time:

 ```shell
-kubectl apply -f web.yaml
+kubectl apply -f https://k8s.io/examples/application/web/web.yaml
 ```

 ```
@ -1104,8 +1102,6 @@ Pod. This option only affects the behavior for scaling operations. Updates are n

 {{% code_sample file="application/web/web-parallel.yaml" %}}

-Download the example above, and save it to a file named `web-parallel.yaml`
-
 This manifest is identical to the one you downloaded above except that the `.spec.podManagementPolicy`
 of the `web` StatefulSet is set to `Parallel`.

@ -1118,7 +1114,7 @@ kubectl get pod -l app=nginx -w
 In another terminal, create the StatefulSet and Service in the manifest:

 ```shell
-kubectl apply -f web-parallel.yaml
+kubectl apply -f https://k8s.io/examples/application/web/web-parallel.yaml
 ```
 ```
 service/nginx created
--- a/content/fr/_index.html
+++ b/content/fr/_index.html
@ -43,12 +43,12 @@ Kubernetes est une solution open-source qui vous permet de tirer parti de vos in
        <button id="desktopShowVideoButton" onclick="kub.showVideo()">Voir la video (en)</button>
        <br>
        <br>
-        <a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/" button id="desktopKCButton">Venez au KubeCon Detroit, Michigan, USA du 24 au 28 Octobre 2022</a>
+        <a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america-2024/" button id="desktopKCButton">Venez au KubeCon Salt Lake City, UTAH, USA du 12 au 15 Novembre 2024</a>
        <br>
        <br>
        <br>
        <br>
-        <a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/" button id="desktopKCButton">Venez au KubeCon EU Amsterdam, Pays-Bas du 17 au 21 Avril 2023</a>
+        <a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/" button id="desktopKCButton">Venez au KubeCon EU Paris, France du 19 au 22 Mars 2024</a>
 </div>
 <div id="videoPlayer">
    <iframe data-url="https://www.youtube.com/embed/H06qrNmGqyE?autoplay=1" frameborder="0" allowfullscreen></iframe>
--- a/content/ru/_index.html
+++ b/content/ru/_index.html
@ -43,12 +43,12 @@ Kubernetes — это проект с открытым исходным кодо
        <button id="desktopShowVideoButton" onclick="kub.showVideo()">Смотреть видео</button>
        <br>
        <br>
-        <a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/" button id="desktopKCButton">Посетите KubeCon + CloudNativeCon в Европе, 18-21 апреля 2023 года</a>
+        <a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/" button id="desktopKCButton">Посетите KubeCon + CloudNativeCon в Европе, 19-22 марта 2024 года</a>
        <br>
        <br>
        <br>
        <br>
-        <a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/" button id="desktopKCButton">Посетите KubeCon + CloudNativeCon в Северной Америке, 6-9 ноября 2023 года</a>
+        <a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america-2024/" button id="desktopKCButton">Посетите KubeCon + CloudNativeCon в Северной Америке, 12-15 ноября 2024 года</a>
 </div>
 <div id="videoPlayer">
    <iframe data-url="https://www.youtube.com/embed/H06qrNmGqyE?autoplay=1" frameborder="0" allowfullscreen></iframe>
--- a/content/uk/_index.html
+++ b/content/uk/_index.html
@ -64,12 +64,12 @@ Kubernetes - проект з відкритим вихідним кодом. В
        <button id="desktopShowVideoButton" onclick="kub.showVideo()">Переглянути відео</button>
        <br>
        <br>
-        <a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/" button id="desktopKCButton">Відвідайте KubeCon + CloudNativeCon у Північній Америці, 6-9 листопада 2023 року</a>
-        <br>
-        <br>
-        <br>
-        <br>
        <a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/" button id="desktopKCButton">Відвідайте KubeCon + CloudNativeCon в Європі, 19-22 березня 2024 року</a>
+        <br>
+        <br>
+        <br>
+        <br>
+        <a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america-2024" button id="desktopKCButton">Відвідайте KubeCon + CloudNativeCon у Північній Америці, 12-15 листопада 2024 року</a>

 </div>
 <div id="videoPlayer">
--- a/content/zh-cn/docs/tasks/administer-cluster/kubeadm/change-package-repository.md
+++ b/content/zh-cn/docs/tasks/administer-cluster/kubeadm/change-package-repository.md
@ -223,7 +223,7 @@ version.

 在从一个 Kubernetes 小版本升级到另一个版本时，应执行此步骤以获取所需 Kubernetes 小版本的软件包访问权限。

-{{< tabs name="k8s_install_versions" >}}
+{{< tabs name="k8s_upgrade_versions" >}}
 {{% tab name="Ubuntu、Debian 或 HypriotOS" %}}

 <!--
--- a/content/zh-cn/docs/tasks/debug/debug-cluster/_index.md
+++ b/content/zh-cn/docs/tasks/debug/debug-cluster/_index.md
@ -313,7 +313,7 @@ This is an incomplete list of things that could go wrong, and how to adjust your
 - Network partition within cluster, or between cluster and users
 - Crashes in Kubernetes software
 - Data loss or unavailability of persistent storage (e.g. GCE PD or AWS EBS volume)
- Operator error, for example misconfigured Kubernetes software or application software
+- Operator error, for example, misconfigured Kubernetes software or application software
 -->
 ### 故障原因 {#contributing-causes}

@ -329,7 +329,7 @@ This is an incomplete list of things that could go wrong, and how to adjust your
 - API server VM shutdown or apiserver crashing
  - Results
    - unable to stop, update, or start new pods, services, replication controller
-    - existing pods and services should continue to work normally, unless they depend on the Kubernetes API
+    - existing pods and services should continue to work normally unless they depend on the Kubernetes API
 - API server backing storage lost
  - Results
    - the kube-apiserver component fails to start successfully and become healthy
@ -401,7 +401,7 @@ This is an incomplete list of things that could go wrong, and how to adjust your
 <!--
 ### Mitigations

- Action: Use IaaS provider's automatic VM restarting feature for IaaS VMs
+- Action: Use the IaaS provider's automatic VM restarting feature for IaaS VMs
  - Mitigates: Apiserver VM shutdown or apiserver crashing
  - Mitigates: Supporting services VM shutdown or crashes

--- a/content/zh-cn/docs/tasks/tools/included/verify-kubectl.md
+++ b/content/zh-cn/docs/tasks/tools/included/verify-kubectl.md
@ -43,7 +43,8 @@ kubectl cluster-info
 <!-- 
 If you see a URL response, kubectl is correctly configured to access your cluster.

-If you see a message similar to the following, kubectl is not configured correctly or is not able to connect to a Kubernetes cluster.
+If you see a message similar to the following, kubectl is not configured correctly
+or is not able to connect to a Kubernetes cluster.
 -->
 如果返回一个 URL，则意味着 kubectl 成功地访问到了你的集群。

@ -55,9 +56,11 @@ The connection to the server <server-name:port> was refused - did you specify th
 ```

 <!-- 
-For example, if you are intending to run a Kubernetes cluster on your laptop (locally), you will need a tool like Minikube to be installed first and then re-run the commands stated above.
+For example, if you are intending to run a Kubernetes cluster on your laptop (locally),
+you will need a tool like Minikube to be installed first and then re-run the commands stated above.

-If kubectl cluster-info returns the url response but you can't access your cluster, to check whether it is configured properly, use:
+If kubectl cluster-info returns the url response but you can't access your cluster,
+to check whether it is configured properly, use:
 -->
 例如，如果你想在自己的笔记本上（本地）运行 Kubernetes 集群，你需要先安装一个 Minikube
 这样的工具，然后再重新运行上面的命令。
@ -72,9 +75,8 @@ kubectl cluster-info dump
 ### Troubleshooting the 'No Auth Provider Found' error message {#no-auth-provider-found}

 In Kubernetes 1.26, kubectl removed the built-in authentication for the following cloud
-providers' managed Kubernetes offerings.
-These providers have released kubectl plugins to provide the cloud-specific authentication.
-For instructions, refer to the following provider documentation:
+providers' managed Kubernetes offerings. These providers have released kubectl plugins
+to provide the cloud-specific authentication. For instructions, refer to the following provider documentation:
 -->
 ### 排查"找不到身份验证提供商"的错误信息    {#no-auth-provider-found}