Merge branch 'master' into release-1.8

docs/concepts/cluster-administration/cloud-providers.md

@@ -152,6 +152,11 @@ file:
   values are `v1` or `v2`. Where no value is provided automatic detection will
   select the highest supported version exposed by the underlying OpenStack
   cloud.
+* `use-octavia` (Optional): Used to determine whether to look for and use an
+  Octavia LBaaS V2 service catalog endpoint. Valid values are `true` or `false`.
+  Where `true` is specified and an Octaiva LBaaS V2 entry can not be found, the
+  provider will fall back and attempt to find a Neutron LBaaS V2 endpoint
+  instead. The default value is `false`.
 * `subnet-id` (Optional): Used to specify the id of the subnet you want to
   create your loadbalancer on. Can be found at Network > Networks. Click on the
   respective network to get its subnets.
@@ -196,6 +201,12 @@ and should appear in the `[BlockStorage]` section of the `cloud.conf` file:
   provided by Cinder. The default value of `false` results in the discovery of
   the device path based on its serial number and `/dev/disk/by-id` mapping and is
   the recommended approach.
+* `ignore-volume-az` (Optional): Used to influence availability zone use when
+  attaching Cinder volumes. When Nova and Cinder have different availability
+  zones, this should be set to `true`. This is most commonly the case where
+  there are many Nova availability zones but only one Cinder availability zone.
+  The default value is `false` to preserve the behavior used in earlier
+  releases, but may change in the future.
 
 If deploying Kubernetes versions <= 1.8 on an OpenStack deployment that uses
 paths rather than ports to differentiate between endpoints it may be necessary

docs/concepts/workloads/pods/podpreset.md

@@ -41,7 +41,7 @@ When a pod creation request occurs, the system does the following:
    the pod _without_ any injected resources from the `PodPreset`.
 1. Annotate the resulting modified Pod spec to indicate that it has been
    modified by a `PodPreset`. The annotation is of the form
-   `podpreset.admission.kubernetes.io/podpreset-<pod-preset name>": "<resource version>"`.
+   `podpreset.admission.kubernetes.io/podpreset-<pod-preset name>: "<resource version>"`.
 
 Each Pod can be matched zero or more Pod Presets; and each `PodPreset` can be
 applied to zero or more pods. When a `PodPreset` is applied to one or more