Merge branch 'kubernetes:main' into finalizers-docs-add-fqdn-requirement

ramalabeysekera · web-flow · commit aaa4d958fb69 · 2025-04-27T22:55:50.000+01:00
diff --git a/content/en/blog/_posts/2024-12-17-api-streaming/index.md b/content/en/blog/_posts/2024-12-17-api-streaming/index.md
@@ -90,3 +90,12 @@ In the test, we created 400 Secrets, each containing 1 MB of data, and used info
 The results were alarming, only 16 informers were needed to cause the test server to run out of memory and crash, demonstrating how quickly memory consumption can grow under such conditions.
 
 Special shout out to [@deads2k](https://github.com/deads2k) for his help in shaping this feature.
+
+## Kubernetes 1.33 update
+
+Since this feature was started, [Marek Siarkowicz](https://github.com/serathius) integrated a new technology into the
+Kubernetes API server: _streaming collection encoding_.
+Kubernetes v1.33 introduced two related feature gates, `StreamingCollectionEncodingToJSON` and `StreamingCollectionEncodingToProtobuf`.
+These features encode via a stream and avoid allocating all the memory at once.
+This functionality is bit-for-bit compatible with existing **list** encodings, produces even greater server-side memory savings, and doesn't require any changes to client code.
+In 1.33, the `WatchList` feature gate is disabled by default.
diff --git a/content/en/blog/_posts/2025-05-02-kubernetes-v1-33-dra-updates.md b/content/en/blog/_posts/2025-05-02-kubernetes-v1-33-dra-updates.md
@@ -1,15 +1,14 @@
 ---
 layout: blog
 title: "Kubernetes v1.33: New features in DRA"
-slug: dra-133-updates
-draft: true
-date: XXXX-XX-XX
+slug: kubernetes-v1-33-dra-updates
+date: 2025-05-02T10:30:00-08:00
 author: >
   [Morten Torkildsen](https://github.com/mortent) (Google)
   [Patrick Ohly](https://github.com/pohly) (Intel)
 ---
 
-Kubernetes [Dynamic Resource Allocation](/docs/concepts/scheduling-eviction/dynamic-resource-allocation/) (DRA) was originally introduced as an alpha feature in the v1.26 release, and then went through a significant redesign for Kubernetes v1.31. The main DRA feature went to beta in v1.32 and the project hopes it will be generally available in Kubernetes v1.34.
+Kubernetes [Dynamic Resource Allocation](/docs/concepts/scheduling-eviction/dynamic-resource-allocation/) (DRA) was originally introduced as an alpha feature in the v1.26 release, and then went through a significant redesign for Kubernetes v1.31. The main DRA feature went to beta in v1.32, and the project hopes it will be generally available in Kubernetes v1.34.
 
 The basic feature set of DRA provides a far more powerful and flexible API for requesting devices than Device Plugin. And while DRA remains a beta feature for v1.33, the DRA team has been hard at work implementing a number of new features and UX improvements. One feature has been promoted to beta, while a number of new features have been added in alpha. The team has also made progress towards getting DRA ready for GA.
 
@@ -19,7 +18,7 @@ The basic feature set of DRA provides a far more powerful and flexible API for r
 
 ### New alpha features
 
-[Partitionable Devices](/docs/concepts/scheduling-eviction/dynamic-resource-allocation/#partitionable-devices) lets a driver advertise several overlapping logical devices (“partitions”) and the driver can reconfigure the physical device dynamically based on the actual devices allocated. This makes it possible to partition devices on-demand to meet the need of the workloads and therefore increase the utilization.
+[Partitionable Devices](/docs/concepts/scheduling-eviction/dynamic-resource-allocation/#partitionable-devices) lets a driver advertise several overlapping logical devices (“partitions”), and the driver can reconfigure the physical device dynamically based on the actual devices allocated. This makes it possible to partition devices on-demand to meet the needs of the workloads and therefore increase the utilization.
 
 [Device Taints and Tolerations](/docs/concepts/scheduling-eviction/dynamic-resource-allocation/#device-taints-and-tolerations) allow devices to be tainted and for workloads to tolerate those taints. This makes it possible for drivers or cluster administrators to mark devices as unavailable. Depending on the effect of the taint, this can prevent devices from being allocated or cause eviction of pods that are using the device.
 
@@ -39,13 +38,13 @@ The alpha features that were added in v1.33 will be brought to beta in v1.34.
 
 ### Getting involved
 
-A good starting point is joining the WG Device Management [Slack channel](https://kubernetes.slack.com/archives/C0409NGC1TK) and [meetings](https://docs.google.com/document/d/1qxI87VqGtgN7EAJlqVfxx86HGKEAc2A3SKru8nJHNkQ/edit?tab=t.0#heading=h.tgg8gganowxq) which happens at US/EU and EU/APAC friendly time slots.
+A good starting point is joining the WG Device Management [Slack channel](https://kubernetes.slack.com/archives/C0409NGC1TK) and [meetings](https://docs.google.com/document/d/1qxI87VqGtgN7EAJlqVfxx86HGKEAc2A3SKru8nJHNkQ/edit?tab=t.0#heading=h.tgg8gganowxq), which happen at US/EU and EU/APAC friendly time slots.
 
-Not all enhancement ideas are tracked as issues yet, so come talk to us if you want to help or have some ideas yourself! We have work to do at all levels, from difficult core changes to usability enhancements in kubectl which could be picked up by newcomers.
+Not all enhancement ideas are tracked as issues yet, so come talk to us if you want to help or have some ideas yourself! We have work to do at all levels, from difficult core changes to usability enhancements in kubectl, which could be picked up by newcomers.
 
 ### Acknowledgments
 
-A huge thanks to everyone who have contributed:
+A huge thanks to everyone who has contributed:
 
 * Cici Huang ([cici37](https://github.com/cici37))
 * Ed Bartosh ([bart0sh](https://github.com/bart0sh])
diff --git a/content/en/docs/concepts/architecture/self-healing.md b/content/en/docs/concepts/architecture/self-healing.md
@@ -1,7 +1,14 @@
 ---
 title: Kubernetes Self-Healing  
 content_type: concept  
-Weight: 50  
+weight: 50  
+feature:
+  title: Self-healing
+  anchor: Automated recovery from damage
+  description: >
+    Kubernetes restarts containers that crash, replaces entire Pods where needed,
+    reattaches storage in response to wider failures, and can integrate with
+    node autoscalers to self-heal even at the node level.
 ---
 <!-- overview -->
 
diff --git a/content/en/docs/concepts/workloads/controllers/replicaset.md b/content/en/docs/concepts/workloads/controllers/replicaset.md
@@ -1,4 +1,10 @@
 ---
+# NOTE TO LOCALIZATION TEAMS
+#
+# If updating front matter for your localization because there is still
+# a "feature" key in this page, then you also need to update
+# content/??/docs/concepts/architecture/self-healing.md (which is where
+# it moved to)
 reviewers:
 - Kashomon
 - bprashanth
@@ -7,13 +13,6 @@ title: ReplicaSet
 api_metadata:
 - apiVersion: "apps/v1"
   kind: "ReplicaSet"
-feature:
-  title: Self-healing
-  anchor: How a ReplicaSet works
-  description: >
-    Restarts containers that fail, replaces and reschedules containers when nodes die,
-    kills containers that don't respond to your user-defined health check,
-    and doesn't advertise them to clients until they are ready to serve.
 content_type: concept
 description: >-
   A ReplicaSet's purpose is to maintain a stable set of replica Pods running at any given time.
diff --git a/content/zh-cn/docs/concepts/cluster-administration/coordinated-leader-election.md b/content/zh-cn/docs/concepts/cluster-administration/coordinated-leader-election.md
@@ -16,15 +16,15 @@ weight: 200
 {{< feature-state feature_gate_name="CoordinatedLeaderElection" >}}
 
 <!--
-Kubernetes {{< skew currentVersion >}} includes an alpha feature that allows {{<
+Kubernetes {{< skew currentVersion >}} includes a beta feature that allows {{<
 glossary_tooltip text="control plane" term_id="control-plane" >}} components to
 deterministically select a leader via _coordinated leader election_.
 This is useful to satisfy Kubernetes version skew constraints during cluster upgrades.
 Currently, the only builtin selection strategy is `OldestEmulationVersion`,
 preferring the leader with the lowest emulation version, followed by binary
 version, followed by creation timestamp.
 -->
-Kubernetes {{< skew currentVersion >}} 包含一个 Alpha 特性，
+Kubernetes {{< skew currentVersion >}} 包含一个 Beta 特性，
 允许{{< glossary_tooltip text="控制平面" term_id="control-plane" >}}组件通过**协调领导者选举**确定性地选择一个领导者。
 这对于在集群升级期间满足 Kubernetes 版本偏差约束非常有用。
 目前，唯一内置的选择策略是 `OldestEmulationVersion`，
@@ -36,34 +36,34 @@ Kubernetes {{< skew currentVersion >}} 包含一个 Alpha 特性，
 Ensure that `CoordinatedLeaderElection` [feature
 gate](/docs/reference/command-line-tools-reference/feature-gates/) is enabled
 when you start the {{< glossary_tooltip text="API Server"
-term_id="kube-apiserver" >}}: and that the `coordination.k8s.io/v1alpha1` API group is
+term_id="kube-apiserver" >}}: and that the `coordination.k8s.io/v1beta1` API group is
 enabled.
 -->
 ## 启用协调领导者选举   {#enabling-coordinated-leader-election}
 
 确保你在启动 {{< glossary_tooltip text="API 服务器" term_id="kube-apiserver" >}}时
 `CoordinatedLeaderElection` [特性门控](/zh-cn/docs/reference/command-line-tools-reference/feature-gates/)被启用，
-并且 `coordination.k8s.io/v1alpha1` API 组被启用。
+并且 `coordination.k8s.io/v1beta1` API 组被启用。
 
 <!--
 This can be done by setting flags `--feature-gates="CoordinatedLeaderElection=true"` and
-`--runtime-config="coordination.k8s.io/v1alpha1=true"`.
+`--runtime-config="coordination.k8s.io/v1beta1=true"`.
 -->
 此操作可以通过设置 `--feature-gates="CoordinatedLeaderElection=true"`
-和 `--runtime-config="coordination.k8s.io/v1alpha1=true"` 标志来完成。
+和 `--runtime-config="coordination.k8s.io/v1beta1=true"` 标志来完成。
 
 <!--
 ## Component configuration
 
 Provided that you have enabled the `CoordinatedLeaderElection` feature gate _and_  
-have the `coordination.k8s.io/v1alpha1` API group enabled, compatible control plane  
+have the `coordination.k8s.io/v1beta1` API group enabled, compatible control plane  
 components automatically use the LeaseCandidate and Lease APIs to elect a leader  
 as needed.
 -->
 ## 组件配置   {#component-configuration}
 
 前提是你已启用 `CoordinatedLeaderElection` 特性门控**并且**
-启用了 `coordination.k8s.io/v1alpha1` API 组，
+启用了 `coordination.k8s.io/v1beta1` API 组，
 兼容的控制平面组件会自动使用 LeaseCandidate 和 Lease API 根据需要选举领导者。
 
 <!--
diff --git a/content/zh-cn/docs/reference/kubernetes-api/config-and-storage-resources/volume.md b/content/zh-cn/docs/reference/kubernetes-api/config-and-storage-resources/volume.md
@@ -1565,7 +1565,7 @@ Volume 表示 Pod 中一个有名字的卷，可以由 Pod 中的任意容器进
   - IfNotPresent：如果磁盘上尚不存在此引用，kubelet 执行拉取操作。若此引用不存在且拉取失败，则容器创建将失败。
 
   <!--
-  The volume gets re-resolved if the pod gets deleted and recreated, which means that new remote content will become available on pod recreation. A failure to resolve or pull the image during pod startup will block containers from starting and may add significant latency. Failures will be retried using normal volume backoff and will be reported on the pod reason and message. The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field. The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images. The volume will be mounted read-only (ro) and non-executable files (noexec). Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath). The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
+  The volume gets re-resolved if the pod gets deleted and recreated, which means that new remote content will become available on pod recreation. A failure to resolve or pull the image during pod startup will block containers from starting and may add significant latency. Failures will be retried using normal volume backoff and will be reported on the pod reason and message. The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field. The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images. The volume will be mounted read-only (ro) and non-executable files (noexec). Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33. The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
   -->
 
   如果 Pod 被删除并重新创建，此卷会被重新解析，这意味着在 Pod 重新创建时将可以访问新的远程内容。
@@ -1574,7 +1574,7 @@ Volume 表示 Pod 中一个有名字的卷，可以由 Pod 中的任意容器进
   此卷可以挂载的对象类型由主机上的容器运行时实现负责定义，至少必须包含容器镜像字段所支持的所有有效类型。
   OCI 对象将以只读方式被挂载到单个目录（`spec.containers[*].volumeMounts.mountPath`）中。
   在 Linux 上，容器运行时通常还会挂载阻止文件执行（`noexec`）的卷。
-  不支持容器使用子路径挂载（`spec.containers[*].volumeMounts.subpath`）。
+  1.33 版本之前不支持容器使用子路径挂载（`spec.containers[*].volumeMounts.subpath`）。
   `spec.securityContext.fsGroupChangePolicy` 字段对这种卷没有效果。
 
   <!--
diff --git a/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade/kubeadm_upgrade_plan.md b/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade/kubeadm_upgrade_plan.md
@@ -89,6 +89,20 @@ Path to a kubeadm configuration file.
 </td>
 </tr>
 
+<tr>
+<td colspan="2">--etcd-upgrade&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<!--Default:-->默认值：true</td>
+</tr>
+<tr>
+<td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
+<!--
+Perform the upgrade of etcd.
+-->
+执行 etcd 升级。
+</p>
+</td>
+</tr>
+
 <tr>
 <td colspan="2">-o, --experimental-output string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "text"</td>
 </tr>
diff --git a/content/zh-cn/docs/tasks/configure-pod-container/assign-memory-resource.md b/content/zh-cn/docs/tasks/configure-pod-container/assign-memory-resource.md
@@ -522,6 +522,8 @@ kubectl delete namespace mem-example
 * [Assign Pod-level CPU and memory resources](/docs/tasks/configure-pod-container/assign-pod-level-resources/)
 
 * [Configure Quality of Service for Pods](/docs/tasks/configure-pod-container/quality-service-pod/)
+
+* [Resize CPU and Memory Resources assigned to Containers](/docs/tasks/configure-pod-container/resize-container-resources/)
 -->
 ### 应用开发者扩展阅读    {#for-app-developers}
 
@@ -531,6 +533,8 @@ kubectl delete namespace mem-example
 
 * [配置 Pod 的服务质量](/zh-cn/docs/tasks/configure-pod-container/quality-service-pod/)
 
+* [调整分配给容器的 CPU 和内存资源大小](/zh-cn/docs/tasks/configure-pod-container/resize-container-resources/)
+
 <!--
 ### For cluster administrators
 
diff --git a/layouts/partials/hooks/body-end.html b/layouts/partials/hooks/body-end.html
@@ -1,6 +1,3 @@
-{{ if .HasShortcode "kat-button" }}
-<div id="katacoda-environment" data-katacoda-ondemand="true" data-katacoda-port="30000" data-katacoda-env="minikube:1.20" data-katacoda-command="start.sh" data-katacoda-ui="panel"></div>
-{{ end }}
 {{ with .Site.Params.algolia_docsearch }}
 <!-- scripts for algolia docsearch -->
 {{ end }}
