merge master to 1.10, with fixes (#7682)

docs/user-guide/walkthrough/OWNERS

@@ -1,4 +1,4 @@
-approvers:
+reviewers:
 - eparis
 - janetkuo
 - mikedanese

docs/user-guide/walkthrough/deployment-update.yaml

@@ -1,8 +1,11 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx-deployment
 spec:
+  selector:
+    matchLabels:
+      app: nginx
   replicas: 2
   template:
     metadata:

docs/user-guide/walkthrough/deployment.yaml

@@ -1,8 +1,11 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx-deployment
 spec:
+  selector:
+    matchLabels:
+      app: nginx
   replicas: 2 # tells deployment to run 2 pods matching the template
   template: # create pods using pod definition in this template
     metadata:

docs/user-guide/walkthrough/index.md

@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - eparis
 - mikedanese
 title: Kubernetes 101

docs/user-guide/walkthrough/k8s201.md

@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - janetkuo
 - mikedanese
 title: Kubernetes 201