Merge remote-tracking branch 'upstream/master' into HEAD

content/zh/docs/concepts/workloads/pods/init-containers.md

@@ -2,11 +2,6 @@
 approvers:
 - erictune
 title: Init 容器
-redirect_from:
-- "/docs/concepts/abstractions/init-containers/"
-- "/docs/concepts/abstractions/init-containers.html"
-- "/docs/user-guide/pods/init-container/"
-- "/docs/user-guide/pods/init-container.html"
 content_template: templates/concept
 ---
 
@@ -186,10 +181,10 @@ spec:
   initContainers:
   - name: init-myservice
     image: busybox:1.28
-    command: ['sh', '-c', 'until nslookup myservice; do echo waiting for myservice; sleep 2; done;']
+    command: ['sh', '-c', "until nslookup myservice.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local; do echo waiting for myservice; sleep 2; done"]
   - name: init-mydb
     image: busybox:1.28
-    command: ['sh', '-c', 'until nslookup mydb; do echo waiting for mydb; sleep 2; done;']
+    command: ['sh', '-c', "until nslookup mydb.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local; do echo waiting for mydb; sleep 2; done"]
 ```
 
 下面的 yaml 文件展示了 `mydb` 和 `myservice` 两个 Service：

content/zh/docs/concepts/workloads/pods/pod-lifecycle.md

@@ -1,8 +1,5 @@
 ---
 title: Pod 的生命周期
-redirect_from:
-- "/docs/user-guide/pod-states/"
-- "/docs/user-guide/pod-states.html"
 content_template: templates/concept
 ---