Merge branch 'master' into release-1.8

docs/tutorials/stateful-application/mysql-wordpress-persistent-volume.md

@@ -151,7 +151,7 @@ The following manifest describes a single-instance WordPress Deployment and Serv
 
    You should see the WordPress set up page similar to the following screenshot.
 
-   ![wordpress-init](https://github.com/kubernetes/examples/blob/master/mysql-wordpress-pd/WordPress.png)
+   ![wordpress-init](https://raw.githubusercontent.com/kubernetes/examples/master/mysql-wordpress-pd/WordPress.png)
 
    **Warning:** Do not leave your WordPress installation on this page. If another user finds it, they can set up a website on your instance and use it to serve malicious content. <br/><br/>Either install WordPress by creating a username and password or delete your instance.
    {: .warning}

docs/tutorials/stateful-application/mysql-wordpress-persistent-volume/mysql-deployment.yaml

@@ -25,13 +25,17 @@ spec:
     requests:
       storage: 20Gi
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: wordpress-mysql
   labels:
     app: wordpress
 spec:
+  selector:
+    matchLabels:
+      app: wordpress
+      tier: mysql
   strategy:
     type: Recreate
   template:

docs/tutorials/stateful-application/mysql-wordpress-persistent-volume/wordpress-deployment.yaml

@@ -25,13 +25,17 @@ spec:
     requests:
       storage: 20Gi
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: wordpress
   labels:
     app: wordpress
 spec:
+  selector:
+    matchLabels:
+      app: wordpress
+      tier: frontend
   strategy:
     type: Recreate
   template:

docs/tutorials/stateless-application/expose-external-ip-address.md

@@ -85,6 +85,7 @@ external IP address.
         Name:           my-service
         Namespace:      default
         Labels:         run=load-balancer-example
+        Annotations:    <none>
         Selector:       run=load-balancer-example
         Type:           LoadBalancer
         IP:             10.3.245.137
@@ -93,7 +94,7 @@ external IP address.
         NodePort:       <unset> 32377/TCP
         Endpoints:      10.0.0.6:8080,10.0.1.6:8080,10.0.1.7:8080 + 2 more...
         Session Affinity:   None
-        Events:
+        Events:         <none>
 
     Make a note of the external IP address exposed by your service. In this
     example, the external IP address is 104.198.205.71. Also note