From 8be67a9cfce45bf2f3a6fbfac835fcee9b83fa68 Mon Sep 17 00:00:00 2001 From: "xin.li" Date: Mon, 2 Jan 2023 21:29:46 +0800 Subject: [PATCH] [zh-cn]sync common-labels volumes intro Signed-off-by: xin.li --- .../working-with-objects/common-labels.md | 4 ++-- content/zh-cn/docs/concepts/storage/volumes.md | 16 +++++++++++----- content/zh-cn/docs/concepts/windows/intro.md | 4 ---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/content/zh-cn/docs/concepts/overview/working-with-objects/common-labels.md b/content/zh-cn/docs/concepts/overview/working-with-objects/common-labels.md index 5596ecdb0f..eb56faae44 100644 --- a/content/zh-cn/docs/concepts/overview/working-with-objects/common-labels.md +++ b/content/zh-cn/docs/concepts/overview/working-with-objects/common-labels.md @@ -70,7 +70,7 @@ on every resource object. | ----------------------------------- | --------------------- | -------- | ---- | | `app.kubernetes.io/name` | The name of the application | `mysql` | string | | `app.kubernetes.io/instance` | A unique name identifying the instance of an application | `mysql-abcxzy` | string | -| `app.kubernetes.io/version` | The current version of the application (e.g., a semantic version, revision hash, etc.) | `5.7.21` | string | +| `app.kubernetes.io/version` | The current version of the application (e.g., a [SemVer 1.0](https://semver.org/spec/v1.0.0.html), revision hash, etc.) | `5.7.21` | string | | `app.kubernetes.io/component` | The component within the architecture | `database` | string | | `app.kubernetes.io/part-of` | The name of a higher level application this one is part of | `wordpress` | string | | `app.kubernetes.io/managed-by` | The tool being used to manage the operation of an application | `helm` | string | @@ -79,7 +79,7 @@ on every resource object. | ----------------------------------- | --------------------- | -------- | ---- | | `app.kubernetes.io/name` | 应用程序的名称 | `mysql` | 字符串 | | `app.kubernetes.io/instance` | 用于唯一确定应用实例的名称 | `mysql-abcxzy` | 字符串 | -| `app.kubernetes.io/version` | 应用程序的当前版本(例如语义版本、修订版哈希等) | `5.7.21` | 字符串 | +| `app.kubernetes.io/version` | 应用程序的当前版本(例如[语义版本 1.0](https://semver.org/spec/v1.0.0.html)、修订版哈希等) | `5.7.21` | 字符串 | | `app.kubernetes.io/component` | 架构中的组件 | `database` | 字符串 | | `app.kubernetes.io/part-of` | 此级别的更高级别应用程序的名称 | `wordpress` | 字符串 | | `app.kubernetes.io/managed-by` | 用于管理应用程序的工具 | `helm` | 字符串 | diff --git a/content/zh-cn/docs/concepts/storage/volumes.md b/content/zh-cn/docs/concepts/storage/volumes.md index 215e8e908b..96aba7d7aa 100644 --- a/content/zh-cn/docs/concepts/storage/volumes.md +++ b/content/zh-cn/docs/concepts/storage/volumes.md @@ -663,7 +663,8 @@ Kubernetes 主机才可以访问它们。 {{< /note >}} 更多详情请参考 [FC 示例](https://github.com/kubernetes/examples/tree/master/staging/volumes/fibre_channel)。 @@ -863,7 +864,9 @@ and the kubelet, set the `InTreePluginGCEUnregister` flag to `true`. {{< warning >}} `gitRepo` 卷类型已经被废弃。如果需要在容器中提供 git 仓库,请将一个 [EmptyDir](#emptydir) 卷挂载到 InitContainer 中,使用 git @@ -1277,7 +1280,9 @@ spec: 在使用 NFS 卷之前,你必须运行自己的 NFS 服务器并将目标 share 导出备用。 @@ -1288,7 +1293,8 @@ Also note that you can't specify NFS mount options in a Pod spec. You can either {{< /note >}} 如需了解用持久卷挂载 NFS 卷的示例,请参考 [NFS 示例](https://github.com/kubernetes/examples/tree/master/staging/volumes/nfs)。 @@ -1938,7 +1944,7 @@ persistent volume: volume expansion, the kubelet passes that data via the `NodeExpandVolume()` call to the CSI driver. In order to use the `nodeExpandSecretRef` field, your cluster should be running Kubernetes version 1.25 or later and you must enable - the [feature gate](https://kubernetes.io/docs/reference/command-line-tools-reference/feature-gates/) + the [feature gate](/docs/reference/command-line-tools-reference/feature-gates/) named `CSINodeExpandSecret` for each kube-apiserver and for the kubelet on every node. You must also be using a CSI driver that supports or requires secret data during node-initiated storage resize operations. diff --git a/content/zh-cn/docs/concepts/windows/intro.md b/content/zh-cn/docs/concepts/windows/intro.md index 3251b330b5..4322f9085f 100644 --- a/content/zh-cn/docs/concepts/windows/intro.md +++ b/content/zh-cn/docs/concepts/windows/intro.md @@ -715,16 +715,12 @@ Kubernetes Slack 上的 SIG Windows 频道也是一个很好的途径, The kubeadm tool helps you to deploy a Kubernetes cluster, providing the control plane to manage the cluster it, and nodes to run your workloads. -[Adding Windows nodes](/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes/) -explains how to deploy Windows nodes to your cluster using kubeadm. The Kubernetes [cluster API](https://cluster-api.sigs.k8s.io/) project also provides means to automate deployment of Windows nodes. --> ### 部署工具 {#deployment-tools} kubeadm 工具帮助你部署 Kubernetes 集群,提供管理集群的控制平面以及运行工作负载的节点。 -[添加 Windows 节点](/zh-cn/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes/)阐述了如何使用 -kubeadm 将 Windows 节点部署到你的集群。 Kubernetes [集群 API](https://cluster-api.sigs.k8s.io/) 项目也提供了自动部署 Windows 节点的方式。