add zh pages

content/zh/docs/concepts/cluster-administration/addons.md

@@ -1,10 +1,10 @@
 ---
 
 title: 安装扩展（Addons）
-content_template: templates/concept
+content_type: concept
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 
 <!--
@@ -21,10 +21,10 @@ Add-ons 扩展了 Kubernetes 的功能。
 
 每个 add-ons 按字母顺序排序 - 顺序不代表任何优先地位。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Networking and Network Policy
@@ -110,4 +110,4 @@ Well-maintained ones should be linked to here. PRs welcome!
 
 维护完善的 add-ons 应该被链接到这里。欢迎提出 PRs！
 
-{{% /capture %}}
+

content/zh/docs/concepts/cluster-administration/certificates.md

@@ -2,12 +2,12 @@
 cn-approvers:
 - lichuqiang
 title: 证书
-content_template: templates/concept
+content_type: concept
 weight: 20
 ---
 
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 When using client certificate authentication, you can generate certificates
@@ -17,10 +17,10 @@ manually through `easyrsa`, `openssl` or `cfssl`.
 当使用客户端证书进行认证时，用户可以使用现有部署脚本，或者通过 `easyrsa`、`openssl` 或
 `cfssl` 手动生成证书。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 ### easyrsa
 
@@ -473,4 +473,4 @@ x509 certificates to use for authentication as documented
 您可以按照[这里](/docs/tasks/tls/managing-tls-in-a-cluster)记录的方式，
 使用 `certificates.k8s.io` API 来准备 x509 证书，用于认证。
 
-{{% /capture %}}
+

content/zh/docs/concepts/cluster-administration/cloud-providers.md

@@ -1,26 +1,26 @@
 ---
 title: 云驱动
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 
 <!--
 ---
 title: Cloud Providers
-content_template: templates/concept
+content_type: concept
 weight: 30
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 This page explains how to manage Kubernetes running on a specific
 cloud provider.
 -->
 本文介绍了如何管理运行在特定云驱动上的 Kubernetes 集群。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 <!--
 ### kubeadm
 [kubeadm](/docs/reference/setup-tools/kubeadm/kubeadm/) is a popular option for creating kubernetes clusters.
@@ -592,7 +592,7 @@ Kubernetes network plugin and should appear in the `[Route]` section of the
 
 [kubenet]: /docs/concepts/cluster-administration/network-plugins/#kubenet
 
-{{% /capture %}}
+
 
 ## OVirt
 

content/zh/docs/concepts/cluster-administration/cluster-administration-overview.md

@@ -1,10 +1,10 @@
 ---
 title: 集群管理概述
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 The cluster administration overview is for anyone creating or administering a Kubernetes cluster.
@@ -13,9 +13,9 @@ It assumes some familiarity with core Kubernetes [concepts](/docs/concepts/).
 
 集群管理概述面向任何创建和管理 Kubernetes 集群的读者人群。
 我们假设你对[用户指南](/docs/user-guide/)中的概念大概了解。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Planning a cluster
@@ -142,4 +142,4 @@ Note: Not all distros are actively maintained. Choose distros which have been te
 
 * [记录和监控集群活动](/docs/concepts/cluster-administration/logging/)阐述了 Kubernetes 的日志如何工作以及怎样实现。
 
-{{% /capture %}}
+

content/zh/docs/concepts/cluster-administration/controller-metrics.md

@@ -1,18 +1,18 @@
 ---
 title: 控制器管理器指标
-content_template: templates/concept
+content_type: concept
 weight: 100
 ---
 
 <!--
 ---
 title: Controller manager metrics
-content_template: templates/concept
+content_type: concept
 weight: 100
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Controller manager metrics provide important insight into the performance and health of
@@ -21,9 +21,9 @@ the controller manager.
 
 控制器管理器指标为控制器管理器的性能和健康提供了重要的观测手段。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## What are controller manager metrics
@@ -79,4 +79,4 @@ to periodically gather these metrics and make them available in some kind of tim
 
 在生产环境中，您可能想配置 prometheus 或其他一些指标收集工具，以定期收集这些指标数据，并将它们应用到某种时间序列数据库中。
 
-{{% /capture %}}
+

content/zh/docs/concepts/cluster-administration/federation.md

@@ -1,13 +1,13 @@
 ---
 title: 联邦
-content_template: templates/concept
+content_type: concept
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 本页面阐明了为何以及如何使用联邦创建Kubernetes集群。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 ## 为何使用联邦
 
 联邦可以使多个集群的管理简单化。它提供了两个主要构件模块：
@@ -105,13 +105,14 @@ Kubernetes集群数量选择也许是一个相对静止的选择，因为对其
 
 最后，如果你的集群需求超过一个Kubernetes集群推荐的最大节点数，那么你可能需要更多的集群。Kubernetes1.3版本支持多达1000个节点的集群规模。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 * 进一步学习[联邦提案](https://github.com/kubernetes/community/blob/{{< param "githubbranch" >}}/contributors/design-proposals/multicluster/federation.md)。
 * 集群联邦参考该[配置指导](/docs/tutorials/federation/set-up-cluster-federation-kubefed/)。
 * 查看[Kubecon2016浅谈联邦](https://www.youtube.com/watch?v=pq9lbkmxpS8)
-{{% /capture %}}
+
 
 
 

content/zh/docs/concepts/cluster-administration/kubelet-garbage-collection.md

@@ -1,18 +1,18 @@
 ---
 title: 配置 kubelet 垃圾回收策略
-content_template: templates/concept
+content_type: concept
 weight: 70
 ---
 
 <!--
 ---
 title: Configuring kubelet Garbage Collection
-content_template: templates/concept
+content_type: concept
 weight: 70
 ---
 -->
 
-{{% capture overview %}}
+<!-- overview -->
 
 垃圾回收是 kubelet 的一个有用功能，它将清理未使用的镜像和容器。
 
@@ -32,10 +32,10 @@ Kubelet will perform garbage collection for containers every minute and garbage
 External garbage collection tools are not recommended as these tools can potentially break the behavior of kubelet by removing containers expected to exist.
 -->
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 ## 镜像回收
 
@@ -202,9 +202,10 @@ Including:
 | `--outofdisk-transition-frequency` | `--eviction-pressure-transition-period` | eviction generalizes disk pressure transition to other resources |
 -->
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 查阅 [配置驱逐回收资源的策略](/docs/tasks/administer-cluster/out-of-resource/) 获取更多细节。
 
@@ -212,4 +213,4 @@ Including:
 See [Configuring Out Of Resource Handling](/docs/tasks/administer-cluster/out-of-resource/) for more details.
 -->
 
-{{% /capture %}}
+

content/zh/docs/concepts/cluster-administration/logging.md

@@ -3,11 +3,11 @@ reviewers:
 - piosz
 - x13n
 title: 日志架构
-content_template: templates/concept
+content_type: concept
 weight: 60
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 Application and systems logs can help you understand what is happening inside your cluster. The logs are particularly useful for debugging problems and monitoring cluster activity. Most modern applications have some kind of logging mechanism; as such, most container engines are likewise designed to support some kind of logging. The easiest and most embraced logging method for containerized applications is to write to the standard output and standard error streams.
@@ -19,9 +19,9 @@ However, the native functionality provided by a container engine or runtime is u
 -->
 但是，由容器引擎或 runtime 提供的原生功能通常不足以满足完整的日志记录方案。例如，如果发生容器崩溃、pod 被逐出或节点宕机等情况，您仍然想访问到应用日志。因此，日志应该具有独立的存储和生命周期，与节点、pod 或容器的生命周期相独立。这个概念叫 _集群级的日志_ 。集群级日志方案需要一个独立的后台来存储、分析和查询日志。Kubernetes 没有为日志数据提供原生存储方案，但是您可以集成许多现有的日志解决方案到 Kubernetes 集群中。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 Cluster-level logging architectures are described in assumption that
@@ -478,4 +478,4 @@ is outside the scope of Kubernetes.
 -->
 通过暴露或推送每个应用的日志，您可以实现集群级日志记录；然而，这种日志记录机制的实现已超出 Kubernetes 的范围。
 
-{{% /capture %}}
+

content/zh/docs/concepts/cluster-administration/manage-deployment.md

@@ -1,20 +1,20 @@
 ---
 title: 管理资源
-content_template: templates/concept
+content_type: concept
 weight: 40
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 You've deployed your application and exposed it via a service. Now what? Kubernetes provides a number of tools to help you manage your application deployment, including scaling and updating. Among the features that we will discuss in more depth are [configuration files](/docs/concepts/configuration/overview/) and [labels](/docs/concepts/overview/working-with-objects/labels/).
  -->
 您已经部署了应用并通过服务暴露它。然后呢？Kubernetes 提供了一些工具来帮助管理您的应用部署，包括缩扩容和更新。我们将更深入讨论的特性包括[配置文件](/docs/concepts/configuration/overview/)和[标签](/docs/concepts/overview/working-with-objects/labels/)。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Organizing resource configurations
@@ -651,9 +651,10 @@ That's it! The Deployment will declaratively update the deployed nginx applicati
  -->
 没错，就是这样！Deployment 将在后台逐步更新已经部署的 nginx 应用。它确保在更新过程中，只有一定数量的旧副本被开闭，并且只有一定基于所需 pod 数量的新副本被创建。想要了解更多细节，请参考 [Deployment](/docs/concepts/workloads/controllers/deployment/)。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 - [Learn about how to use `kubectl` for application introspection and debugging.](/docs/tasks/debug-application-cluster/debug-application-introspection/)
@@ -662,4 +663,4 @@ That's it! The Deployment will declaratively update the deployed nginx applicati
 - [学习怎么样使用 `kubectl` 观察和调试应用](/docs/tasks/debug-application-cluster/debug-application-introspection/)
 - [配置最佳实践和技巧](/docs/concepts/configuration/overview/)
 
-{{% /capture %}}
+

content/zh/docs/concepts/cluster-administration/monitoring.md

@@ -1,10 +1,10 @@
 ---
 title: Kubernetes 控制面的指标
-content_template: templates/concept
+content_type: concept
 weight: 60
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 
 <!--
 System component metrics can give a better look into what is happening inside them. Metrics are particularly useful for building dashboards and alerts.
@@ -16,9 +16,9 @@ Metrics in Kubernetes control plane are emitted in [prometheus format](https://p
 
 Kubernetes 控制面板中的指标是以 [prometheus](https://prometheus.io/docs/instrumenting/exposition_formats/) 格式发出的，而且是易于阅读的。
 
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 ## Metrics in Kubernetes
@@ -205,9 +205,10 @@ cloudprovider_gce_api_request_duration_seconds { request = "detach_disk"}
 cloudprovider_gce_api_request_duration_seconds { request = "list_disk"}
 ```
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 * Read about the [Prometheus text format](https://github.com/prometheus/docs/blob/master/content/docs/instrumenting/exposition_formats.md#text-based-format) for metrics
@@ -219,4 +220,4 @@ cloudprovider_gce_api_request_duration_seconds { request = "list_disk"}
 * 查看 [Kubernetes 稳定版指标](https://github.com/kubernetes/kubernetes/blob/master/test/instrumentation/testdata/stable-metrics-list.yaml)列表
 * 了解有关 [Kubernetes 指标弃用策略](https://kubernetes.io/docs/reference/using-api/deprecation-policy/#deprecating-a-feature-or-behavior )
 
-{{% /capture %}}
+

content/zh/docs/concepts/cluster-administration/networking.md

@@ -2,11 +2,11 @@
 reviewers:
 - thockin
 title: 集群网络系统
-content_template: templates/concept
+content_type: concept
 weight: 50
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 <!--
 Networking is a central part of Kubernetes, but it can be challenging to
 understand exactly how it is expected to work.  There are 4 distinct networking
@@ -25,10 +25,10 @@ problems to address:
 3. Pod 和 Service 间通信：这个已经在 [services](/docs/concepts/services-networking/service/) 里讲述过了。
 4. 外部和 Service 间通信：这个也已经在 [services](/docs/concepts/services-networking/service/) 讲述过了。
 
-{{% /capture %}}
 
 
-{{% capture body %}}
+
+<!-- body -->
 
 <!--
 Kubernetes is all about sharing machines between applications.  Typically,
@@ -555,9 +555,10 @@ to run, and in both cases, the network provides one IP address per pod - as is s
 
 [Weave Net](https://www.weave.works/products/weave-net/) 是 Kubernetes 及其托管应用程序的弹性和易于使用的网络系统。Weave Net 可以作为 [CNI plug-in](https://www.weave.works/docs/net/latest/cni-plugin/) 运行或者独立运行。在这两种运行方式里，都不需要任何配置或额外的代码即可运行，并且在两种情况下，网络都为每个 Pod 提供一个 IP 地址-这是 Kubernetes 的标准配置。
 
-{{% /capture %}}
 
-{{% capture whatsnext %}}
+
+## {{% heading "whatsnext" %}}
+
 
 <!--
 The early design of the networking model and its rationale, and some future
@@ -567,4 +568,4 @@ document](https://git.k8s.io/community/contributors/design-proposals/network/net
 网络模型的早期设计、运行原理以及未来的一些计划，都在 [networking design
 document](https://git.k8s.io/community/contributors/design-proposals/network/networking.md) 文档里进行了更详细的描述。
 
-{{% /capture %}}
+

content/zh/docs/concepts/cluster-administration/proxies.md

@@ -1,13 +1,13 @@
 ---
 title: Kubernetes 中的代理
-content_template: templates/concept
+content_type: concept
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 本文讲述了 Kubernetes 中所使用的代理。
-{{% /capture %}}
 
-{{% capture body %}}
+
+<!-- body -->
 
 ## 代理
 
@@ -59,4 +59,4 @@ Kubernetes 用户通常只需要关心前两种类型的代理，集群管理员
 
 代理已经取代重定向功能，重定向已被弃用。
 
-{{% /capture %}}
+