sync en zh yaml (#19781)

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

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

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

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

content/zh/examples/application/mysql/mysql-pv.yaml

@@ -1,5 +1,5 @@
-kind: PersistentVolume
 apiVersion: v1
+kind: PersistentVolume
 metadata:
   name: mysql-pv-volume
   labels:

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.
+            # because we're cloning from an existing slave. (Need to remove the tailing semicolon!)
-            mv xtrabackup_slave_info change_master_to.sql.in
+            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.

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

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

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

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

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

content/zh/examples/application/zookeeper/zookeeper.yaml

@@ -49,7 +49,7 @@ spec:
   replicas: 3
   updateStrategy:
     type: RollingUpdate
-  podManagementPolicy: Parallel
+  podManagementPolicy: OrderedReady
   template:
     metadata:
       labels:

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:

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"

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:

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:

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 must match the volume name below
-          - name: secret-volume
+        - name: secret-volume
-            mountPath: /etc/secret-volume
+          mountPath: /etc/secret-volume
   # The secret data is exposed to Containers in the Pod through a Volume.
   volumes:
     - name: secret-volume

content/zh/examples/pods/inject/secret.yaml

@@ -3,5 +3,5 @@ kind: Secret
 metadata:
   name: test-secret
 data:
-  username: bXktYXBwCg==
+  username: bXktYXBw
-  password: Mzk1MjgkdmRnN0piCg==
+  password: Mzk1MjgkdmRnN0pi

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:

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

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

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

content/zh/examples/pods/storage/pv-claim.yaml

@@ -1,5 +1,5 @@
-kind: PersistentVolumeClaim
 apiVersion: v1
+kind: PersistentVolumeClaim
 metadata:
   name: task-pv-claim
 spec:

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

content/zh/examples/pods/storage/pv-volume.yaml

@@ -1,5 +1,5 @@
-kind: PersistentVolume
 apiVersion: v1
+kind: PersistentVolume
 metadata:
   name: task-pv-volume
   labels: