From d974c637f1abfc19d0698f9fec7bfb1bfc2494c0 Mon Sep 17 00:00:00 2001 From: xin gu <418294249@qq.com> Date: Mon, 11 Sep 2023 18:49:20 +0800 Subject: [PATCH] sync container-runtime config kubeadm-config sync container-runtime config kubeadm-config --- .../docs/reference/glossary/container-runtime.md | 6 ++++-- content/zh-cn/docs/reference/scheduling/config.md | 11 ++--------- .../reference/setup-tools/kubeadm/kubeadm-config.md | 7 +++++++ 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/content/zh-cn/docs/reference/glossary/container-runtime.md b/content/zh-cn/docs/reference/glossary/container-runtime.md index c33bebe603..030b61d9cb 100644 --- a/content/zh-cn/docs/reference/glossary/container-runtime.md +++ b/content/zh-cn/docs/reference/glossary/container-runtime.md @@ -26,9 +26,11 @@ tags: --> <!-- - The container runtime is the software that is responsible for running containers. +A fundamental component that empowers Kubernetes to run containers effectively. +It is responsible for managing the execution and lifecycle of containers within the Kubernetes environment. --> -容器运行环境是负责运行容器的软件。 +这个基础组件使 Kubernetes 能够有效运行容器。 +它负责管理 Kubernetes 环境中容器的执行和生命周期。 <!--more--> diff --git a/content/zh-cn/docs/reference/scheduling/config.md b/content/zh-cn/docs/reference/scheduling/config.md index 830314c415..7d6679e9bf 100644 --- a/content/zh-cn/docs/reference/scheduling/config.md +++ b/content/zh-cn/docs/reference/scheduling/config.md @@ -52,19 +52,12 @@ clientConnection: {{< note >}} <!-- -KubeSchedulerConfiguration [v1beta2](/docs/reference/config-api/kube-scheduler-config.v1beta2/) -is deprecated in v1.25 and will be removed in v1.28. KubeSchedulerConfiguration [v1beta3](/docs/reference/config-api/kube-scheduler-config.v1beta3/) is deprecated in v1.26 and will be removed in v1.29. - Please migrate KubeSchedulerConfiguration to [v1](/docs/reference/config-api/kube-scheduler-config.v1/). --> -KubeSchedulerConfiguration [v1beta2](/zh-cn/docs/reference/config-api/kube-scheduler-config.v1beta2/) -在 v1.25 中已弃用,并将在 v1.28 中移除。 -KubeSchedulerConfiguration [v1beta3](/zh-cn/docs/reference/config-api/kube-scheduler-config.v1beta3/) -在 v1.26 中已弃用,并将在 v1.29 中移除。 - -请将 KubeSchedulerConfiguration 迁移到 [v1](/zh-cn/docs/reference/config-api/kube-scheduler-config.v1/)。 +KubeSchedulerConfiguration [v1beta3](/zh-cn/docs/reference/config-api/kube-scheduler-config.v1beta3/) 在 v1.26 中已被弃用, +并将在 v1.29 中被移除。请将 KubeSchedulerConfiguration 迁移到 [v1](/zh-cn/docs/reference/config-api/kube-scheduler-config.v1/)。 {{< /note >}} <!-- diff --git a/content/zh-cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md b/content/zh-cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md index 0d12828260..a9bb478a7b 100644 --- a/content/zh-cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md +++ b/content/zh-cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md @@ -49,10 +49,14 @@ For more information on using the kubeadm configuration API navigate to <!-- You can use `kubeadm config migrate` to convert your old configuration files that contain a deprecated API version to a newer, supported API version. + +`kubeadm config validate` can be used for validating a configuration file. --> 你可以使用 `kubeadm config migrate` 来转换旧配置文件, 把其中已弃用的 API 版本更新为受支持的 API 版本。 +`kubeadm config validate` 可用于验证配置文件。 + <!-- `kubeadm config images list` and `kubeadm config images pull` can be used to list and pull the images that kubeadm requires. @@ -72,6 +76,9 @@ that kubeadm requires. ## kubeadm config migrate {#cmd-config-migrate} {{< include "generated/kubeadm_config_migrate.md" >}} +## kubeadm config validate {#cmd-config-validate} +{{< include "generated/kubeadm_config_validate.md" >}} + ## kubeadm config images list {#cmd-config-images-list} {{< include "generated/kubeadm_config_images_list.md" >}}