merge master to 1.10, with fixes (#7682)

docs/user-guide/downward-api/OWNERS

@@ -1,4 +1,4 @@
-approvers:
+reviewers:
 - bgrant0607
 - mikedanese
 

docs/user-guide/downward-api/dapi-container-resources.yaml

@@ -1,34 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: dapi-test-pod
-spec:
-  containers:
-    - name: test-container
-      image: k8s.gcr.io/busybox:1.24
-      command: [ "/bin/sh", "-c", "env" ]
-      resources:
-        requests:
-          memory: "32Mi"
-          cpu: "125m"
-        limits:
-          memory: "64Mi"
-          cpu: "250m"
-      env:
-        - name: MY_CPU_REQUEST
-          valueFrom:
-            resourceFieldRef:
-              resource: requests.cpu
-        - name: MY_CPU_LIMIT
-          valueFrom:
-            resourceFieldRef:
-              resource: limits.cpu
-        - name: MY_MEM_REQUEST
-          valueFrom:
-            resourceFieldRef:
-              resource: requests.memory
-        - name: MY_MEM_LIMIT
-          valueFrom:
-            resourceFieldRef:
-              resource: limits.memory
-  restartPolicy: Never

docs/user-guide/downward-api/dapi-pod.yaml

@@ -1,31 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: dapi-test-pod
-spec:
-  containers:
-    - name: test-container
-      image: k8s.gcr.io/busybox
-      command: [ "/bin/sh", "-c", "env" ]
-      env:
-        - name: MY_NODE_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.nodeName
-        - name: MY_POD_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.name
-        - name: MY_POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        - name: MY_POD_IP
-          valueFrom:
-            fieldRef:
-              fieldPath: status.podIP
-        - name: MY_POD_SERVICE_ACCOUNT
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.serviceAccountName
-  restartPolicy: Never

docs/user-guide/downward-api/volume/dapi-volume-resources.yaml

@@ -1,40 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: kubernetes-downwardapi-volume-example
-spec:
-  containers:
-    - name: client-container
-      image: k8s.gcr.io/busybox:1.24
-      command: ["sh", "-c", "while true; do echo; if [[ -e /etc/cpu_limit ]]; then cat /etc/cpu_limit; fi; if [[ -e /etc/cpu_request ]]; then cat /etc/cpu_request; fi; if [[ -e /etc/mem_limit ]]; then cat /etc/mem_limit; fi; if [[ -e /etc/mem_request ]]; then cat /etc/mem_request; fi; sleep 5; done"]
-      resources:
-        requests:
-          memory: "32Mi"
-          cpu: "125m"
-        limits:
-          memory: "64Mi"
-          cpu: "250m"
-      volumeMounts:
-        - name: podinfo
-          mountPath: /etc
-          readOnly: false
-  volumes:
-    - name: podinfo
-      downwardAPI:
-        items:
-          - path: "cpu_limit"
-            resourceFieldRef:
-              containerName: client-container
-              resource: limits.cpu
-          - path: "cpu_request"
-            resourceFieldRef:
-              containerName: client-container
-              resource: requests.cpu
-          - path: "mem_limit"
-            resourceFieldRef:
-              containerName: client-container
-              resource: limits.memory
-          - path: "mem_request"
-            resourceFieldRef:
-              containerName: client-container
-              resource: requests.memory

docs/user-guide/downward-api/volume/dapi-volume.yaml

@@ -1,30 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: kubernetes-downwardapi-volume-example
-  labels:
-    zone: us-est-coast
-    cluster: test-cluster1
-    rack: rack-22
-  annotations:
-    build: two
-    builder: john-doe
-spec:
-  containers:
-    - name: client-container
-      image: k8s.gcr.io/busybox
-      command: ["sh", "-c", "while true; do if [[ -e /etc/labels ]]; then cat /etc/labels; fi; if [[ -e /etc/annotations ]]; then cat /etc/annotations; fi; sleep 5; done"]
-      volumeMounts:
-        - name: podinfo
-          mountPath: /etc
-          readOnly: false
-  volumes:
-    - name: podinfo
-      downwardAPI:
-        items:
-          - path: "labels"
-            fieldRef:
-              fieldPath: metadata.labels
-          - path: "annotations"
-            fieldRef:
-              fieldPath: metadata.annotations