sync en zh example yaml (#19779)

content/zh/examples/controllers/daemonset.yaml

@@ -15,6 +15,8 @@ spec:
         name: fluentd-elasticsearch
     spec:
       tolerations:
+      # this toleration is to have the daemonset runnable on master nodes
+      # remove it if your masters can't run pods
       - key: node-role.kubernetes.io/master
         effect: NoSchedule
       containers:

content/zh/examples/controllers/frontend.yaml

@@ -11,28 +11,11 @@ spec:
   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
-          # If your cluster config does not include a dns service, then to
-          # instead access environment variables to find service host
-          # info, comment out the 'value: dns' line above, and uncomment the
-          # line below.
-          # value: env
-        ports:
-        - containerPort: 80

content/zh/examples/controllers/nginx-deployment.yaml

@@ -16,6 +16,6 @@ spec:
     spec:
       containers:
       - name: nginx
-        image: nginx:1.15.4
+        image: nginx:1.14.2
         ports:
         - containerPort: 80

content/zh/examples/debug/fluentd-gcp-configmap.yaml

@@ -1,5 +1,5 @@
-kind: ConfigMap
 apiVersion: v1
+kind: ConfigMap
 data:
   containers.input.conf: |-
     # This configuration file for Fluentd is used

content/zh/examples/podpreset/allow-db-merged.yaml

@@ -14,9 +14,6 @@ spec:
       volumeMounts:
         - mountPath: /cache
           name: cache-volume
-        - mountPath: /etc/app/config.json
-          readOnly: true
-          name: secret-volume
       ports:
         - containerPort: 80
       env:
@@ -32,6 +29,3 @@ spec:
   volumes:
     - name: cache-volume
       emptyDir: {}
-    - name: secret-volume
-      secret:
-        secretName: config-details

content/zh/examples/podpreset/allow-db.yaml

@@ -19,12 +19,6 @@ spec:
   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

content/zh/examples/service/access/hello-service.yaml

@@ -1,5 +1,5 @@
-kind: Service
 apiVersion: v1
+kind: Service
 metadata:
   name: hello
 spec:

content/zh/examples/service/networking/ingress.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: test-ingress

content/zh/examples/service/networking/nginx-secure-app.yaml

@@ -35,6 +35,9 @@ spec:
       - name: secret-volume
         secret:
           secretName: nginxsecret
+      - name: configmap-volume
+        configMap:
+          name: nginxconfigmap
       containers:
       - name: nginxhttps
         image: bprashanth/nginxhttps:1.0
@@ -44,3 +47,5 @@ spec:
         volumeMounts:
         - mountPath: /etc/nginx/ssl
           name: secret-volume
+        - mountPath: /etc/nginx/conf.d
+          name: configmap-volume