merge master to 1.10, with fixes (#7682)

docs/user-guide/configmap/OWNERS

@@ -1,4 +1,4 @@
-approvers:
+reviewers:
 - dchen1107
 - pmorie
 

docs/user-guide/configmap/command-pod.yaml

@@ -1,21 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: config-cmd-test-pod
-spec:
-  containers:
-    - name: test-container
-      image: k8s.gcr.io/busybox
-      command: [ "/bin/sh", "-c", "echo $(KUBE_CONFIG_1) $(KUBE_CONFIG_2)" ]
-      env:
-        - name: KUBE_CONFIG_1
-          valueFrom:
-            configMapKeyRef:
-              name: test-configmap
-              key: data-1
-        - name: KUBE_CONFIG_2
-          valueFrom:
-            configMapKeyRef:
-              name: test-configmap
-              key: data-2
-  restartPolicy: Never

docs/user-guide/configmap/configmap.yaml

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: test-configmap
-data:
-  data-1: value-1
-  data-2: value-2

docs/user-guide/configmap/env-pod.yaml

@@ -1,21 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: config-env-test-pod
-spec:
-  containers:
-    - name: test-container
-      image: k8s.gcr.io/busybox
-      command: [ "/bin/sh", "-c", "env" ]
-      env:
-        - name: KUBE_CONFIG_1
-          valueFrom:
-            configMapKeyRef:
-              name: test-configmap
-              key: data-1
-        - name: KUBE_CONFIG_2
-          valueFrom:
-            configMapKeyRef:
-              name: test-configmap
-              key: data-2
-  restartPolicy: Never

docs/user-guide/configmap/kubectl/game.properties

@@ -1,7 +0,0 @@
-enemies=aliens
-lives=3
-enemies.cheat=true
-enemies.cheat.level=noGoodRotten
-secret.code.passphrase=UUDDLRLRBABAS
-secret.code.allowed=true
-secret.code.lives=30

docs/user-guide/configmap/kubectl/ui.properties

@@ -1,4 +0,0 @@
-color.good=purple
-color.bad=yellow
-allow.textmode=true
-how.nice.to.look=fairlyNice

docs/user-guide/configmap/mount-file-pod.yaml

@@ -1,21 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: config-single-file-volume-pod
-spec:
-  containers:
-    - name: test-container
-      image: k8s.gcr.io/busybox
-      command: [ "/bin/sh", "-c", "cat /etc/special-key" ]
-      volumeMounts:
-      - name: config-volume
-        mountPath: /etc/special-key
-        subPath: path/to/special-key
-  volumes:
-    - name: config-volume
-      configMap:
-        name: test-configmap
-        items:
-        - key: data-1
-          path: path/to/special-key
-  restartPolicy: Never

docs/user-guide/configmap/redis/redis-config

@@ -1,2 +0,0 @@
-maxmemory 2mb
-maxmemory-policy allkeys-lru

docs/user-guide/configmap/redis/redis-pod.yaml

@@ -1,30 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: redis
-spec:
-  containers:
-  - name: redis
-    image: kubernetes/redis:v1
-    env:
-    - name: MASTER
-      value: "true"
-    ports:
-    - containerPort: 6379
-    resources:
-      limits:
-        cpu: "0.1"
-    volumeMounts:
-    - mountPath: /redis-master-data
-      name: data
-    - mountPath: /redis-master
-      name: config
-  volumes:
-    - name: data
-      emptyDir: {}
-    - name: config
-      configMap:
-        name: example-redis-config
-        items:
-        - key: redis-config
-          path: redis.conf

docs/user-guide/configmap/volume-pod.yaml

@@ -1,20 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: config-volume-test-pod
-spec:
-  containers:
-    - name: test-container
-      image: k8s.gcr.io/busybox
-      command: [ "/bin/sh", "-c", "cat /etc/config/path/to/special-key" ]
-      volumeMounts:
-      - name: config-volume
-        mountPath: /etc/config
-  volumes:
-    - name: config-volume
-      configMap:
-        name: test-configmap
-        items:
-        - key: data-1
-          path: path/to/special-key
-  restartPolicy: Never