Merge pull request #46846 from MaryamTavakkoli/merged-main-dev-1.31

Merged main dev 1.31

Author: k8s-ci-robot

content/en/blog/_posts/2024-04-17-kubernetes-1.30.md

@@ -67,7 +67,7 @@ storage integration) if you need to allow that kind of change at restore time.
 Action required before upgrading. The `prevent-volume-mode-conversion` feature flag is enabled by
 default in the external-provisioner `v4.0.0` and external-snapshotter `v7.0.0`. Volume mode change
 will be rejected when creating a PVC from a VolumeSnapshot unless you perform the steps described in
-the the "Urgent Upgrade Notes" sections for the [external-provisioner
+the "Urgent Upgrade Notes" sections for the [external-provisioner
 4.0.0](https://github.com/kubernetes-csi/external-provisioner/releases/tag/v4.0.0) and the
 [external-snapshotter
 v7.0.0](https://github.com/kubernetes-csi/external-snapshotter/releases/tag/v7.0.0). 

content/en/docs/concepts/architecture/garbage-collection.md

@@ -146,10 +146,10 @@ regardless of disk usage. This is a kubelet setting that you configure for each
 
 To configure the setting, enable the `ImageMaximumGCAge`
 [feature gate](/docs/reference/command-line-tools-reference/feature-gates/) for the kubelet,
-and also set a value for the `ImageMaximumGCAge` field in the kubelet configuration file.
+and also set a value for the `imageMaximumGCAge` field in the kubelet configuration file.
 
 The value is specified as a Kubernetes _duration_; 
-Valid time units for the `ImageMaximumGCAge` field in the kubelet configuration file are:
+Valid time units for the `imageMaximumGCAge` field in the kubelet configuration file are:
 - "ns" for nanoseconds
 - "us" or "µs" for microseconds
 - "ms" for milliseconds
@@ -163,7 +163,7 @@ which means 12 hours and 45 minutes.
 {{< note >}}
 This feature does not track image usage across kubelet restarts. If the kubelet
 is restarted, the tracked image age is reset, causing the kubelet to wait the full
-`ImageMaximumGCAge` duration before qualifying images for garbage collection
+`imageMaximumGCAge` duration before qualifying images for garbage collection
 based on image age.
 {{< /note>}}
 
@@ -208,4 +208,4 @@ configure garbage collection:
 
 * Learn more about [ownership of Kubernetes objects](/docs/concepts/overview/working-with-objects/owners-dependents/).
 * Learn more about Kubernetes [finalizers](/docs/concepts/overview/working-with-objects/finalizers/).
-* Learn about the [TTL controller](/docs/concepts/workloads/controllers/ttlafterfinished/) that cleans up finished Jobs.
+* Learn about the [TTL controller](/docs/concepts/workloads/controllers/ttlafterfinished/) that cleans up finished Jobs.

content/en/docs/concepts/scheduling-eviction/assign-pod-node.md

@@ -634,8 +634,8 @@ The following operators can only be used with `nodeAffinity`.
 
 | Operator | Behaviour |
 | :------------: | :-------------: |
-| `Gt` | The field value will be parsed as an integer, and that integer is less than or equal to the integer that results from parsing the value of a label named by this selector |
-| `Lt` | The field value will be parsed as an integer, and that integer is greater than or equal to the integer that results from parsing the value of a label named by this selector |
+| `Gt` | The field value will be parsed as an integer, and that integer is less than the integer that results from parsing the value of a label named by this selector |
+| `Lt` | The field value will be parsed as an integer, and that integer is greater than the integer that results from parsing the value of a label named by this selector |
 
 
 {{<note>}}

content/en/docs/reference/glossary/cloud-controller-manager.md

@@ -12,7 +12,7 @@ tags:
 - operation
 ---
  A Kubernetes {{< glossary_tooltip text="control plane" term_id="control-plane" >}} component
-that embeds cloud-specific control logic. The [cloud controller manager](/docs/concepts/architecture/cloud-controller/) lets you link your
+that embeds cloud-specific control logic. The cloud controller manager lets you link your
 cluster into your cloud provider's API, and separates out the components that interact
 with that cloud platform from components that only interact with your cluster.
 

content/en/docs/tutorials/hello-minikube.md

@@ -143,6 +143,10 @@ recommended way to manage the creation and scaling of Pods.
 
 1. View application logs for a container in a pod (replace pod name with the one you got from `kubectl get pods`).
 
+ {{< note >}}
+ Replace `hello-node-5f76cf6ccf-br9b5` in the `kubectl logs` command with the name of the pod from the `kubectl get pods` command output.
+ {{< /note >}}
+ 
  ```shell
  kubectl logs hello-node-5f76cf6ccf-br9b5
  ```

content/es/docs/concepts/services-networking/ingress-controllers.md

@@ -33,7 +33,7 @@ Kubernetes es un proyecto que soporta y mantiene los controladores Ingress de [A
 * [Contour](https://projectcontour.io/) es un controlador Ingress basado en [Envoy](https://www.envoyproxy.io/).
 * [Emissary-Ingress](https://www.getambassador.io/products/api-gateway) es un API Gateway [Envoy](https://www.envoyproxy.io)-basado en el controlador Ingress.
 * [EnRoute](https://getenroute.io/) es un API Gateway basado en [Envoy](https://www.envoyproxy.io) que puede correr como un controlador Ingress.
-* [Easegress IngressController](https://github.com/megaease/easegress/blob/main/doc/reference/ingresscontroller.md) es una API Gateway basada en [Easegress](https://megaease.com/easegress/) que puede correr como un controlador Ingress.
+* [Easegress IngressController](https://megaease.com/docs/easegress/04.cloud-native/4.1.kubernetes-ingress-controller/) es una API Gateway basada en [Easegress](https://megaease.com/easegress/) que puede correr como un controlador Ingress.
 * F5 BIG-IP [Container Ingress Services for Kubernetes](https://clouddocs.f5.com/containers/latest/userguide/kubernetes/)
  te permite usar un Ingress para configurar los servidores virtuales de F5 BIG-IP.
 * [FortiADC Ingress Controller](https://docs.fortinet.com/document/fortiadc/7.0.0/fortiadc-ingress-controller/742835/fortiadc-ingress-controller-overview) soporta el recurso de Kubernetes Ingress y te permite manejar los objectos FortiADC desde Kubernetes.

content/ja/docs/reference/glossary/cri.md

@@ -0,0 +1,17 @@
+---
+title: コンテナランタイムインターフェース(CRI)
+id: cri
+date: 2019-03-07
+full_link: /docs/concepts/overview/components/#container-runtime
+short_description: >
+ コンテナランタイムがkubeletと統合するためのAPIです
+
+
+aka:
+tags:
+- fundamental
+---
+コンテナランタイムインターフェース(CRI)は、ノード上の{{< glossary_tooltip text="kubelet" term_id="kubelet" >}}と統合するためのコンテナランタイム用APIです。
+<!--more-->
+
+詳細については、[CRI](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-node/container-runtime-interface.md)のAPIと仕様をご覧ください。

content/zh-cn/docs/concepts/architecture/garbage-collection.md

@@ -286,17 +286,17 @@ regardless of disk usage. This is a kubelet setting that you configure for each
 这是一个可以为每个节点配置的 kubelet 设置。
 
 <!--
-To configure the setting, enable the `ImageMaximumGCAge`
+To configure the setting, enable the `imageMaximumGCAge`
 [feature gate](/docs/reference/command-line-tools-reference/feature-gates/) for the kubelet,
-and also set a value for the `ImageMaximumGCAge` field in the kubelet configuration file.
+and also set a value for the `imageMaximumGCAge` field in the kubelet configuration file.
 -->
-请为 kubelet 启用 `ImageMaximumGCAge`
+请为 kubelet 启用 `imageMaximumGCAge`
 [特性门控](/zh-cn/docs/reference/command-line-tools-reference/feature-gates/)，
-并在 kubelet 配置文件中为 `ImageMaximumGCAge` 字段赋值来配置该设置。
+并在 kubelet 配置文件中为 `imageMaximumGCAge` 字段赋值来配置该设置。
 
 <!--
 The value is specified as a Kubernetes _duration_; 
-Valid time units for the `ImageMaximumGCAge` field in the kubelet configuration file are:
+Valid time units for the `imageMaximumGCAge` field in the kubelet configuration file are:
 - "ns" for nanoseconds
 - "us" or "µs" for microseconds
 - "ms" for milliseconds
@@ -305,7 +305,7 @@ Valid time units for the `ImageMaximumGCAge` field in the kubelet configuration
 - "h" for hours
 -->
 该值应遵循 Kubernetes **持续时间（Duration）** 格式；
-在 kubelet 配置文件中，`ImageMaximumGCAge` 字段的有效时间单位如下：
+在 kubelet 配置文件中，`imageMaximumGCAge` 字段的有效时间单位如下：
 
 - "ns" 表示纳秒
 - "us" 或 "µs" 表示微秒
@@ -324,13 +324,13 @@ which means 12 hours and 45 minutes.
 <!--
 This feature does not track image usage across kubelet restarts. If the kubelet
 is restarted, the tracked image age is reset, causing the kubelet to wait the full
-`ImageMaximumGCAge` duration before qualifying images for garbage collection
+`imageMaximumGCAge` duration before qualifying images for garbage collection
 based on image age.
 -->
 这个特性不会跟踪 kubelet 重新启动后的镜像使用情况。
 如果 kubelet 被重新启动，所跟踪的镜像年龄会被重置，
 导致 kubelet 在根据镜像年龄进行垃圾收集时需要等待完整的
-`ImageMaximumGCAge` 时长。
+`imageMaximumGCAge` 时长。
 {{< /note>}}
 
 <!--

content/zh-cn/docs/concepts/scheduling-eviction/assign-pod-node.md

@@ -1113,13 +1113,13 @@ The following operators can only be used with `nodeAffinity`.
 <!--
 | Operator | Behaviour |
 | :------------: | :-------------: |
-| `Gt` | The field value will be parsed as an integer, and that integer is less than or equal to the integer that results from parsing the value of a label named by this selector |
-| `Lt` | The field value will be parsed as an integer, and that integer is greater than or equal to the integer that results from parsing the value of a label named by this selector |
+| `Gt` | The field value will be parsed as an integer, and that integer is less than the integer that results from parsing the value of a label named by this selector |
+| `Lt` | The field value will be parsed as an integer, and that integer is greater than the integer that results from parsing the value of a label named by this selector |
 -->
 | 操作符 | 行为 |
 | :------------: | :-------------: |
-| `Gt` | 字段值将被解析为整数，并且该整数小于或等于通过解析此选择算符命名的标签的值所得到的整数 | 
-| `Lt` | 字段值将被解析为整数，并且该整数大于或等于通过解析此选择算符命名的标签的值所得到的整数 | 
+| `Gt` | 字段值将被解析为整数，并且该整数小于通过解析此选择算符命名的标签的值所得到的整数 | 
+| `Lt` | 字段值将被解析为整数，并且该整数大于通过解析此选择算符命名的标签的值所得到的整数 | 
 
 {{<note>}}
 <!--

content/zh-cn/docs/concepts/scheduling-eviction/pod-overhead.md

@@ -142,6 +142,13 @@ spec:
  memory: 100Mi
 ```
 
+{{< note >}}
+<!--
+If only `limits` are specified in the pod definition, kubelet will deduce `requests` from those limits and set them to be the same as the defined `limits`.
+-->
+如果在 Pod 定义中只设置了 `limits`，kubelet 将根据 limits 推断 `requests`，并将其设置与 limits 相同的值。
+{{< /note >}}
+
 <!--
 At admission time the RuntimeClass [admission controller](/docs/reference/access-authn-authz/admission-controllers/)
 updates the workload's PodSpec to include the `overhead` as described in the RuntimeClass. If the PodSpec already has this field defined,