Merge remote-tracking branch 'upstream/master' into lperkins/issue-8639-cassandra-pods

content/en/docs/tutorials/stateful-application/basic-stateful-set.md

@@ -451,7 +451,9 @@ strategy used is determined by the `spec.updateStrategy` field of the
 StatefulSet API Object. This feature can be used to upgrade the container 
 images, resource requests and/or limits, labels, and annotations of the Pods in a 
 StatefulSet. There are two valid update strategies, `RollingUpdate` and 
-`OnDelete`. 
+`OnDelete`.
+
+`RollingUpdate` update strategy is the default for StatefulSets.
 
 ### Rolling Update
 

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

@@ -142,7 +142,7 @@ The following manifest describes a single-instance WordPress Deployment and Serv
 1. Create a WordPress Service and Deployment from the `wordpress-deployment.yaml` file:
 
       ```shell
-      kubectl create -f https://k8s.io/examples/wordpress/wordpress-deployment.yaml
+      kubectl create -f https://k8s.io/examples/application/wordpress/wordpress-deployment.yaml
       ```
 
 2. Verify that a PersistentVolume got dynamically provisioned:

content/en/docs/tutorials/stateful-application/zookeeper.md

@@ -848,13 +848,13 @@ This is because the Pods in the `zk` `StatefulSet` have a `PodAntiAffinity` spec
                   - key: "app"
                     operator: In
                     values:
-                    - zk-hs
+                    - zk
               topologyKey: "kubernetes.io/hostname"
 ```
 
 The `requiredDuringSchedulingIgnoredDuringExecution` field tells the
-Kubernetes Scheduler that it should never co-locate two Pods from the `zk-hs`
-Service in the domain defined by the `topologyKey`. The `topologyKey`
+Kubernetes Scheduler that it should never co-locate two Pods which have `app` label 
+as `zk` in the domain defined by the `topologyKey`. The `topologyKey`
 `kubernetes.io/hostname` indicates that the domain is an individual node. Using
 different rules, labels, and selectors, you can extend this technique to spread
 your ensemble across physical, network, and power failure domains.