From 5db5d263268aba2554158461e31cd75ea9f04c5c Mon Sep 17 00:00:00 2001
From: chentanjun <2799194073@qq.com>
Date: Mon, 23 Mar 2020 11:34:45 +0800
Subject: [PATCH] sync en zh yaml (#19781)

---
 .../application/deployment-scale.yaml         |  2 +-
 .../application/deployment-update.yaml        |  2 +-
 .../zh/examples/application/deployment.yaml   |  2 +-
 .../guestbook/redis-slave-deployment.yaml     |  2 +-
 .../examples/application/mysql/mysql-pv.yaml  |  2 +-
 .../application/mysql/mysql-statefulset.yaml  | 25 +++++++++----------
 .../zh/examples/application/nginx-app.yaml    |  2 +-
 .../application/nginx/nginx-deployment.yaml   |  2 +-
 .../zh/examples/application/shell-demo.yaml   |  2 ++
 .../application/simple_deployment.yaml        |  2 +-
 .../application/update_deployment.yaml        |  2 +-
 .../application/zookeeper/zookeeper.yaml      |  2 +-
 content/zh/examples/audit/audit-policy.yaml   |  4 +--
 .../zh/examples/pods/config/redis-pod.yaml    |  5 +++-
 .../pods/inject/dapi-volume-resources.yaml    |  1 -
 .../zh/examples/pods/inject/dapi-volume.yaml  |  1 -
 .../zh/examples/pods/inject/secret-pod.yaml   |  6 ++---
 content/zh/examples/pods/inject/secret.yaml   |  4 +--
 .../pods/pod-projected-svc-token.yaml         |  4 +--
 .../zh/examples/pods/probe/http-liveness.yaml |  2 +-
 .../pods/security/security-context.yaml       |  4 ++-
 content/zh/examples/pods/simple-pod.yaml      |  2 +-
 .../zh/examples/pods/storage/pv-claim.yaml    |  2 +-
 content/zh/examples/pods/storage/pv-pod.yaml  |  4 +--
 .../zh/examples/pods/storage/pv-volume.yaml   |  2 +-
 25 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/content/zh/examples/application/deployment-scale.yaml b/content/zh/examples/application/deployment-scale.yaml
index 3bdc7b6f5b..68801c971d 100644
--- a/content/zh/examples/application/deployment-scale.yaml
+++ b/content/zh/examples/application/deployment-scale.yaml
@@ -14,6 +14,6 @@ spec:
     spec:
       containers:
       - name: nginx
-        image: nginx:1.8
+        image: nginx:1.14.2
         ports:
         - containerPort: 80
diff --git a/content/zh/examples/application/deployment-update.yaml b/content/zh/examples/application/deployment-update.yaml
index 8c683d6dc7..18e8be65fb 100644
--- a/content/zh/examples/application/deployment-update.yaml
+++ b/content/zh/examples/application/deployment-update.yaml
@@ -14,6 +14,6 @@ spec:
     spec:
       containers:
       - name: nginx
-        image: nginx:1.8 # Update the version of nginx from 1.7.9 to 1.8
+        image: nginx:1.16.1 # Update the version of nginx from 1.14.2 to 1.16.1
         ports:
         - containerPort: 80
diff --git a/content/zh/examples/application/deployment.yaml b/content/zh/examples/application/deployment.yaml
index 0f526b16c0..2cd599218d 100644
--- a/content/zh/examples/application/deployment.yaml
+++ b/content/zh/examples/application/deployment.yaml
@@ -14,6 +14,6 @@ spec:
     spec:
       containers:
       - name: nginx
-        image: nginx:1.7.9
+        image: nginx:1.14.2
         ports:
         - containerPort: 80
diff --git a/content/zh/examples/application/guestbook/redis-slave-deployment.yaml b/content/zh/examples/application/guestbook/redis-slave-deployment.yaml
index ec4e48bc21..7dcfb6c263 100644
--- a/content/zh/examples/application/guestbook/redis-slave-deployment.yaml
+++ b/content/zh/examples/application/guestbook/redis-slave-deployment.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
       - name: slave
-        image: gcr.io/google_samples/gb-redisslave:v1
+        image: gcr.io/google_samples/gb-redisslave:v3
         resources:
           requests:
             cpu: 100m
diff --git a/content/zh/examples/application/mysql/mysql-pv.yaml b/content/zh/examples/application/mysql/mysql-pv.yaml
index 6f4e692f3b..c89779a83f 100644
--- a/content/zh/examples/application/mysql/mysql-pv.yaml
+++ b/content/zh/examples/application/mysql/mysql-pv.yaml
@@ -1,5 +1,5 @@
-kind: PersistentVolume
 apiVersion: v1
+kind: PersistentVolume
 metadata:
   name: mysql-pv-volume
   labels:
diff --git a/content/zh/examples/application/mysql/mysql-statefulset.yaml b/content/zh/examples/application/mysql/mysql-statefulset.yaml
index e0c04007a8..b69af02c59 100644
--- a/content/zh/examples/application/mysql/mysql-statefulset.yaml
+++ b/content/zh/examples/application/mysql/mysql-statefulset.yaml
@@ -106,16 +106,16 @@ spec:
           cd /var/lib/mysql
 
           # Determine binlog position of cloned data, if any.
-          if [[ -f xtrabackup_slave_info ]]; then
+          if [[ -f xtrabackup_slave_info && "x$(<xtrabackup_slave_info)" != "x" ]]; then
             # XtraBackup already generated a partial "CHANGE MASTER TO" query
-            # because we're cloning from an existing slave.
-            mv xtrabackup_slave_info change_master_to.sql.in
+            # because we're cloning from an existing slave. (Need to remove the tailing semicolon!)
+            cat xtrabackup_slave_info | sed -E 's/;$//g' > change_master_to.sql.in
             # Ignore xtrabackup_binlog_info in this case (it's useless).
-            rm -f xtrabackup_binlog_info
+            rm -f xtrabackup_slave_info xtrabackup_binlog_info
           elif [[ -f xtrabackup_binlog_info ]]; then
             # We're cloning directly from master. Parse binlog position.
             [[ `cat xtrabackup_binlog_info` =~ ^(.*?)[[:space:]]+(.*?)$ ]] || exit 1
-            rm xtrabackup_binlog_info
+            rm -f xtrabackup_binlog_info xtrabackup_slave_info
             echo "CHANGE MASTER TO MASTER_LOG_FILE='${BASH_REMATCH[1]}',\
                   MASTER_LOG_POS=${BASH_REMATCH[2]}" > change_master_to.sql.in
           fi
@@ -126,16 +126,15 @@ spec:
             until mysql -h 127.0.0.1 -e "SELECT 1"; do sleep 1; done
 
             echo "Initializing replication from clone position"
+            mysql -h 127.0.0.1 \
+                  -e "$(<change_master_to.sql.in), \
+                          MASTER_HOST='mysql-0.mysql', \
+                          MASTER_USER='root', \
+                          MASTER_PASSWORD='', \
+                          MASTER_CONNECT_RETRY=10; \
+                        START SLAVE;" || exit 1
             # In case of container restart, attempt this at-most-once.
             mv change_master_to.sql.in change_master_to.sql.orig
-            mysql -h 127.0.0.1 <<EOF
-          $(<change_master_to.sql.orig),
-            MASTER_HOST='mysql-0.mysql',
-            MASTER_USER='root',
-            MASTER_PASSWORD='',
-            MASTER_CONNECT_RETRY=10;
-          START SLAVE;
-          EOF
           fi
 
           # Start a server to send backups when requested by peers.
diff --git a/content/zh/examples/application/nginx-app.yaml b/content/zh/examples/application/nginx-app.yaml
index c3f926b74e..d00682e1fc 100644
--- a/content/zh/examples/application/nginx-app.yaml
+++ b/content/zh/examples/application/nginx-app.yaml
@@ -29,6 +29,6 @@ spec:
     spec:
       containers:
       - name: nginx
-        image: nginx:1.7.9
+        image: nginx:1.14.2
         ports:
         - containerPort: 80
diff --git a/content/zh/examples/application/nginx/nginx-deployment.yaml b/content/zh/examples/application/nginx/nginx-deployment.yaml
index f05bfa3c5f..7f608bc47f 100644
--- a/content/zh/examples/application/nginx/nginx-deployment.yaml
+++ b/content/zh/examples/application/nginx/nginx-deployment.yaml
@@ -14,6 +14,6 @@ spec:
     spec:
       containers:
       - name: nginx
-        image: nginx:1.7.9
+        image: nginx:1.14.2
         ports:
         - containerPort: 80
diff --git a/content/zh/examples/application/shell-demo.yaml b/content/zh/examples/application/shell-demo.yaml
index 2a7d274a64..9eb140d80f 100644
--- a/content/zh/examples/application/shell-demo.yaml
+++ b/content/zh/examples/application/shell-demo.yaml
@@ -12,3 +12,5 @@ spec:
     volumeMounts:
     - name: shared-data
       mountPath: /usr/share/nginx/html
+  hostNetwork: true
+  dnsPolicy: Default
diff --git a/content/zh/examples/application/simple_deployment.yaml b/content/zh/examples/application/simple_deployment.yaml
index 10fa1ddf29..d9c74af8c5 100644
--- a/content/zh/examples/application/simple_deployment.yaml
+++ b/content/zh/examples/application/simple_deployment.yaml
@@ -14,6 +14,6 @@ spec:
     spec:
       containers:
       - name: nginx
-        image: nginx:1.7.9
+        image: nginx:1.14.2
         ports:
         - containerPort: 80
diff --git a/content/zh/examples/application/update_deployment.yaml b/content/zh/examples/application/update_deployment.yaml
index d53aa3e6d2..2d7603acb9 100644
--- a/content/zh/examples/application/update_deployment.yaml
+++ b/content/zh/examples/application/update_deployment.yaml
@@ -13,6 +13,6 @@ spec:
     spec:
       containers:
       - name: nginx
-        image: nginx:1.11.9 # update the image
+        image: nginx:1.16.1 # update the image
         ports:
         - containerPort: 80
diff --git a/content/zh/examples/application/zookeeper/zookeeper.yaml b/content/zh/examples/application/zookeeper/zookeeper.yaml
index 4afa806a54..a858a72613 100644
--- a/content/zh/examples/application/zookeeper/zookeeper.yaml
+++ b/content/zh/examples/application/zookeeper/zookeeper.yaml
@@ -49,7 +49,7 @@ spec:
   replicas: 3
   updateStrategy:
     type: RollingUpdate
-  podManagementPolicy: Parallel
+  podManagementPolicy: OrderedReady
   template:
     metadata:
       labels:
diff --git a/content/zh/examples/audit/audit-policy.yaml b/content/zh/examples/audit/audit-policy.yaml
index b5d66b3a18..25b8fd0070 100644
--- a/content/zh/examples/audit/audit-policy.yaml
+++ b/content/zh/examples/audit/audit-policy.yaml
@@ -1,4 +1,4 @@
-apiVersion: audit.k8s.io/v1beta1 # This is required.
+apiVersion: audit.k8s.io/v1 # This is required.
 kind: Policy
 # Don't generate audit events for all requests in RequestReceived stage.
 omitStages:
@@ -65,4 +65,4 @@ rules:
     # Long-running requests like watches that fall under this rule will not
     # generate an audit event in RequestReceived.
     omitStages:
-      - "RequestReceived"
\ No newline at end of file
+      - "RequestReceived"
diff --git a/content/zh/examples/pods/config/redis-pod.yaml b/content/zh/examples/pods/config/redis-pod.yaml
index 259dbf853a..b1714c26e5 100644
--- a/content/zh/examples/pods/config/redis-pod.yaml
+++ b/content/zh/examples/pods/config/redis-pod.yaml
@@ -5,7 +5,10 @@ metadata:
 spec:
   containers:
   - name: redis
-    image: kubernetes/redis:v1
+    image: redis:5.0.4
+    command:
+      - redis-server
+      - "/redis-master/redis.conf"
     env:
     - name: MASTER
       value: "true"
diff --git a/content/zh/examples/pods/inject/dapi-volume-resources.yaml b/content/zh/examples/pods/inject/dapi-volume-resources.yaml
index ee9677bec4..ecb231e0cf 100644
--- a/content/zh/examples/pods/inject/dapi-volume-resources.yaml
+++ b/content/zh/examples/pods/inject/dapi-volume-resources.yaml
@@ -30,7 +30,6 @@ spec:
       volumeMounts:
         - name: podinfo
           mountPath: /etc/podinfo
-          readOnly: false
   volumes:
     - name: podinfo
       downwardAPI:
diff --git a/content/zh/examples/pods/inject/dapi-volume.yaml b/content/zh/examples/pods/inject/dapi-volume.yaml
index e7515afba5..0f0a9f2e5c 100644
--- a/content/zh/examples/pods/inject/dapi-volume.yaml
+++ b/content/zh/examples/pods/inject/dapi-volume.yaml
@@ -25,7 +25,6 @@ spec:
       volumeMounts:
         - name: podinfo
           mountPath: /etc/podinfo
-          readOnly: false
   volumes:
     - name: podinfo
       downwardAPI:
diff --git a/content/zh/examples/pods/inject/secret-pod.yaml b/content/zh/examples/pods/inject/secret-pod.yaml
index 78633c477c..8be694cdde 100644
--- a/content/zh/examples/pods/inject/secret-pod.yaml
+++ b/content/zh/examples/pods/inject/secret-pod.yaml
@@ -7,9 +7,9 @@ spec:
     - name: test-container
       image: nginx
       volumeMounts:
-          # name must match the volume name below
-          - name: secret-volume
-            mountPath: /etc/secret-volume
+        # name must match the volume name below
+        - name: secret-volume
+          mountPath: /etc/secret-volume
   # The secret data is exposed to Containers in the Pod through a Volume.
   volumes:
     - name: secret-volume
diff --git a/content/zh/examples/pods/inject/secret.yaml b/content/zh/examples/pods/inject/secret.yaml
index 64627d638f..706ca8670f 100644
--- a/content/zh/examples/pods/inject/secret.yaml
+++ b/content/zh/examples/pods/inject/secret.yaml
@@ -3,5 +3,5 @@ kind: Secret
 metadata:
   name: test-secret
 data:
-  username: bXktYXBwCg==
-  password: Mzk1MjgkdmRnN0piCg==
+  username: bXktYXBw
+  password: Mzk1MjgkdmRnN0pi
diff --git a/content/zh/examples/pods/pod-projected-svc-token.yaml b/content/zh/examples/pods/pod-projected-svc-token.yaml
index 1c6ba24980..985073c8d3 100644
--- a/content/zh/examples/pods/pod-projected-svc-token.yaml
+++ b/content/zh/examples/pods/pod-projected-svc-token.yaml
@@ -1,5 +1,5 @@
-kind: Pod
 apiVersion: v1
+kind: Pod
 metadata:
   name: nginx
 spec:
@@ -9,7 +9,7 @@ spec:
     volumeMounts:
     - mountPath: /var/run/secrets/tokens
       name: vault-token
-  serviceAccountName: acct
+  serviceAccountName: build-robot
   volumes:
   - name: vault-token
     projected:
diff --git a/content/zh/examples/pods/probe/http-liveness.yaml b/content/zh/examples/pods/probe/http-liveness.yaml
index 23d37b480a..670af18399 100644
--- a/content/zh/examples/pods/probe/http-liveness.yaml
+++ b/content/zh/examples/pods/probe/http-liveness.yaml
@@ -15,7 +15,7 @@ spec:
         path: /healthz
         port: 8080
         httpHeaders:
-        - name: X-Custom-Header
+        - name: Custom-Header
           value: Awesome
       initialDelaySeconds: 3
       periodSeconds: 3
diff --git a/content/zh/examples/pods/security/security-context.yaml b/content/zh/examples/pods/security/security-context.yaml
index 86ca51d39a..35cb1eeebe 100644
--- a/content/zh/examples/pods/security/security-context.yaml
+++ b/content/zh/examples/pods/security/security-context.yaml
@@ -5,13 +5,15 @@ metadata:
 spec:
   securityContext:
     runAsUser: 1000
+    runAsGroup: 3000
     fsGroup: 2000
   volumes:
   - name: sec-ctx-vol
     emptyDir: {}
   containers:
   - name: sec-ctx-demo
-    image: gcr.io/google-samples/node-hello:1.0
+    image: busybox
+    command: [ "sh", "-c", "sleep 1h" ]
     volumeMounts:
     - name: sec-ctx-vol
       mountPath: /data/demo
diff --git a/content/zh/examples/pods/simple-pod.yaml b/content/zh/examples/pods/simple-pod.yaml
index 4208f4b365..0e79d8a3c6 100644
--- a/content/zh/examples/pods/simple-pod.yaml
+++ b/content/zh/examples/pods/simple-pod.yaml
@@ -5,6 +5,6 @@ metadata:
 spec:
   containers:
   - name: nginx
-    image: nginx:1.7.9
+    image: nginx:1.14.2
     ports:
     - containerPort: 80
diff --git a/content/zh/examples/pods/storage/pv-claim.yaml b/content/zh/examples/pods/storage/pv-claim.yaml
index 197db917c8..b33f6faa4c 100644
--- a/content/zh/examples/pods/storage/pv-claim.yaml
+++ b/content/zh/examples/pods/storage/pv-claim.yaml
@@ -1,5 +1,5 @@
-kind: PersistentVolumeClaim
 apiVersion: v1
+kind: PersistentVolumeClaim
 metadata:
   name: task-pv-claim
 spec:
diff --git a/content/zh/examples/pods/storage/pv-pod.yaml b/content/zh/examples/pods/storage/pv-pod.yaml
index 9bb4ca45ad..a2eddcf088 100644
--- a/content/zh/examples/pods/storage/pv-pod.yaml
+++ b/content/zh/examples/pods/storage/pv-pod.yaml
@@ -1,12 +1,12 @@
-kind: Pod
 apiVersion: v1
+kind: Pod
 metadata:
   name: task-pv-pod
 spec:
   volumes:
     - name: task-pv-storage
       persistentVolumeClaim:
-       claimName: task-pv-claim
+        claimName: task-pv-claim
   containers:
     - name: task-pv-container
       image: nginx
diff --git a/content/zh/examples/pods/storage/pv-volume.yaml b/content/zh/examples/pods/storage/pv-volume.yaml
index 33ca6843f4..36fe3c5424 100644
--- a/content/zh/examples/pods/storage/pv-volume.yaml
+++ b/content/zh/examples/pods/storage/pv-volume.yaml
@@ -1,5 +1,5 @@
-kind: PersistentVolume
 apiVersion: v1
+kind: PersistentVolume
 metadata:
   name: task-pv-volume
   labels: