sync zh/ en/ (#19918)

content/zh/examples/application/job/rabbitmq/Dockerfile

@@ -1,5 +1,5 @@
 # Specify BROKER_URL and QUEUE when running
-FROM ubuntu:14.04
+FROM ubuntu:18.04
 
 RUN apt-get update && \
     apt-get install -y curl ca-certificates amqp-tools python \

content/zh/examples/application/job/rabbitmq/worker.py

@@ -3,5 +3,5 @@
 # Just prints standard out and sleeps for 10 seconds.
 import sys
 import time
-print("Processing " + sys.stdin.lines())
+print("Processing " + sys.stdin.readlines()[0])
 time.sleep(10)

content/zh/examples/application/job/redis/rediswq.py

@@ -111,7 +111,7 @@ class RedisWQ(object):
         # If we crash here, then the GC code will try to move the value, but it will
         # not be here, which is fine.  So this does not need to be a transaction.
         itemkey = self._itemkey(value)
-        self._db.delete(self._lease_key_prefix + itemkey, self._session)
+        self._db.delete(self._lease_key_prefix + itemkey)
 
 # TODO: add functions to clean up all keys associated with "name" when
 # processing is complete.

content/zh/examples/application/job/redis/worker.py

@@ -12,9 +12,9 @@ q = rediswq.RedisWQ(name="job2", host="redis")
 print("Worker with sessionID: " +  q.sessionID())
 print("Initial queue state: empty=" + str(q.empty()))
 while not q.empty():
-  item = q.lease(lease_secs=10, block=True, timeout=2)
+  item = q.lease(lease_secs=10, block=True, timeout=2) 
   if item is not None:
-    itemstr = item.decode("utf=8")
+    itemstr = item.decode("utf-8")
     print("Working on " + itemstr)
     time.sleep(10) # Put your actual work here instead of sleep.
     q.complete(item)

content/zh/examples/application/php-apache.yaml

@@ -0,0 +1,39 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: php-apache
+spec:
+  selector:
+    matchLabels:
+      run: php-apache
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        run: php-apache
+    spec:
+      containers:
+      - name: php-apache
+        image: k8s.gcr.io/hpa-example
+        ports:
+        - containerPort: 80
+        resources:
+          limits:
+            cpu: 500m
+          requests:
+            cpu: 200m
+
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: php-apache
+  labels:
+    run: php-apache
+spec:
+  ports:
+  - port: 80
+  selector:
+    run: php-apache
+