merge master to 1.10, with fixes (#7682)

docs/tutorials/stateless-application/deployment-scale.yaml

@@ -1,16 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: nginx-deployment
-spec:
-  replicas: 4 # Update the replicas from 2 to 4
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - name: nginx
-        image: nginx:1.8
-        ports:
-        - containerPort: 80

docs/tutorials/stateless-application/deployment-update.yaml

@@ -1,16 +0,0 @@
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: nginx-deployment
-spec:
-  replicas: 2
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - name: nginx
-        image: nginx:1.8 # Update the version of nginx from 1.7.9 to 1.8
-        ports:
-        - containerPort: 80

docs/tutorials/stateless-application/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/tutorials/stateless-application/guestbook.md

@@ -1,6 +1,6 @@
 ---
 title: "Example: Deploying PHP Guestbook application with Redis"
-approvers:
+reviewers:
 - ahmetb
 ---
 

docs/tutorials/stateless-application/guestbook/frontend-deployment.yaml

@@ -28,7 +28,7 @@ spec:
           # provide a dns service. As of Kubernetes 1.3, DNS is a built-in
           # service launched automatically. However, if the cluster you are using
           # does not have a built-in DNS service, you can instead
-          # instead access an environment variable to find the master
+          # access an environment variable to find the master
           # service's host. To do so, comment out the 'value: dns' line above, and
           # uncomment the line below:
           # value: env

docs/tutorials/stateless-application/guestbook/redis-slave-deployment.yaml

@@ -30,7 +30,7 @@ spec:
           # provide a dns service. As of Kubernetes 1.3, DNS is a built-in
           # service launched automatically. However, if the cluster you are using
           # does not have a built-in DNS service, you can instead
-          # instead access an environment variable to find the master
+          # access an environment variable to find the master
           # service's host. To do so, comment out the 'value: dns' line above, and
           # uncomment the line below:
           # value: env

docs/tutorials/stateless-application/hello-minikube.md

@@ -76,6 +76,12 @@ Determine whether you can access sites like [https://cloud.google.com/container-
 curl --proxy "" https://cloud.google.com/container-registry/
 ```
 
+Make sure that the Docker daemon is started. You can determine if docker is running by using a command such as:
+
+```shell
+docker images
+```
+
 If NO proxy is required, start the Minikube cluster:
 
 ```shell
@@ -116,6 +122,12 @@ Verify that `kubectl` is configured to communicate with your cluster:
 kubectl cluster-info
 ```
 
+Open the Kubernetes dashboard in a browser:
+
+```shell
+minikube dashboard
+```
+
 ## Create your Node.js application
 
 The next step is to write the application. Save this code in a folder named `hellonode`
@@ -381,6 +393,12 @@ kubectl delete service hello-node
 kubectl delete deployment hello-node
 ```
 
+Optionally, force removal of the Docker images created:
+
+```shell
+docker rmi hello-node:v1 hello-node:v2 -f
+```
+
 Optionally, stop the Minikube VM:
 
 ```shell