Clean zh/docs directory for dangling YAML files (#17341)

There are many YAML manifests sneaking into the `zh/docs/` directory. These files should go to the `zh/examples` directory instead. Having these "garbage" files (not referenced anywhere) is creating confusion for the release meister when merging branches. For example, some YAML files found in the 'master' branch are no longer there in the release-1.16 branch. It is tedious, if possible at all, to solve all this kind of conflicts during a rebase. The PR cleanses the zh/docs directory for all dangling YAML files.
2019-11-04 08:24:48 +08:00
parent 8c5faa68b7
commit 9bf026e951
138 changed files with 603 additions and 2740 deletions
@@ -11,13 +11,10 @@ content_template: templates/task

 {{% capture overview %}}

-
-
 本文旨在说明如何让一个 Pod 内的两个容器使用一个卷（Volume）进行通信。

 {{% /capture %}}

-
 {{% capture prerequisites %}}

 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
@@ -30,36 +27,24 @@ content_template: templates/task

 ## 创建一个包含两个容器的 Pod

-
-
-
 在这个练习中，你会创建一个包含两个容器的 Pod。两个容器共享一个卷用于他们之间的通信。
 Pod 的配置文件如下：

-{{< code file="two-container-pod.yaml" >}}
-
-
+{{< codenew file="pods/two-container-pod.yaml" >}}

 在配置文件中，你可以看到 Pod 有一个共享卷，名为 `shared-data`。

-
-
-
-
 配置文件中的第一个容器运行了一个 nginx 服务器。共享卷的挂载路径是 `/usr/share/nginx/html`。
 第二个容器是基于 debian 镜像的，有一个 `/pod-data` 的挂载路径。第二个容器运行了下面的命令然后终止。

    echo Hello from the debian container > /pod-data/index.html

-
-
 注意，第二个容器在 nginx 服务器的根目录下写了 `index.html` 文件。


 创建一个包含两个容器的 Pod：

-    kubectl create -f https://k8s.io/docs/tasks/access-application-cluster/two-container-pod.yaml
-
+    kubectl apply -f https://k8s.io/examples/pods/two-container-pod.yaml

 查看 Pod 和容器的信息：

@@ -44,19 +44,15 @@ content_template: templates/tutorial

 ### 使用部署对象（Deployment）创建后端

-
-
 后端是一个简单的 hello 欢迎微服务应用。这是后端应用的 Deployment 配置文件：

-{{< code file="hello.yaml" >}}
-
+{{< codenew file="service/access/hello.yaml" >}}

 创建后端 Deployment：

+```shell
+kubectl apply -f https://k8s.io/examples/service/access/hello.yaml
 ```
-kubectl create -f https://k8s.io/docs/tasks/access-application-cluster/hello.yaml
-```
-

 查看后端的 Deployment 信息：

@@ -64,7 +60,6 @@ kubectl create -f https://k8s.io/docs/tasks/access-application-cluster/hello.yam
 kubectl describe deployment hello
 ```

-
 输出类似于：

 ```
@@ -98,8 +93,7 @@ Events:

 首先，浏览 Service 的配置文件：

-{{< code file="hello-service.yaml" >}}
-
+{{< codenew file="service/access/hello-service.yaml" >}}


 配置文件中，你可以看到 Service 将流量路由到包含 `app: hello` 和 `tier: backend` 标签的 Pod。
@@ -107,46 +101,33 @@ Events:

 创建 `hello` Service：

+```shell
+kubectl apply -f https://k8s.io/examples/service/access/hello-service.yaml
 ```
-kubectl create -f https://k8s.io/docs/tasks/access-application-cluster/hello-service.yaml
-```
-
-

 此时，你已经有了一个在运行的后端 Deployment，你也有了一个 Service 用于路由网络流量。


 ### 创建前端应用

-
-
-
-
 既然你已经有了后端应用，你可以创建一个前端应用连接到后端。前端应用通过 DNS 名连接到后端的工作 Pods。
 DNS 名是 "hello"，也就是 Service 配置文件中 `name` 字段的值。

-
-
 前端 Deployment 中的 Pods 运行一个 nginx 镜像，这个已经配置好镜像去寻找后端的 hello Service。
 只是 nginx 的配置文件：

-{{< code file="frontend/frontend.conf" >}}
-
-
-
+{{< codenew file="service/access/frontend.conf" >}}

 与后端类似，前端用包含一个 Deployment 和一个 Service。Service 的配置文件包含了 `type: LoadBalancer`，
 也就是说，Service 会使用你的云服务商的默认负载均衡设备。

-{{< code file="frontend.yaml" >}}
-
+{{< codenew file="service/access/frontend.yaml" >}}

 创建前端 Deployment 和 Service：

+```shell
+kubectl apply -f https://k8s.io/examples/service/access/frontend.yaml
 ```
-kubectl create -f https://k8s.io/docs/tasks/access-application-cluster/frontend.yaml
-```
-

 通过输出确认两个资源都已经被创建：

@@ -155,27 +136,17 @@ deployment "frontend" created
 service "frontend" created
 ```

-
-
-
-
-
 **注意**：这个 nginx 配置文件是被打包在 [容器镜像](/docs/tasks/access-application-cluster/frontend/Dockerfile) 里的。
 更好的方法是使用 [ConfigMap](/docs/tasks/configure-pod-container/configure-pod-configmap/)，这样的话你可以更轻易地更改配置。

-
 ### 与前端 Service 交互

-
-
 一旦你创建了 LoadBalancer 类型的 Service，你可以使用这条命令查看外部 IP：

 ```
 kubectl get service frontend
 ```

-
-
 外部 IP 字段的生成可能需要一些时间。如果是这种情况，外部 IP 会显示为 `<pending>`。

 ```
@@ -1,34 +0,0 @@
-kind: Service
-apiVersion: v1
-metadata:
-  name: frontend
-spec:
-  selector:
-    app: hello
-    tier: frontend
-  ports:
-  - protocol: "TCP"
-    port: 80
-    targetPort: 80
-  type: LoadBalancer
---
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: frontend
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: hello
-        tier: frontend
-        track: stable
-    spec:
-      containers:
-      - name: nginx
-        image: "gcr.io/google-samples/hello-frontend:1.0"
-        lifecycle:
-          preStop:
-            exec:
-              command: ["/usr/sbin/nginx","-s","quit"]
@@ -1,11 +0,0 @@
-upstream hello {
-    server hello;
-}
-
-server {
-    listen 80;
-
-    location / {
-        proxy_pass http://hello;
-    }
-}
@@ -1,12 +0,0 @@
-kind: Service
-apiVersion: v1
-metadata:
-  name: hello
-spec:
-  selector:
-    app: hello
-    tier: backend
-  ports:
-  - protocol: TCP
-    port: 80
-    targetPort: http
@@ -1,19 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: hello
-spec:
-  replicas: 7
-  template:
-    metadata:
-      labels:
-        app: hello
-        tier: backend
-        track: stable
-    spec:
-      containers:
-        - name: hello
-          image: "gcr.io/google-samples/hello-go-gke:1.0"
-          ports:
-            - name: http
-              containerPort: 80
@@ -1,33 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  labels:
-    name: redis
-    redis-sentinel: "true"
-    role: master
-  name: redis-master
-spec:
-  containers:
-    - name: master
-      image: k8s.gcr.io/redis:v1
-      env:
-        - name: MASTER
-          value: "true"
-      ports:
-        - containerPort: 6379
-      resources:
-        limits:
-          cpu: "0.1"
-      volumeMounts:
-        - mountPath: /redis-master-data
-          name: data
-    - name: sentinel
-      image: kubernetes/redis:v1
-      env:
-        - name: SENTINEL
-          value: "true"
-      ports:
-        - containerPort: 26379
-  volumes:
-    - name: data
-      emptyDir: {}
@@ -1,27 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: two-containers
-spec:
-
-  restartPolicy: Never
-
-  volumes:
-  - name: shared-data
-    emptyDir: {}
-
-  containers:
-
-  - name: nginx-container
-    image: nginx
-    volumeMounts:
-    - name: shared-data
-      mountPath: /usr/share/nginx/html
-
-  - name: debian-container
-    image: debian
-    volumeMounts:
-    - name: shared-data
-      mountPath: /pod-data
-    command: ["/bin/sh"]
-    args: ["-c", "echo Hello from the debian container > /pod-data/index.html"]
@@ -1,412 +0,0 @@
---
-approvers:
- derekwaynecarr
- janetkuo
-
-title: 应用资源配额和限额
-redirect_from:
- "/docs/admin/resourcequota/walkthrough/"
- "/docs/admin/resourcequota/walkthrough.html"
- "/docs/tasks/configure-pod-container/apply-resource-quota-limit/"
- "/docs/tasks/configure-pod-container/apply-resource-quota-limit.html"
-content_template: templates/task
---
-
-{{% capture overview %}}
-
-
-本示例展示了在一个 namespace 中控制资源用量的典型设置。
-
-
-本文展示了以下资源的使用： [Namespace](/docs/admin/namespaces), [ResourceQuota](/docs/concepts/policy/resource-quotas/) 和  [LimitRange](/docs/tasks/configure-pod-container/limit-range/)。
-
-{{% /capture %}}
-
-{{% capture prerequisites %}}
-
-* {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
-
-{{% /capture %}}
-
-{{% capture steps %}}
-
-## 场景
-
-
-集群管理员正在操作一个代表用户群体的集群，他希望控制一个特定 namespace 中可以被使用的资源总量，以达到促进对集群的公平共享及控制成本的目的。
-
-
-集群管理员有以下目标：
-
-
-* 限制运行中 pods 使用的计算资源数量
-* 限制 persistent volume claims 数量以控制对存储的访问
-* 限制 load balancers 数量以控制成本
-* 防止使用 node ports 以保留稀缺资源
-* 提供默认计算资源请求以实现更好的调度决策
-
-
-## 创建 namespace
-
-
-本示例将在一个自定义的 namespace 中运行，以展示相关概念。
-
-
-让我们创建一个叫做 quota-example 的新 namespace：
-
-```shell
-$ kubectl create namespace quota-example
-namespace "quota-example" created
-$ kubectl get namespaces
-NAME            STATUS    AGE
-default         Active    2m
-kube-system     Active    2m
-quota-example   Active    39s
-```
-
-
-## 应用 object-count 配额到 namespace
-
-
-集群管理员想要控制下列资源：
-
-* persistent volume claims
-* load balancers
-* node ports
-
-
-我们来创建一个简单的配额，用于控制这个 namespace 中那些资源类型的对象数量。
-
-```shell
-$ kubectl create -f https://k8s.io/docs/tasks/configure-pod-container/rq-object-counts.yaml --namespace=quota-example
-resourcequota "object-counts" created
-```
-
-
-配额系统将察觉到有一个配额被创建，并且会计算 namespace 中的资源消耗量作为响应。这应该会很快发生。
-
-
-让我们显示一下配额来观察这个 namespace 中当前被消耗的资源：
-
-```shell
-$ kubectl describe quota object-counts --namespace=quota-example
-Name:                  object-counts
-Namespace:             quota-example
-Resource               Used    Hard
--------               ----    ----
-persistentvolumeclaims 0    2
-services.loadbalancers 0    2
-services.nodeports     0    0
-```
-
-
-配额系统现在将阻止用户创建比各个资源指定数量更多的资源。
-
-
-
-## 应用计算资源配额到 namespace
-
-
-为了限制这个 namespace 可以被使用的计算资源数量，让我们创建一个跟踪计算资源的配额。
-
-```shell
-$ kubectl create -f https://k8s.io/docs/tasks/configure-pod-container/rq-compute-resources.yaml --namespace=quota-example
-resourcequota "compute-resources" created
-```
-
-
-让我们显示一下配额来观察这个 namespace 中当前被消耗的资源：
-
-```shell
-$ kubectl describe quota compute-resources --namespace=quota-example
-Name:                  compute-resources
-Namespace:             quota-example
-Resource               Used Hard
--------               ---- ----
-limits.cpu             0    2
-limits.memory          0    2Gi
-pods                   0    4
-requests.cpu           0    1
-requests.memory        0    1Gi
-```
-
-
-配额系统现在会防止 namespace 拥有超过 4 个没有终止的 pods。此外它还将强制 pod 中的每个容器配置一个 `request` 并为 `cpu` 和 `memory` 定义 `limit`。
-
-
-## 应用默认资源请求和限制
-
-
-Pod 的作者很少为它们的 pods 指定资源请求和限制。
-
-
-既然我们对项目应用了配额，我们来看一下当终端用户通过创建一个没有 cpu 和 内存限制的 pod 时会发生什么。这通过在 pod 里创建一个 nginx 容器实现。
-
-
-作为演示，让我们来创建一个运行 nginx 的 deployment：
-
-```shell
-$ kubectl run nginx --image=nginx --replicas=1 --namespace=quota-example
-deployment "nginx" created
-```
-
-
-现在我们来看一下创建的 pods。
-
-```shell
-$ kubectl get pods --namespace=quota-example
-```
-
-
-发生了什么？我一个 pods 都没有！让我们 describe 这个 deployment 来看看发生了什么。
-
-```shell
-$ kubectl describe deployment nginx --namespace=quota-example
-Name:                   nginx
-Namespace:              quota-example
-CreationTimestamp:      Mon, 06 Jun 2016 16:11:37 -0400
-Labels:                 run=nginx
-Selector:               run=nginx
-Replicas:               0 updated | 1 total | 0 available | 1 unavailable
-StrategyType:           RollingUpdate
-MinReadySeconds:        0
-RollingUpdateStrategy:  1 max unavailable, 1 max surge
-OldReplicaSets:         <none>
-NewReplicaSet:          nginx-3137573019 (0/1 replicas created)
-...
-```
-
-
-Deployment 创建了一个对应的 replica set 并尝试按照大小来创建一个 pod。
-
-
-让我们看看 replica set 的更多细节。
-
-```shell
-$ kubectl describe rs nginx-3137573019 --namespace=quota-example
-Name:                   nginx-3137573019
-Namespace:              quota-example
-Image(s):               nginx
-Selector:               pod-template-hash=3137573019,run=nginx
-Labels:                 pod-template-hash=3137573019
-                        run=nginx
-Replicas:               0 current / 1 desired
-Pods Status:            0 Running / 0 Waiting / 0 Succeeded / 0 Failed
-No volumes.
-Events:
-  FirstSeen    LastSeen    Count From                    SubobjectPath Type      Reason        Message
-  ---------    --------  ----- ----                    -------------    --------  ------        -------
-  4m        7s        11    {replicaset-controller }              Warning   FailedCreate  Error creating: pods "nginx-3137573019-" is forbidden: Failed quota: compute-resources: must specify limits.cpu,limits.memory,requests.cpu,requests.memory
-```
-
-
-Kubernetes API server 拒绝了  replica set 创建一个 pod 的请求，因为我们的 pods 没有为 `cpu` 和 `memory` 指定 `requests` 或 `limits`。
-
-
-因此，我们来为 pod 指定它可以使用的 `cpu` 和 `memory` 默认数量。
-
-```shell
-$ kubectl create -f https://k8s.io/docs/tasks/configure-pod-container/rq-limits.yaml --namespace=quota-example
-limitrange "limits" created
-$ kubectl describe limits limits --namespace=quota-example
-Name:           limits
-Namespace:      quota-example
-Type      Resource  Min  Max  Default Request   Default Limit   Max Limit/Request Ratio
----      --------  ---  ---  ---------------   -------------   -----------------------
-Container memory    -    -    256Mi             512Mi           -
-Container cpu       -    -    100m              200m            -
-```
-
-
-如果 Kubernetes API server 发现一个 namespace 中有一个创建 pod 的请求，并且 pod 中的容器没有设置任何计算资源请求时，作为准入控制的一部分，一个默认的 request 和 limit 将会被应用。
-
-
-在本例中，创建的每个 pod 都将拥有如下的计算资源限制：
-
-```shell
-$ kubectl run nginx \
-  --image=nginx \
-  --replicas=1 \
-  --requests=cpu=100m,memory=256Mi \
-  --limits=cpu=200m,memory=512Mi \
-  --namespace=quota-example
-```
-
-
-由于已经为我们的 namespace 申请了默认的计算资源，我们的 replica set 应该能够创建它的 pods 了。
-
-```shell
-$ kubectl get pods --namespace=quota-example
-NAME                     READY     STATUS    RESTARTS   AGE
-nginx-3137573019-fvrig   1/1       Running   0          6m
-```
-
-
-而且如果打印出我们在这个 namespace 中的配额使用情况：
-
-```shell
-$ kubectl describe quota --namespace=quota-example
-Name:           compute-resources
-Namespace:      quota-example
-Resource        Used    Hard
--------        ----    ----
-limits.cpu      200m    2
-limits.memory   512Mi   2Gi
-pods            1       4
-requests.cpu    100m    1
-requests.memory 256Mi   1Gi
-
-
-Name:                 object-counts
-Namespace:            quota-example
-Resource              Used    Hard
--------              ----    ----
-persistentvolumeclaims 0      2
-services.loadbalancers 0      2
-services.nodeports     0      0
-```
-
-
-就像你看到的，创建的 pod 消耗了明确的计算资源量，并且正被 Kubernetes 正确的追踪着。
-
-
-## 高级配额 scopes
-
-
-让我们想象一下如果你不希望为你的 namespace 指定默认计算资源使用量。
-
-
-作为替换，你希望用户在它们的 namespace 中运行指定数量的 `BestEffort` pods，以从宽松的计算资源中获得好处。然后要求用户为需要更高质量服务的 pods 配置一个显式的资源请求。
-
-
-让我们新建一个拥有两个配额的 namespace 来演示这种行为：
-
-```shell
-$ kubectl create namespace quota-scopes
-namespace "quota-scopes" created
-$ kubectl create -f https://k8s.io/docs/tasks/configure-pod-container/rq-best-effort.yaml --namespace=quota-scopes
-resourcequota "best-effort" created
-$ kubectl create -f https://k8s.io/docs/tasks/configure-pod-container/rq-not-best-effort.yaml --namespace=quota-scopes
-resourcequota "not-best-effort" created
-$ kubectl describe quota --namespace=quota-scopes
-Name:       best-effort
-Namespace:  quota-scopes
-Scopes:     BestEffort
- * Matches all pods that have best effort quality of service.
-Resource    Used    Hard
--------    ----  ----
-pods        0     10
-
-
-Name:             not-best-effort
-Namespace:        quota-scopes
-Scopes:           NotBestEffort
- * Matches all pods that do not have best effort quality of service.
-Resource          Used  Hard
--------          ----  ----
-limits.cpu        0     2
-limits.memory     0     2Gi
-pods              0     4
-requests.cpu      0     1
-requests.memory   0     1Gi
-```
-
-
-在这种场景下，一个没有配置计算资源请求的 pod 将会被 `best-effort` 配额跟踪。
-
-
-而配置了计算资源请求的则会被 `not-best-effort` 配额追踪。
-
-
-让我们创建两个 deployments 作为演示：
-
-```shell
-$ kubectl run best-effort-nginx --image=nginx --replicas=8 --namespace=quota-scopes
-deployment "best-effort-nginx" created
-$ kubectl run not-best-effort-nginx \
-  --image=nginx \
-  --replicas=2 \
-  --requests=cpu=100m,memory=256Mi \
-  --limits=cpu=200m,memory=512Mi \
-  --namespace=quota-scopes
-deployment "not-best-effort-nginx" created
-```
-
-
-虽然没有指定默认的 limits，`best-effort-nginx` deployment 还是会创建 8 个 pods。这是由于它被 `best-effort` 配额追踪，而 `not-best-effort` 配额将忽略它。`not-best-effort` 配额将追踪 `not-best-effort-nginx` deployment，因为它创建的 pods 具有 `Burstable` 服务质量。
-
-
-让我们列出 namespace 中的 pods：
-
-```shell
-$ kubectl get pods --namespace=quota-scopes
-NAME                                     READY     STATUS    RESTARTS   AGE
-best-effort-nginx-3488455095-2qb41       1/1       Running   0          51s
-best-effort-nginx-3488455095-3go7n       1/1       Running   0          51s
-best-effort-nginx-3488455095-9o2xg       1/1       Running   0          51s
-best-effort-nginx-3488455095-eyg40       1/1       Running   0          51s
-best-effort-nginx-3488455095-gcs3v       1/1       Running   0          51s
-best-effort-nginx-3488455095-rq8p1       1/1       Running   0          51s
-best-effort-nginx-3488455095-udhhd       1/1       Running   0          51s
-best-effort-nginx-3488455095-zmk12       1/1       Running   0          51s
-not-best-effort-nginx-2204666826-7sl61   1/1       Running   0          23s
-not-best-effort-nginx-2204666826-ke746   1/1       Running   0          23s
-```
-
-
-如你看到的，所有 10 个 pods 都已经被准许创建。
-
-
-让我们 describe 这个 namespace 当前的配额使用情况：
-
-```shell
-$ kubectl describe quota --namespace=quota-scopes
-Name:            best-effort
-Namespace:       quota-scopes
-Scopes:          BestEffort
- * Matches all pods that have best effort quality of service.
-Resource         Used  Hard
--------         ----  ----
-pods             8     10
-
-
-Name:               not-best-effort
-Namespace:          quota-scopes
-Scopes:             NotBestEffort
- * Matches all pods that do not have best effort quality of service.
-Resource            Used  Hard
--------            ----  ----
-limits.cpu          400m  2
-limits.memory       1Gi   2Gi
-pods                2     4
-requests.cpu        200m  1
-requests.memory     512Mi 1Gi
-```
-
-
-如你看到的，`best-effort` 配额追踪了我们在 `best-effort-nginx` deployment 中创建的 8 个 pods 的资源用量，而 `not-best-effort` 配额追踪了我们在 `not-best-effort-nginx` deployment 中创的两个 pods 的用量。
-
-
-Scopes 提供了一种来对任何配额文档追踪的资源集合进行细分的机制，给操作人员部署和追踪资源消耗带来更大的灵活性。
-
-
-除 `BestEffort` 和 `NotBestEffort` scopes 之外，还有用于限制长时间运行和有时限 pods 的scopes。`Terminating` scope 将匹配任何 `spec.activeDeadlineSeconds` 不为 `nil` 的 pod。`NotTerminating` scope 将匹配任何 `spec.activeDeadlineSeconds` 为 `nil` 的 pod。这些 scopes 允许你基于 pods 在你集群中 node 上的预期持久程度来为它们指定配额。
-
-{{% /capture %}}
-
-{{% capture discussion %}}
-
-## 总结
-
-
-消耗节点 cpu 和 memory 资源的动作受到 namespace 配额定义的硬性配额限制的管制。
-
-
-任意消耗那些资源的动作能够被调整，或者获得一个 namespace 级别的默认值以符合你最终的目标。
-
-
-可以基于服务质量或者在你集群中节点上的预期持久程度来分配配额。
-
-{{% /capture %}}
-
-
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: constraints-cpu-demo-2
-spec:
-  containers:
-  - name: constraints-cpu-demo-2-ctr
-    image: nginx
-    resources:
-      limits:
-        cpu: "1.5"
-      requests:
-        cpu: "500m"
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: constraints-cpu-demo-4
-spec:
-  containers:
-  - name: constraints-cpu-demo-4-ctr
-    image: nginx
-    resources:
-      limits:
-        cpu: "800m"
-      requests:
-        cpu: "100m"
@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: constraints-cpu-demo-4
-spec:
-  containers:
-  - name: constraints-cpu-demo-4-ctr
-    image: vish/stress
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: constraints-cpu-demo
-spec:
-  containers:
-  - name: constraints-cpu-demo-ctr
-    image: nginx
-    resources:
-      limits:
-        cpu: "800m"
-      requests:
-        cpu: "500m"
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: LimitRange
-metadata:
-  name: cpu-min-max-demo-lr
-spec:
-  limits:
-  - max:
-      cpu: "800m"
-    min:
-      cpu: "200m"
-    type: Container
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: default-cpu-demo-2
-spec:
-  containers:
-  - name: default-cpu-demo-2-ctr
-    image: nginx
-    resources:
-      limits:
-        cpu: "1"
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: default-cpu-demo-3
-spec:
-  containers:
-  - name: default-cpu-demo-3-ctr
-    image: nginx
-    resources:
-      requests:
-        cpu: "0.75"
@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: default-cpu-demo
-spec:
-  containers:
-  - name: default-cpu-demo-ctr
-    image: nginx
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: LimitRange
-metadata:
-  name: cpu-limit-range
-spec:
-  limits:
-  - default:
-      cpu: 1
-    defaultRequest:
-      cpu: 0.5
-    type: Container
@@ -1,33 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: kube-dns-autoscaler
-  namespace: kube-system
-  labels:
-    k8s-app: kube-dns-autoscaler
-spec:
-  selector:
-    matchLabels:
-       k8s-app: kube-dns-autoscaler
-  template:
-    metadata:
-      labels:
-        k8s-app: kube-dns-autoscaler
-    spec:
-      containers:
-      - name: autoscaler
-        image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.1.1
-        resources:
-            requests:
-                cpu: "20m"
-                memory: "10Mi"
-        command:
-          - /cluster-proportional-autoscaler
-          - --namespace=kube-system
-          - --configmap=kube-dns-autoscaler
-          - --target=<SCALE_TARGET>
-          # When cluster is using large nodes(with more cores), "coresPerReplica" should dominate.
-          # If using small nodes, "nodesPerReplica" should dominate.
-          - --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"min":1}}
-          - --logtostderr=true
-          - --v=2
@@ -1,5 +1,7 @@
 ---
 title: 配置命名空间下pod总数
+content_template: templates/task
+weight: 60
 ---


@@ -32,12 +34,12 @@ kubectl create namespace quota-pod-example

 下面是一个资源配额的配置文件：

-{{< code file="quota-pod.yaml" >}}
+{{< codenew file="admin/resource/quota-pod.yaml" >}}

 创建这个资源配额：

 ```shell
-kubectl create -f https://k8s.io/docs/tasks/administer-cluster/quota-pod.yaml --namespace=quota-pod-example
+kubectl apply -f https://k8s.io/examples/admin/resource/quota-pod.yaml --namespace=quota-pod-example
 ```

 查看资源配额的详细信息：
@@ -61,14 +63,14 @@ status:

 下面是一个Deployment的配置文件：

-{{< code file="quota-pod-deployment.yaml" >}}
+{{< codenew file="admin/resource/quota-pod-deployment.yaml" >}}

 在配置文件中， `replicas: 3` 告诉kubernetes尝试创建三个pods，且运行相同的应用。

 创建这个Deployment：

 ```shell
-kubectl create -f https://k8s.io/docs/tasks/administer-cluster/quota-pod-deployment.yaml --namespace=quota-pod-example
+kubectl apply -f https://k8s.io/examples/admin/resource/quota-pod-deployment.yaml --namespace=quota-pod-example
 ```

 查看Deployment的详细信息：
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: constraints-mem-demo-2
-spec:
-  containers:
-  - name: constraints-mem-demo-2-ctr
-    image: nginx
-    resources:
-      limits:
-        memory: "1.5Gi"
-      requests:
-        memory: "800Mi"
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: constraints-mem-demo-3
-spec:
-  containers:
-  - name: constraints-mem-demo-3-ctr
-    image: nginx
-    resources:
-      limits:
-        memory: "800Mi"
-      requests:
-        memory: "100Mi"
@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: constraints-mem-demo-4
-spec:
-  containers:
-  - name: constraints-mem-demo-4-ctr
-    image: nginx
-
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: constraints-mem-demo
-spec:
-  containers:
-  - name: constraints-mem-demo-ctr
-    image: nginx
-    resources:
-      limits:
-        memory: "800Mi"
-      requests:
-        memory: "600Mi"
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: LimitRange
-metadata:
-  name: mem-min-max-demo-lr
-spec:
-  limits:
-  - max:
-      memory: 1Gi
-    min:
-      memory: 500Mi
-    type: Container
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: default-mem-demo-2
-spec:
-  containers:
-  - name: defalt-mem-demo-2-ctr
-    image: nginx
-    resources:
-      limits:
-        memory: "1Gi"
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: default-mem-demo-3
-spec:
-  containers:
-  - name: default-mem-demo-3-ctr
-    image: nginx
-    resources:
-      requests:
-        memory: "128Mi"
@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: default-mem-demo
-spec:
-  containers:
-  - name: default-mem-demo-ctr
-    image: nginx
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: LimitRange
-metadata:
-  name: mem-limit-range
-spec:
-  limits:
-  - default:
-      memory: 512Mi
-    defaultRequest:
-      memory: 256Mi
-    type: Container
@@ -1,43 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  labels:
-    component: scheduler
-    tier: control-plane
-  name: my-scheduler
-  namespace: kube-system
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        component: scheduler
-        tier: control-plane
-        version: second
-    spec:
-      containers:
-      - command:
-        - /usr/local/bin/kube-scheduler
-        - --address=0.0.0.0
-        - --leader-elect=false
-        - --scheduler-name=my-scheduler
-        image: gcr.io/my-gcp-project/my-kube-scheduler:1.0
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 10251
-          initialDelaySeconds: 15
-        name: kube-second-scheduler
-        readinessProbe:
-          httpGet:
-            path: /healthz
-            port: 10251
-        resources:
-          requests:
-            cpu: '0.1'
-        securityContext:
-          privileged: false
-        volumeMounts: []
-      hostNetwork: false
-      hostPID: false
-      volumes: []
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: no-annotation
-  labels:
-    name: multischeduler-example
-spec:
-  containers:
-  - name: pod-with-no-annotation-container
-    image: k8s.gcr.io/pause:2.0
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: annotation-default-scheduler
-  labels:
-    name: multischeduler-example
-spec:
-  schedulerName: default-scheduler
-  containers:
-  - name: pod-with-default-annotation-container
-    image: k8s.gcr.io/pause:2.0
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: annotation-second-scheduler
-  labels:
-    name: multischeduler-example
-spec:
-  schedulerName: my-scheduler
-  containers:
-  - name: pod-with-second-annotation-container
-    image: k8s.gcr.io/pause:2.0
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: quota-mem-cpu-demo-2
-spec:
-  containers:
-  - name: quota-mem-cpu-demo-2-ctr
-    image: redis
-    resources:
-      limits:
-        memory: "1Gi"
-        cpu: "800m"
-      requests:
-        memory: "700Mi"
-        cpu: "400m"
-
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: quota-mem-cpu-demo
-spec:
-  containers:
-  - name: quota-mem-cpu-demo-ctr
-    image: nginx
-    resources:
-      limits:
-        memory: "800Mi"
-        cpu: "800m"
-      requests:
-        memory: "600Mi"
-        cpu: "400m"
-
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: ResourceQuota
-metadata:
-  name: mem-cpu-demo
-spec:
-  hard:
-    requests.cpu: "1"
-    requests.memory: 1Gi
-    limits.cpu: "2"
-    limits.memory: 2Gi
@@ -1,11 +0,0 @@
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: pvc-quota-demo-2
-spec:
-  storageClassName: manual
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 4Gi
@@ -1,11 +0,0 @@
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: pvc-quota-demo
-spec:
-  storageClassName: manual
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 3Gi
@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: ResourceQuota
-metadata:
-  name: object-quota-demo
-spec:
-  hard:
-    persistentvolumeclaims: "1"
-    services.loadbalancers: "2"
-    services.nodeports: "0"
@@ -1,14 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: pod-quota-demo
-spec:
-  replicas: 3
-  template:
-    metadata:
-      labels:
-        purpose: quota-demo
-    spec:
-      containers:
-      - name: pod-quota-demo
-        image: nginx
@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ResourceQuota
-metadata:
-  name: pod-demo
-spec:
-  hard:
-    pods: "2"
@@ -1,11 +0,0 @@
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: pvc-quota-demo-2
-spec:
-  storageClassName: manual
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 4Gi
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: cpu-demo-2
-spec:
-  containers:
-  - name: cpu-demo-ctr-2
-    image: vish/stress
-    resources:
-      limits:
-        cpu: "100"
-      requests:
-        cpu: "100"
-    args:
-    - -cpus
-    - "2"
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: cpu-demo
-spec:
-  containers:
-  - name: cpu-demo-ctr
-    image: vish/stress
-    resources:
-      limits:
-        cpu: "1"
-      requests:
-        cpu: "0.5"
-    args:
-    - -cpus
-    - "2"
@@ -1,26 +0,0 @@
-apiVersion: v1
-kind: Pod
-
-metadata:
-  labels:
-    test: liveness
-  name: liveness-exec
-spec:
-  containers:
-
-  - name: liveness
-
-    args:
-    - /bin/sh
-    - -c
-    - touch /tmp/healthy; sleep 30; rm -rf /tmp/healthy; sleep 600
-
-    image: k8s.gcr.io/busybox
-
-    livenessProbe:
-      exec:
-        command:
-        - cat
-        - /tmp/healthy
-      initialDelaySeconds: 5
-      periodSeconds: 5
@@ -1,21 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  labels:
-    test: liveness
-  name: liveness-http
-spec:
-  containers:
-  - name: liveness
-    args:
-    - /server
-    image: k8s.gcr.io/liveness
-    livenessProbe:
-      httpGet:
-        path: /healthz
-        port: 8080
-        httpHeaders:
-        - name: X-Custom-Header
-          value: Awesome
-      initialDelaySeconds: 3
-      periodSeconds: 3
@@ -1,30 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: init-demo
-spec:
-  containers:
-  - name: nginx
-    image: nginx
-    ports:
-    - containerPort: 80
-    volumeMounts:
-    - name: workdir
-      mountPath: /usr/share/nginx/html
-  # These containers are run during pod initialization
-  initContainers:
-  - name: install
-    image: busybox
-    command:
-    - wget
-    - "-O"
-    - "/work-dir/index.html"
-    - http://kubernetes.io
-    volumeMounts:
-    - name: workdir
-      mountPath: "/work-dir"
-  dnsPolicy: Default
-  volumes:
-  - name: workdir
-    emptyDir: {}
-
@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: lifecycle-demo
-spec:
-  containers:
-  - name: lifecycle-demo-container
-    image: nginx
-
-    lifecycle:
-      postStart:
-        exec:
-          command: ["/bin/sh", "-c", "echo Hello from the postStart handler > /usr/share/message"]
-      preStop:
-        exec:
-          command: ["/usr/sbin/nginx","-s","quit"]
-
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: LimitRange
-metadata:
-  name: mem-limit-range
-spec:
-  limits:
-  - default:
-      memory: 512Mi
-    defaultRequest:
-      memory: 256Mi
-    type: Container
@@ -1,20 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: memory-demo-2
-spec:
-  containers:
-  - name: memory-demo-2-ctr
-    image: vish/stress
-    resources:
-      requests:
-        memory: 50Mi
-      limits:
-        memory: "100Mi"
-    args:
-    - -mem-total
-    - 250Mi
-    - -mem-alloc-size
-    - 10Mi
-    - -mem-alloc-sleep
-    - 1s
@@ -1,20 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: memory-demo-3
-spec:
-  containers:
-  - name: memory-demo-3-ctr
-    image: vish/stress
-    resources:
-      limits:
-        memory: "1000Gi"
-      requests:
-        memory: "1000Gi"
-    args:
-    - -mem-total
-    - 150Mi
-    - -mem-alloc-size
-    - 10Mi
-    - -mem-alloc-sleep
-    - 1s
@@ -1,20 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: memory-demo
-spec:
-  containers:
-  - name: memory-demo-ctr
-    image: vish/stress
-    resources:
-      limits:
-        memory: "200Mi"
-      requests:
-        memory: "100Mi"
-    args:
-    - -mem-total
-    - 150Mi
-    - -mem-alloc-size
-    - 10Mi
-    - -mem-alloc-sleep
-    - 1s
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: oir-demo-2
-spec:
-  containers:
-  - name: oir-demo-2-ctr
-    image: nginx
-    resources:
-      requests:
-        pod.alpha.kubernetes.io/opaque-int-resource-dongle: 2
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: oir-demo
-spec:
-  containers:
-  - name: oir-demo-ctr
-    image: nginx
-    resources:
-      requests:
-        pod.alpha.kubernetes.io/opaque-int-resource-dongle: 3
@@ -1,138 +0,0 @@
---
-title: 给容器分配非透明整型资源
-content_template: templates/task
---
-
-{{% capture overview %}}
-
-本页展示了如何给容器分配非透明整型资源。
-
-{{< feature-state state="alpha" >}}
-
-{{% /capture %}}
-
-
-{{% capture prerequisites %}}
-
-{{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
-
-在做这个练习之前，请在[给节点配置非透明整型资源](/docs/tasks/administer-cluster/opaque-integer-resource-node/)文档中进行练习，
-该文档介绍了在一个节点上配置dongle资源。
-
-{{% /capture %}}
-
-
-{{% capture steps %}}
-
-## 给Pod分配非透明整型资源
-
-为了请求一个非透明整型资源，需要在容器配置文件中包含`resources:requests`字段。
-非透明整型资源类型前缀是`pod.alpha.kubernetes.io/opaque-int-resource-`。
-
-下面是含有一个容器的Pod的配置文件:
-
-{{< code file="oir-pod.yaml" >}}
-
-在配置文件中，可以看到容器请求了3个dongles资源。
-
-创建Pod:
-
-```shell
-kubectl create -f https://k8s.io/docs/tasks/configure-pod-container/oir-pod.yaml
-```
-
-验证Pod是否正在运行:
-
-```shell
-kubectl get pod oir-demo
-```
-
-查询Pod的状态:
-
-```shell
-kubectl describe pod oir-demo
-```
-
-输出显示了dongle请求:
-
-```yaml
-Requests:
-  pod.alpha.kubernetes.io/opaque-int-resource-dongle: 3
-```
-
-## 尝试创建第二个Pod
-
-下面是含有一个容器的Pod的配置文件。该容器请求了两个dongles资源。
-
-{{< code file="oir-pod-2.yaml" >}}
-
-Kubernetes无法再满足两个dongles的请求，因为第一个Pod已经使用了四个可用dongles中的三个。
-
-尝试创建Pod:
-
-```shell
-kubectl create -f https://k8s.io/docs/tasks/configure-pod-container/oir-pod-2.yaml
-```
-
-查询Pod的状态
-
-```shell
-kubectl describe pod oir-demo-2
-```
-
-输出显示该Pod无法被调度，因为没有节点有两个可用的dongles资源:
-
-
-```
-Conditions:
-  Type    Status
-  PodScheduled  False
-...
-Events:
-  ...
-  ... Warning   FailedScheduling  pod (oir-demo-2) failed to fit in any node
-fit failure summary on nodes : Insufficient pod.alpha.kubernetes.io/opaque-int-resource-dongle (1)
-```
-
-查看Pod的状态:
-
-```shell
-kubectl get pod oir-demo-2
-```
-
-输出显示Pod已创建，但是没有被调度并运行在节点上。
-它的状态为Pending:
-
-```yaml
-NAME         READY     STATUS    RESTARTS   AGE
-oir-demo-2   0/1       Pending   0          6m
-```
-
-## 删除
-
-删除本练习中创建的Pod:
-
-```shell
-kubectl delete pod oir-demo
-```
-
-{{% /capture %}}
-
-{{% capture whatsnext %}}
-
-### 对于应用开发者
-
-* [分配内存资源](/docs/tasks/configure-pod-container/assign-memory-resource/)
-* [分配CPU资源](/docs/tasks/configure-pod-container/assign-cpu-resource/)
-
-### 对于集群管理员
-
-* [给节点配置非透明整型资源](/docs/tasks/administer-cluster/opaque-integer-resource-node/)
-
-{{% /capture %}}
-
-
-
-
-
-
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: redis
-spec:
-  containers:
-  - name: redis
-    image: redis
-    volumeMounts:
-    - name: redis-storage
-      mountPath: /data/redis
-  volumes:
-  - name: redis-storage
-    emptyDir: {}
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: nginx
-  labels:
-    env: test
-spec:
-  containers:
-  - name: nginx
-    image: nginx
-    imagePullPolicy: IfNotPresent
-  nodeSelector:
-    disktype: ssd
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: private-reg
-spec:
-  containers:
-  - name: private-reg-container
-    image: <your-private-image>
-  imagePullSecrets:
-  - name: regsecret
-
@@ -1,23 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: test-projected-volume
-spec:
-  containers:
-  - name: test-projected-volume
-    image: busybox
-    args:
-    - sleep
-    - "86400"
-    volumeMounts:
-    - name: all-in-one
-      mountPath: "/projected-volume"
-      readOnly: true
-  volumes:
-  - name: all-in-one
-    projected:
-      sources:
-      - secret:
-          name: user
-      - secret:
-          name: pass
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: qos-demo-2
-  namespace: qos-example
-spec:
-  containers:
-  - name: qos-demo-2-ctr
-    image: nginx
-    resources:
-      limits:
-        memory: "200Mi"
-      requests:
-        memory: "100Mi"
@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: qos-demo-3
-  namespace: qos-example
-spec:
-  containers:
-  - name: qos-demo-3-ctr
-    image: nginx
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: qos-demo-4
-  namespace: qos-example
-spec:
-  containers:
-
-  - name: qos-demo-4-ctr-1
-    image: nginx
-    resources:
-      requests:
-        memory: "200Mi"
-
-  - name: qos-demo-4-ctr-2
-    image: redis
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: qos-demo
-  namespace: qos-example
-spec:
-  containers:
-  - name: qos-demo-ctr
-    image: nginx
-    resources:
-      limits:
-        memory: "200Mi"
-        cpu: "700m"
-      requests:
-        memory: "200Mi"
-        cpu: "700m"
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: ResourceQuota
-metadata:
-  name: compute-resources
-spec:
-  hard:
-    pods: "4"
-    requests.cpu: "1"
-    requests.memory: 1Gi
-    limits.cpu: "2"
-    limits.memory: 2Gi
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: security-context-demo-2
-spec:
-  securityContext:
-    runAsUser: 1000
-  containers:
-  - name: sec-ctx-demo-2
-    image: gcr.io/google-samples/node-hello:1.0
-    securityContext:
-      runAsUser: 2000
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: security-context-demo-3
-spec:
-  containers:
-  - name: sec-ctx-3
-    image: gcr.io/google-samples/node-hello:1.0
-
-
-
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: security-context-demo-4
-spec:
-  containers:
-  - name: sec-ctx-4
-    image: gcr.io/google-samples/node-hello:1.0
-    securityContext:
-      capabilities:
-        add: ["NET_ADMIN", "SYS_TIME"]
@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: security-context-demo
-spec:
-  securityContext:
-    runAsUser: 1000
-    fsGroup: 2000
-  volumes:
-  - name: sec-ctx-vol
-    emptyDir: {}
-  containers:
-  - name: sec-ctx-demo
-    image: gcr.io/google-samples/node-hello:1.0
-    volumeMounts:
-    - name: sec-ctx-vol
-      mountPath: /data/demo
@@ -1,11 +0,0 @@
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: task-pv-claim
-spec:
-  storageClassName: manual
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 3Gi
@@ -1,22 +0,0 @@
-kind: Pod
-apiVersion: v1
-metadata:
-  name: task-pv-pod
-spec:
-
-  volumes:
-    - name: task-pv-storage
-      persistentVolumeClaim:
-       claimName: task-pv-claim
-
-  containers:
-    - name: task-pv-container
-      image: nginx
-      ports:
-        - containerPort: 80
-          name: "http-server"
-      volumeMounts:
-      - mountPath: "/usr/share/nginx/html"
-        name: task-pv-storage
-
-
@@ -1,14 +0,0 @@
-kind: PersistentVolume
-apiVersion: v1
-metadata:
-  name: task-pv-volume
-  labels:
-    type: local
-spec:
-  storageClassName: manual
-  capacity:
-    storage: 10Gi
-  accessModes:
-    - ReadWriteOnce
-  hostPath:
-    path: "/tmp/data"
@@ -1,22 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: goproxy
-  labels:
-    app: goproxy
-spec:
-  containers:
-  - name: goproxy
-    image: k8s.gcr.io/goproxy:0.1
-    ports:
-    - containerPort: 8080
-    readinessProbe:
-      tcpSocket:
-        port: 8080
-      initialDelaySeconds: 5
-      periodSeconds: 10
-    livenessProbe:
-      tcpSocket:
-        port: 8080
-      initialDelaySeconds: 15
-      periodSeconds: 20
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: command-demo
-  labels:
-    purpose: demonstrate-command
-spec:
-  containers:
-  - name: command-demo-container
-    image: debian
-    command: ["printenv"]
-    args: ["HOSTNAME", "KUBERNETES_PORT"]
-  restartPolicy: OnFailure
@@ -1,45 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: dapi-envars-resourcefieldref
-spec:
-  containers:
-    - name: test-container
-      image: k8s.gcr.io/busybox:1.24
-      command: [ "sh", "-c"]
-      args:
-      - while true; do
-          echo -en '\n';
-          printenv MY_CPU_REQUEST MY_CPU_LIMIT;
-          printenv MY_MEM_REQUEST MY_MEM_LIMIT;
-          sleep 10;
-        done;
-      resources:
-        requests:
-          memory: "32Mi"
-          cpu: "125m"
-        limits:
-          memory: "64Mi"
-          cpu: "250m"
-      env:
-        - name: MY_CPU_REQUEST
-          valueFrom:
-            resourceFieldRef:
-              containerName: test-container
-              resource: requests.cpu
-        - name: MY_CPU_LIMIT
-          valueFrom:
-            resourceFieldRef:
-              containerName: test-container
-              resource: limits.cpu
-        - name: MY_MEM_REQUEST
-          valueFrom:
-            resourceFieldRef:
-              containerName: test-container
-              resource: requests.memory
-        - name: MY_MEM_LIMIT
-          valueFrom:
-            resourceFieldRef:
-              containerName: test-container
-              resource: limits.memory
-  restartPolicy: Never
@@ -1,38 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: dapi-envars-fieldref
-spec:
-  containers:
-    - name: test-container
-      image: k8s.gcr.io/busybox
-      command: [ "sh", "-c"]
-      args:
-      - while true; do
-          echo -en '\n';
-          printenv MY_NODE_NAME MY_POD_NAME MY_POD_NAMESPACE;
-          printenv MY_POD_IP MY_POD_SERVICE_ACCOUNT;
-          sleep 10;
-        done;
-      env:
-        - name: MY_NODE_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.nodeName
-        - name: MY_POD_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.name
-        - name: MY_POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        - name: MY_POD_IP
-          valueFrom:
-            fieldRef:
-              fieldPath: status.podIP
-        - name: MY_POD_SERVICE_ACCOUNT
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.serviceAccountName
-  restartPolicy: Never
@@ -1,54 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: kubernetes-downwardapi-volume-example-2
-spec:
-  containers:
-    - name: client-container
-      image: k8s.gcr.io/busybox:1.24
-      command: ["sh", "-c"]
-      args:
-      - while true; do
-          echo -en '\n';
-          if [[ -e /etc/podinfo/cpu_limit ]]; then
-            echo -en '\n'; cat /etc/podinfo/cpu_limit; fi;
-          if [[ -e /etc/cpu_request ]]; then
-            echo -en '\n'; cat /etc/podinfo/cpu_request; fi;
-          if [[ -e /etc/mem_limit ]]; then
-            echo -en '\n'; cat /etc/podinfo/mem_limit; fi;
-          if [[ -e /etc/mem_request ]]; then
-            echo -en '\n'; cat /etc/podinfo/mem_request; fi;
-          sleep 5;
-        done;
-      resources:
-        requests:
-          memory: "32Mi"
-          cpu: "125m"
-        limits:
-          memory: "64Mi"
-          cpu: "250m"
-      volumeMounts:
-        - name: podinfo
-          mountPath: /etc/podinfo
-          readOnly: false
-  volumes:
-    - name: podinfo
-      downwardAPI:
-        items:
-          - path: "cpu_limit"
-            resourceFieldRef:
-              containerName: client-container
-              resource: limits.cpu
-          - path: "cpu_request"
-            resourceFieldRef:
-              containerName: client-container
-              resource: requests.cpu
-          - path: "mem_limit"
-            resourceFieldRef:
-              containerName: client-container
-              resource: limits.memory
-          - path: "mem_request"
-            resourceFieldRef:
-              containerName: client-container
-              resource: requests.memory
-
@@ -1,39 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: kubernetes-downwardapi-volume-example
-  labels:
-    zone: us-est-coast
-    cluster: test-cluster1
-    rack: rack-22
-  annotations:
-    build: two
-    builder: john-doe
-spec:
-  containers:
-    - name: client-container
-      image: k8s.gcr.io/busybox
-      command: ["sh", "-c"]
-      args:
-      - while true; do
-          if [[ -e /etc/podinfo/labels ]]; then
-            echo -en '\n\n'; cat /etc/podinfo/labels; fi;
-          if [[ -e /etc/podinfo/annotations ]]; then
-            echo -en '\n\n'; cat /etc/podinfo/annotations; fi;
-          sleep 5;
-        done;
-      volumeMounts:
-        - name: podinfo
-          mountPath: /etc/podinfo
-          readOnly: false
-  volumes:
-    - name: podinfo
-      downwardAPI:
-        items:
-          - path: "labels"
-            fieldRef:
-              fieldPath: metadata.labels
-          - path: "annotations"
-            fieldRef:
-              fieldPath: metadata.annotations
-
@@ -31,21 +31,19 @@ content_template: templates/task

 本示例中，将创建一个只包含单个容器的Pod。在Pod配置文件中设置了一个命令与两个入参：

-{{< code file="commands.yaml" >}}
+{{< codenew file="pods/commands.yaml" >}}

-1. 基于YAML文件创建一个Pod：
+1. 基于 YAML 文件创建一个 Pod：

    ```shell
-    kubectl create -f https://k8s.io/docs/tasks/inject-data-application/commands.yaml
+    kubectl apply -f https://k8s.io/examples/pods/commands.yaml
    ```

-2. List the running Pods:
+2. 列举运行中的 Pods：

-	获取正在运行的 pod
-
-	```shell
-	kubectl get pods
-	```
+    ```shell
+    kubectl get pods
+    ```

    查询结果显示在command-demo这个Pod下运行的容器已经启动完成

@@ -55,7 +53,7 @@ content_template: templates/task
    kubectl logs command-demo
    ```

-    日志中显示了HOSTNAME 与KUBERNETES_PORT 这两个环境变量的值：
+    日志中显示了 HOSTNAME 与 KUBERNETES_PORT 这两个环境变量的值：

    ```
    command-demo
@@ -99,12 +97,12 @@ args: ["-c", "while true; do echo hello; sleep 10;done"]

 下表给出了Docker 与 Kubernetes中对应的字段名称。

-|              Description               |    Docker field name   | Kubernetes field name |
-|----------------------------------------|------------------------|-----------------------|
-|  The command run by the container      |   Entrypoint           |      command          |
-|  The arguments passed to the command   |   Cmd                  |      args             |
+| 描述 | Docker 字段名称 | Kubernetes 字段名称 |
+|------|-----------------|---------------------|
+| 容器运行的命令       | Entrypoint | command |
+| 传递给命令的参数集合 | Cmd        | args    |

-如果要覆盖默认的Entrypoint 与 Cmd，需要遵循如下规则：
+如果要覆盖默认的 Entrypoint 与 Cmd，需要遵循如下规则：

 * 如果在容器配置中没有设置`command` 或者 `args`，那么将使用Docker镜像自带的命
 令及其入参。
@@ -121,22 +119,22 @@ args: ["-c", "while true; do echo hello; sleep 10;done"]

 下表涵盖了各类设置场景：

-| Image Entrypoint   |    Image Cmd     | Container command   |  Container args    |    Command run   |
-|--------------------|------------------|---------------------|--------------------|------------------|
-|     `[/ep-1]`      |   `[foo bar]`    |   &lt;not set&gt;   |   &lt;not set&gt;  | `[ep-1 foo bar]` |
-|     `[/ep-1]`      |   `[foo bar]`    |      `[/ep-2]`      |   &lt;not set&gt;  |     `[ep-2]`     |
-|     `[/ep-1]`      |   `[foo bar]`    |   &lt;not set&gt;   |     `[zoo boo]`    | `[ep-1 zoo boo]` |
-|     `[/ep-1]`      |   `[foo bar]`    |   `[/ep-2]`         |     `[zoo boo]`    | `[ep-2 zoo boo]` |
+| 镜像 Entrypoint   | 镜像 Cmd | 容器命令 | 容器参数 | 运行的命令 |
+|-------------------|----------|----------|----------|------------|
+| `[/ep-1]` | `[foo bar]` |   &lt;not set&gt;   |   &lt;not set&gt;  | `[ep-1 foo bar]` |
+| `[/ep-1]` | `[foo bar]` |      `[/ep-2]`      |   &lt;not set&gt;  |     `[ep-2]`     |
+| `[/ep-1]` | `[foo bar]` |   &lt;not set&gt;   |     `[zoo boo]`    | `[ep-1 zoo boo]` |
+| `[/ep-1]` | `[foo bar]` |   `[/ep-2]`         |     `[zoo boo]`    | `[ep-2 zoo boo]` |


 {{% /capture %}}

 {{% capture whatsnext %}}

-* 获取更多资讯可参考 [containers and commands](/docs/user-guide/containers/).
-* 获取更多资讯可参考 [configuring pods and containers](/docs/tasks/).
-* 获取更多资讯可参考 [running commands in a container](/docs/tasks/debug-application-cluster/get-shell-running-container/).
-* 参考 [Container](/docs/api-reference/{{< param "version" >}}/#container-v1-core).
+* 深入了解 [容器和命令](/docs/user-guide/containers/).
+* 深入了解 [配置 Pods 和容器](/docs/tasks/).
+* 深入了解 [在容器中运行命令](/docs/tasks/debug-application-cluster/get-shell-running-container/).
+* 参考 [Container](/docs/api-reference/{{< param "version" >}}/#container-v1-core) 资源

 {{% /capture %}}

@@ -26,12 +26,12 @@ content_template: templates/task
 本示例中，将创建一个只包含单个容器的Pod。Pod的配置文件中设置环境变量的名称为`DEMO_GREETING`，
 其值为`"Hello from the environment"`。下面是Pod的配置文件内容:

-{{< code file="envars.yaml" >}}
+{{< codenew file="pods/inject/envars.yaml" >}}

 1. 基于YAML文件创建一个Pod:

    ```shell
-    kubectl create -f https://k8s.io/docs/tasks/inject-data-application/envars.yaml
+    kubectl apply -f https://k8s.io/examples/pods/inject/envars.yaml
    ```

 1. 获取一下当前正在运行的Pods信息:
@@ -31,7 +31,7 @@ content_template: templates/task

 在这个练习中，你将创建一个包含一个容器的pod。这是该pod的配置文件：

-{{< code file="dapi-volume.yaml" >}}
+{{< codenew file="pods/inject/dapi-volume.yaml" >}}

 在配置文件中，你可以看到Pod有一个`downwardAPI`类型的Volume，并且挂载到容器中的`/etc`。

@@ -46,7 +46,7 @@ content_template: templates/task
 创建 Pod：

 ```shell
-kubectl create -f https://k8s.io/cn/docs/tasks/inject-data-application/dapi-volume.yaml
+kubectl apply -f https://k8s.io/examples/pods/inject/dapi-volume.yaml
 ```

 验证Pod中的容器运行正常：
@@ -134,7 +134,7 @@ total 8

 前面的练习中，你将Pod字段保存到DownwardAPIVolumeFile中。接下来这个练习，你将存储容器字段。这里是包含一个容器的pod的配置文件：

-{{< code file="dapi-volume-resources.yaml" >}}
+{{< codenew file="pods/inject/dapi-volume-resources.yaml" >}}

 在这个配置文件中，你可以看到Pod有一个`downwardAPI`类型的Volume,并且挂载到容器的`/etc`目录。

@@ -145,7 +145,7 @@ total 8
 创建Pod：

 ```shell
-kubectl create -f https://k8s.io/cn/docs/tasks/inject-data-application/dapi-volume-resources.yaml
+kubectl apply -f https://k8s.io/examples/pods/inject/dapi-volume-resources.yaml
 ```

 进入Pod中运行的容器，打开一个shell：
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: envar-demo
-  labels:
-    purpose: demonstrate-envars
-spec:
-  containers:
-  - name: envar-demo-container
-    image: gcr.io/google-samples/node-hello:1.0
-    env:
-    - name: DEMO_GREETING
-      value: "Hello from the environment"
@@ -37,7 +37,7 @@ content_template: templates/task

 在这个练习中，你将创建一个包含一个容器的pod。这是该pod的配置文件：

-{{< code file="dapi-envars-pod.yaml" >}}
+{{< codenew file="pods/inject/dapi-envars-pod.yaml" >}}

 这个配置文件中，你可以看到五个环境变量。`env`字段是一个[EnvVars](/docs/resources-reference/{{< param "version" >}}/#envvar-v1-core)类型的数组。
 数组中第一个元素指定`MY_NODE_NAME`这个环境变量从Pod的`spec.nodeName`字段获取变量值。同样，其它环境变量也是从Pod的字段获取它们的变量值。
@@ -49,7 +49,7 @@ content_template: templates/task
 创建Pod：

 ```shell
-kubectl create -f https://k8s.io/cn/docs/tasks/inject-data-application/dapi-envars-pod.yaml
+kubectl apply -f https://k8s.io/examples/pods/inject/dapi-envars-pod.yaml
 ```

 验证Pod中的容器运行正常：
@@ -105,7 +105,7 @@ MY_POD_NAME=dapi-envars-fieldref

 前面的练习中，你将Pod字段作为环境变量的值。接下来这个练习，你将用容器字段作为环境变量的值。这里是包含一个容器的pod的配置文件：

-{{< code file="dapi-envars-container.yaml" >}}
+{{< codenew file="pods/inject/dapi-envars-container.yaml" >}}

 这个配置文件中，你可以看到四个环境变量。`env`字段是一个[EnvVars](/docs/resources-reference/{{< param "version" >}}/#envvar-v1-core)
 类型的数组。数组中第一个元素指定`MY_CPU_REQUEST`这个环境变量从容器的`requests.cpu`字段获取变量值。同样，其它环境变量也是从容器的字段获取它们的变量值。
@@ -113,7 +113,7 @@ MY_POD_NAME=dapi-envars-fieldref
 创建Pod：

 ```shell
-kubectl create -f https://k8s.io/cn/docs/tasks/inject-data-application/dapi-envars-container.yaml
+kubectl apply -f https://k8s.io/examples/pods/inject/dapi-envars-container.yaml
 ```

 验证Pod中的容器运行正常：
@@ -1,37 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: website
-  labels:
-    app: website
-    role: frontend
-  annotations:
-    podpreset.admission.kubernetes.io/podpreset-allow-database: "resource version"
-spec:
-  containers:
-    - name: website
-      image: ecorp/website
-      volumeMounts:
-        - mountPath: /cache
-          name: cache-volume
-        - mountPath: /etc/app/config.json
-          readOnly: true
-          name: secret-volume
-      ports:
-        - containerPort: 80
-      env:
-        - name: DB_PORT
-          value: "6379"
-        - name: duplicate_key
-          value: FROM_ENV
-        - name: expansion
-          value: $(REPLACE_ME)
-      envFrom:
-        - configMapRef:
-          name: etcd-env-config
-  volumes:
-    - name: cache-volume
-      emptyDir: {}
-    - name: secret-volume
-      secret:
-         secretName: config-details
@@ -1,31 +0,0 @@
-apiVersion: settings.k8s.io/v1alpha1
-kind: PodPreset
-metadata:
-  name: allow-database
-  namespace: myns
-spec:
-  selector:
-    matchLabels:
-      role: frontend
-  env:
-    - name: DB_PORT
-      value: 6379
-    - name: duplicate_key
-      value: FROM_ENV
-    - name: expansion
-      value: $(REPLACE_ME)
-  envFrom:
-    - configMapRef:
-        name: etcd-env-config
-  volumeMounts:
-    - mountPath: /cache
-      name: cache-volume
-    - mountPath: /etc/app/config.json
-      readOnly: true
-      name: secret-volume
-  volumes:
-    - name: cache-volume
-      emptyDir: {}
-    - name: secret-volume
-      secret:
-         secretName: config-details
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: etcd-env-config
-data:
-  number_of_members: "1"
-  initial_cluster_state: new
-  initial_cluster_token: DUMMY_ETCD_INITIAL_CLUSTER_TOKEN
-  discovery_token: DUMMY_ETCD_DISCOVERY_TOKEN
-  discovery_url: http://etcd_discovery:2379
-  etcdctl_peers: http://etcd:2379
-  duplicate_key: FROM_CONFIG_MAP
-  REPLACE_ME: "a value"
-
@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: website
-  labels:
-    app: website
-    role: frontend
-spec:
-  containers:
-    - name: website
-      image: ecorp/website
-      volumeMounts:
-        - mountPath: /cache
-          name: cache-volume
-      ports:
-  volumes:
-    - name: cache-volume
-      emptyDir: {}
-        - containerPort: 80
@@ -1,19 +0,0 @@
-apiVersion: settings.k8s.io/v1alpha1
-kind: PodPreset
-metadata:
-  name: allow-database
-  namespace: myns
-spec:
-  selector:
-    matchLabels:
-      role: frontend
-  env:
-    - name: DB_PORT
-      value: "6379"
-  volumeMounts:
-    - mountPath: /cache
-      name: other-volume
-  volumes:
-    - name: other-volume
-      emptyDir: {}
-
@@ -1,25 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: website
-  labels:
-    app: website
-    role: frontend
-  annotations:
-    podpreset.admission.kubernetes.io/podpreset-allow-database: "resource version"
-spec:
-  containers:
-    - name: website
-      image: ecorp/website
-      volumeMounts:
-        - mountPath: /cache
-          name: cache-volume
-      ports:
-        - containerPort: 80
-      env:
-        - name: DB_PORT
-          value: "6379"
-  volumes:
-    - name: cache-volume
-      emptyDir: {}
-
@@ -1,29 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: website
-  labels:
-    app: website
-    role: frontend
-  annotations:
-    podpreset.admission.kubernetes.io/podpreset-allow-database: "resource version"
-    podpreset.admission.kubernetes.io/podpreset-proxy: "resource version"
-spec:
-  containers:
-    - name: website
-      image: ecorp/website
-      volumeMounts:
-        - mountPath: /cache
-          name: cache-volume
-        - mountPath: /etc/proxy/configs
-          name: proxy-volume
-      ports:
-        - containerPort: 80
-      env:
-        - name: DB_PORT
-          value: "6379"
-  volumes:
-    - name: cache-volume
-      emptyDir: {}
-    - name: proxy-volume
-      emptyDir: {}
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: website
-  labels:
-    app: website
-    role: frontend
-spec:
-  containers:
-    - name: website
-      image: ecorp/website
-      ports:
-        - containerPort: 80
-
@@ -1,18 +0,0 @@
-apiVersion: settings.k8s.io/v1alpha1
-kind: PodPreset
-metadata:
-  name: allow-database
-  namespace: myns
-spec:
-  selector:
-    matchLabels:
-      role: frontend
-  env:
-    - name: DB_PORT
-      value: "6379"
-  volumeMounts:
-    - mountPath: /cache
-      name: cache-volume
-  volumes:
-    - name: cache-volume
-      emptyDir: {}
@@ -1,15 +0,0 @@
-apiVersion: settings.k8s.io/v1alpha1
-kind: PodPreset
-metadata:
-  name: proxy
-  namespace: myns
-spec:
-  selector:
-    matchLabels:
-      role: frontend
-  volumeMounts:
-    - mountPath: /etc/proxy/configs
-      name: proxy-volume
-  volumes:
-    - name: proxy-volume
-      emptyDir: {}
@@ -1,30 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  labels:
-    app: guestbook
-    tier: frontend
-  annotations:
-    podpreset.admission.kubernetes.io/podpreset-allow-database: "resource version"
-spec:
-  containers:
-  - name: php-redis
-    image: gcr.io/google_samples/gb-frontend:v3
-    resources:
-      requests:
-        cpu: 100m
-        memory: 100Mi
-    volumeMounts:
-    - mountPath: /cache
-      name: cache-volume
-    env:
-    - name: GET_HOSTS_FROM
-      value: dns
-    - name: DB_PORT
-      value: "6379"
-    ports:
-    - containerPort: 80
-  volumes:
-  - name: cache-volume
-    emptyDir: {}
-
@@ -1,29 +0,0 @@
-apiVersion: apps/v1beta2
-kind: ReplicaSet
-metadata:
-  name: frontend
-spec:
-  replicas: 3
-  selector:
-    matchLabels:
-      tier: frontend
-    matchExpressions:
-      - {key: tier, operator: In, values: [frontend]}
-  template:
-    metadata:
-      labels:
-        app: guestbook
-        tier: frontend
-    spec:
-      containers:
-      - name: php-redis
-        image: gcr.io/google_samples/gb-frontend:v3
-        resources:
-          requests:
-            cpu: 100m
-            memory: 100Mi
-        env:
-          - name: GET_HOSTS_FROM
-            value: dns
-        ports:
-          - containerPort: 80
@@ -16,37 +16,76 @@ title: 使用 PodPreset 将信息注入 Pods

 这里是一个简单的示例，展示了如何通过 Pod Preset 修改 Pod spec 。

-**用户提交的 pod spec：**
+{{< codenew file="podpreset/preset.yaml" >}}

-{{< code file="podpreset-pod.yaml" >}}
+创建 PodPreset：

-**Pod Preset 示例：**
+```shell
+kubectl apply -f https://k8s.io/examples/podpreset/preset.yaml
+```

-{{< code file="podpreset-preset.yaml" >}}
+检查所创建的 PodPreset：

-**通过准入控制器后的 Pod spec：**
+```shell
+kubectl get podpreset
+```
+```
+NAME             AGE
+allow-database   1m
+```

-{{< code file="podpreset-merged.yaml" >}}
-
-### 带有 `ConfigMap` 的 Pod Spec 示例
-
-这里的示例展示了如何通过 Pod Preset 修改 Pod spec，Pod Preset 中定义了 `ConfigMap` 作为环境变量取值来源。
+新的 PodPreset 会对所有具有标签 `role: frontend` 的 Pods 采取行动。

 **用户提交的 pod spec：**

-{{< code file="podpreset-pod.yaml" >}}
+{{< codenew file="podpreset/pod.yaml" >}}
+
+创建 Pod：
+
+```shell
+kubectl create -f https://k8s.io/examples/podpreset/pod.yaml
+```
+
+列举运行中的 Pods：
+
+```shell
+kubectl get pods
+```
+```
+NAME      READY     STATUS    RESTARTS   AGE
+website   1/1       Running   0          4m
+```
+
+**通过准入控制器后的 Pod 规约：**
+
+{{< codenew file="podpreset/merged.yaml" >}}
+
+要查看如上输出，运行下面的命令：
+
+```shell
+kubectl get pod website -o yaml
+```
+
+### 带有 ConfigMap 的 Pod Spec 示例
+
+这里的示例展示了如何通过 PodPreset 修改 Pod 规约，PodPreset 中定义了 `ConfigMap`
+作为环境变量取值来源。
+
+**用户提交的 pod spec：**
+
+{{< codenew file="podpreset/pod.yaml" >}}

 **用户提交的 `ConfigMap`：**

-{{< code file="podpreset-configmap.yaml" >}}
+{{< codenew file="podpreset/configmap.yaml" >}}

-**Pod Preset 示例：**
+**PodPreset 示例：**

-{{< code file="podpreset-allow-db.yaml" >}}
+{{< codenew file="podpreset/allow-db.yaml" >}}

 **通过准入控制器后的 Pod spec：**

-{{< code file="podpreset-allow-db-merged.yaml" >}}
+{{< codenew file="podpreset/allow-db-merged.yaml" >}}

 ### 带有 Pod Spec 的 ReplicaSet 示例

@@ -54,53 +93,53 @@ title: 使用 PodPreset 将信息注入 Pods

 **用户提交的 ReplicaSet：**

-{{< code file="podpreset-replicaset.yaml" >}}
+{{< codenew file="podpreset/replicaset.yaml" >}}

-**Pod Preset 示例：**
+**PodPreset 示例：**

-{{< code file="podpreset-preset.yaml" >}}
+{{< codenew file="podpreset/preset.yaml" >}}

 **通过准入控制器后的 Pod spec：**

 注意 ReplicaSet spec 没有改变，用户必须检查单独的 pod 来验证 PodPreset 已被应用。

-{{< code file="podpreset-replicaset-merged.yaml" >}}
+{{< codenew file="podpreset/replicaset-merged.yaml" >}}

 ### 多 PodPreset 示例

 这里的示例展示了如何通过多个 Pod 注入策略修改 Pod spec。

-**用户提交的 pod spec：**
+**用户提交的 Pod 规约：**

-{{< code file="podpreset-pod.yaml" >}}
+{{< codenew file="podpreset/pod.yaml" >}}

-**Pod Preset 示例：**
+**PodPreset 示例：**

-{{< code file="podpreset-preset.yaml" >}}
+{{< codenew file="podpreset/preset.yaml" >}}

 **另一个 Pod Preset 示例：**

-{{< code file="podpreset-proxy.yaml" >}}
+{{< codenew file="podpreset/proxy.yaml" >}}

-**通过准入控制器后的 Pod spec：**
+**通过准入控制器后的 Pod 规约：**

-{{< code file="podpreset-multi-merged.yaml" >}}
+{{< codenew file="podpreset/multi-merged.yaml" >}}

 ### 冲突示例

-这里的示例展示了 Pod Preset 与原 Pod 存在冲突时，Pod spec 不会被修改。
+这里的示例展示了 PodPreset 与原 Pod 存在冲突时，Pod spec 不会被修改。

-**用户提交的 pod spec：**
+**用户提交的 Pod 规约：**

-{{< code file="podpreset-conflict-pod.yaml" >}}
+{{< codenew file="podpreset/conflict-pod.yaml" >}}

-**Pod Preset 示例：**
+**PodPreset 示例：**

-{{< code file="podpreset-conflict-preset.yaml" >}}
+{{< codenew file="podpreset/conflict-preset.yaml" >}}

 **因存在冲突，通过准入控制器后的 Pod spec 不会改变：**

-{{< code file="podpreset-conflict-pod.yaml" >}}
+{{< codenew file="podpreset/conflict-pod.yaml" >}}

 **如果运行 `kubectl describe...` 用户会看到以下事件：**

@@ -117,7 +156,9 @@ Events:
 一旦用户不再需要 pod preset，可以使用 `kubectl` 进行删除：

 ```shell
-$ kubectl delete podpreset allow-database
+kubectl delete podpreset allow-database
+```
+```
 podpreset "allow-database" deleted
 ```

@@ -1,17 +0,0 @@
-apiVersion: apps/v1beta2
-kind: Deployment
-metadata:
-  name: patch-demo
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app: nginx
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - name: patch-demo-ctr
-        image: nginx
@@ -1,16 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: nginx-deployment
-spec:
-  replicas: 4 # Update the replicas from 2 to 4
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - name: nginx
-        image: nginx:1.8
-        ports:
-        - containerPort: 80
@@ -1,16 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: nginx-deployment
-spec:
-  replicas: 2
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - name: nginx
-        image: nginx:1.8 # Update the version of nginx from 1.7.9 to 1.8
-        ports:
-        - containerPort: 80
@@ -1,18 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: nginx-deployment
-spec:
-  replicas: 2 # tells deployment to run 2 pods matching the template
-  template: # create pods using pod definition in this template
-    metadata:
-      # unlike pod-nginx.yaml, the name is not included in the meta data as a unique name is
-      # generated from the deployment name
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - name: nginx
-        image: nginx:1.7.9
-        ports:
-        - containerPort: 80
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: mysql-pv
-spec:
-  capacity:
-    storage: 20Gi
-  accessModes:
-    - ReadWriteOnce
-  gcePersistentDisk:
-    pdName: mysql-disk
-    fsType: ext4
--- a/Show More
+++ b/Show More