Merged master into release-1.10 and resolved merge conflicts.

2018-03-13 16:36:07 -07:00
parent 1500d69283 b34babb518
commit 021502d2a6
18 changed files with 183 additions and 258 deletions
@@ -8,6 +8,7 @@ approvers:
 - a-mccarthy
 - abiogenesis-now
 - bradamant3
 - bradtopol
 - steveperry-53
 - zacharysarah
 - chenopis
@@ -0,0 +1,10 @@
 id: cloud-provider
 name: Cloud Provider
 full-link: /docs/concepts/cluster-administration/cloud-providers
 tags:
 - community
 short-description: >
  Cloud provider is a company that offers cloud computing platform that can run Kubernetes clusters.
 long-description: >
  Cloud providers or sometime called Cloud Service Provider (CSPs) provides cloud computing platforms.  They may offer services such as Infrastructure as a Service (IaaS) or Platform as a Service (PaaS).  Cloud providers host the Kubernetes cluster and also provide services that interact with the cluster, such as Load Balancers, Storage Classes etc. 
@@ -14,6 +14,12 @@ cid: caseStudies
    <main>
        <div class="content">
            <div class="case-studies">
              <div class="case-study">
                  <img src="/images/case_studies/huawei_feature.png" alt="huawei">
                  <p class="quote">"Kubernetes basically solved most of our problems. Before, the time of deployment took about a week, now it only takes minutes."</p>
                  <!--<p class="attrib">—  Peixin Hou, Chief Software Architect and Community Director for Open Source at Huawei</p>-->
                  <a href="/case-studies/huawei/">Read about Huawei</a>
              </div>
              <div class="case-study">
                  <img src="/images/case_studies/haufegroup_logo_feature.png" alt="Haufe Group">
                  <p class="quote">"Over the next couple of years, people won’t even think that much about it when they want to run containers. Kubernetes is going to be the go-to solution."</p>
@@ -72,6 +78,7 @@ cid: caseStudies
          <a target="_blank" href="http://blogs.wsj.com/cio/2016/02/24/big-changes-in-goldmans-software-emerge-from-small-containers/"><img src="/images/case_studies/gs.png" alt="Goldman Sachs"></a>
          <a target="_blank" href="/case-studies/golfnow/"><img src="/images/case_studies/golfnow_logo.png" alt="GolfNow"></a>
          <a target="_blank" href="/case-studies/haufegroup/"><img src="/images/case_studies/haufegroup_logo.png" alt="Haufe Group"></a>
          <a target="_blank" href="/case-studies/huawei/"><img src="/images/case_studies/huawei.png" alt="Huawei"></a>
          <a target="_blank" href="http://blog.kubernetes.io/2017/02/inside-jd-com-shift-to-kubernetes-from-openstack.html"><img src="/images/case_studies/jd.png" alt="JD.COM"></a>
          <a target="_blank" href="https://www.openstack.org/videos/video/running-kubernetes-on-openstack-at-liveperson"><img src="/images/case_studies/liveperson.png" alt="LivePerson"></a>
          <a target="_blank" href="https://youtu.be/YkOY7DgXKyw"><img src="/images/case_studies/monzo_logo.png" alt="monzo"></a>
@@ -159,7 +159,7 @@ Aggregated APIs offer more advanced API features and customization of other feat
 | Multi-versioning | Allows serving the same object through two API versions. Can help ease API changes like renaming fields. Less important if you control your client versions. | No | Yes |
 | Custom Storage | If you need storage with a different performance mode (for example, time-series database instead of key-value store) or isolation for security (for example, encryption secrets or different | No | Yes |
 | Custom Business Logic | Perform arbitrary checks or actions when creating, reading, updating or deleting an object | No, but can get some of the same effects with Initializers or Finalizers (requires programming) | Yes |
-| Subresources | {::nomarkdown}<ul><li>Add extra operations other than CRUD, such as "scale" or "exec"</li><li>Allows systems like like HorizontalPodAutoscaler and PodDisruptionBudget interact with your new resource</li><li>Finer-grained access control: user writes spec section, controller writes status section.</li><li>Allows incrementing object Generation on custom resource data mutation (requires separate spec and status sections in the resource)</li></ul>{:/} | `status` and `scale` subresources are supported | Yes, any Subresource |
+| Subresources | {::nomarkdown}<ul><li>Add extra operations other than CRUD, such as "scale" or "exec"</li><li>Allows systems like HorizontalPodAutoscaler and PodDisruptionBudget interact with your new resource</li><li>Finer-grained access control: user writes spec section, controller writes status section.</li><li>Allows incrementing object Generation on custom resource data mutation (requires separate spec and status sections in the resource)</li></ul>{:/} | No but planned | Yes, any Subresource |
 | strategic-merge-patch | The new endpoints support PATCH with `Content-Type: application/strategic-merge-patch+json`. Useful for updating objects that may be modified both locally, and by the server. For more information, see ["Update API Objects in Place Using kubectl patch"](/docs/tasks/run-application/update-api-object-kubectl-patch/) | No | Yes |
 | Protocol Buffers | The new resource supports clients that want to use Protocol Buffers | No | Yes |
 | OpenAPI Schema | Is there an OpenAPI (swagger) schema for the types that can be dynamically fetched from the server? Is the user protected from misspelling field names by ensuring only allowed fields are set? Are types enforced (in other words, don't put an `int` in a `string` field?) | No but planned | Yes |
@@ -130,10 +130,13 @@ to schedule those pods onto the right nodes.
 ## PodSecurityPolicy Annotations
-The use of sysctl in pods can be controlled via annotations on the PodSecurityPolicy.
+The use of sysctl in pods can be controlled via annotation on the PodSecurityPolicy.
-Here is an example, it authorizes binding user creating pod with corresponding
+Sysctl annotation represents a whitelist of allowed safe and unsafe sysctls
-_safe_ and _unsafe_ sysctls.
+in a pod spec. It's a comma-separated list of plain sysctl names or sysctl patterns
 (which end in `*`). The string `*` matches all sysctls.
 Here is an example, it authorizes binding user creating pod with corresponding sysctls.
 ```yaml
 apiVersion: extensions/v1beta1
@@ -141,8 +144,7 @@ kind: PodSecurityPolicy
 metadata:
  name: sysctl-psp
  annotations:
-    security.alpha.kubernetes.io/sysctls: 'kernel.shm_rmid_forced'
+    security.alpha.kubernetes.io/sysctls: 'net.ipv4.route.*,kernel.msg*'
    security.alpha.kubernetes.io/unsafe-sysctls: 'net.ipv4.route.*,kernel.msg*'
 spec:
 ...
 ```
@@ -220,10 +220,11 @@ can be scheduled on N. P might become feasible on N only if a Pod on another
 Node is preempted. Here's an example:
 * Pod P is being considered for Node N.
-* Pod Q is running on another Node in the same zone as Node N.
+* Pod Q is running on another Node in the same Zone as Node N.
-* Pod P has anti-affinity with Pod Q.
+* Pod P has Zone-wide anti-affinity with Pod Q
-* There are no other cases of anti-affinity between Pod P and other Pods in the zone.
+(`topologyKey: failure-domain.beta.kubernetes.io/zone`).
-* In order to schedule Pod P on Node N, Pod Q should be preempted, but scheduler
+* There are no other cases of anti-affinity between Pod P and other Pods in the Zone.
 * In order to schedule Pod P on Node N, Pod Q can be preempted, but scheduler
 does not perform cross-node preemption. So, Pod P will be deemed unschedulable
 on Node N.
@@ -24,7 +24,7 @@ What constitutes a compatible change and how to change the API are detailed by t
 ## OpenAPI and Swagger definitions
-Complete API details are documented using [Swagger v1.2](http://swagger.io/) and [OpenAPI](https://www.openapis.org/). The Kubernetes apiserver (aka "master") exposes an API that can be used to retrieve the Swagger v1.2 Kubernetes API spec located at `/swaggerapi`. You can also enable a UI to browse the API documentation at `/swagger-ui` by passing the `--enable-swagger-ui=true` flag to apiserver.
+Complete API details are documented using [Swagger v1.2](http://swagger.io/) and [OpenAPI](https://www.openapis.org/). The Kubernetes apiserver (aka "master") exposes an API that can be used to retrieve the Swagger v1.2 Kubernetes API spec located at `/swaggerapi`.
 Starting with Kubernetes 1.4, OpenAPI spec is also available at [`/swagger.json`](https://git.k8s.io/kubernetes/api/openapi-spec/swagger.json). While we are transitioning from Swagger v1.2 to OpenAPI (aka Swagger v2.0), some of the tools such as kubectl and swagger-ui are still using v1.2 spec. OpenAPI spec is in Beta as of Kubernetes 1.5.
@@ -60,7 +60,7 @@ kind: Ingress
 metadata:
  name: test-ingress
  annotations:
-    ingress.kubernetes.io/rewrite-target: /
+    nginx.ingress.kubernetes.io/rewrite-target: /
 spec:
  rules:
  - http:
@@ -70,6 +70,7 @@ Kubernetes supports several types of Volumes:
   * `azureFile`
   * `cephfs`
   * `configMap`
   * `csi`
   * `downwardAPI`
   * `emptyDir`
   * `fc` (fibre channel)
@@ -175,7 +175,7 @@ mkdir -p ~/.kube
 Copy the kubeconfig file to the default location.
 ```
-sudo juju scp kubernetes-master/0:/home/ubuntu/config ~/.kube/config
+juju scp kubernetes-master/0:/home/ubuntu/config ~/.kube/config
 ```
 The next step is to install the kubectl client on your local machine. The recommended way to do this on Ubuntu is using the kubectl snap ([https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-snap-on-ubuntu](https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-snap-on-ubuntu)).
@@ -493,6 +493,11 @@ Some of these limitations will be addressed by the community in future releases
 - Mount propagation is not supported on Windows
 - The StatefulSet functionality for stateful applications is not supported
 - Horizontal Pod Autoscaling for Windows Server Container pods has not been verified to work end-to-end
 - Hyper-V isolated containers are not supported. 
 - Windows container OS must match the Host OS. If it does not, the pod will get stuck in a crash loop.
 - Under the networking models of L3 or Host GW, Kubernetes Services are inaccessible to Windows nodes due to a Windows issue. This is not an issue if using OVN/OVS for networking.
 - Windows kubelet.exe may fail to start when running on Windows Server under VMware Fusion [issue 57110](https://github.com/kubernetes/kubernetes/pull/57124)
 - Flannel and Weavenet are not yet supported
 - Windows container OS must match the Host OS. If it does not, the pod will get stuck in a crash loop.
 - Under the networking models of L3 or Host GW, Kubernetes Services are inaccessible to Windows nodes due to a Windows issue. This is not an issue if using OVN/OVS for networking.
 - Windows kubelet.exe may fail to start when running on Windows Server under VMware Fusion [issue 57110](https://github.com/kubernetes/kubernetes/pull/57124)
@@ -62,7 +62,7 @@ changed by setting the <code>for_k8s_version</code> variable.
 ## Glossary
-You can reference glossary terms with an inclusion that will automatically update and replace content with the relevant links from [our glossary](docs/reference/glossary/). When the term is moused-over by someone
+You can reference glossary terms with an inclusion that will automatically update and replace content with the relevant links from [our glossary](/docs/reference/glossary/). When the term is moused-over by someone
 using the online documentation, the glossary entry will display a tooltip.
 The raw data for glossary terms is stored at [https://github.com/kubernetes/website/tree/master/_data/glossary](https://github.com/kubernetes/website/tree/master/_data/glossary), with a YAML file for each glossary term.
@@ -520,7 +520,6 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <<<<<<< HEAD
 <td>201 <br /> <em><a href="#cronjob-v1beta1-batch">CronJob</a></em></td>
 <td>Created</td>
 </tr>
@@ -532,19 +531,6 @@ Appears In:
 <td>200 <br /> <em><a href="#cronjob-v1beta1-batch">CronJob</a></em></td>
 <td>OK</td>
 </tr>
 =======
 <td>200 <br /> <em><a href="#cronjob-v1beta1-batch">CronJob</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#cronjob-v1beta1-batch">CronJob</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>202 <br /> <em><a href="#cronjob-v1beta1-batch">CronJob</a></em></td>
 <td>Accepted</td>
 </tr>
 >>>>>>> bb8c59a640337f352e57a094ddac20bd6bbd4715
 </tbody>
 </table>
 <h2 id="patch">Patch</h2>
@@ -2249,10 +2235,6 @@ spec:
 </thead>
 <tbody>
 <tr>
 <td>202 <br /> <em><a href="#daemonset-v1-apps">DaemonSet</a></em></td>
 <td>Accepted</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#daemonset-v1-apps">DaemonSet</a></em></td>
 <td>OK</td>
 </tr>
@@ -2260,6 +2242,10 @@ spec:
 <td>201 <br /> <em><a href="#daemonset-v1-apps">DaemonSet</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>202 <br /> <em><a href="#daemonset-v1-apps">DaemonSet</a></em></td>
 <td>Accepted</td>
 </tr>
 </tbody>
 </table>
 <h2 id="patch-5">Patch</h2>
@@ -2441,13 +2427,13 @@ spec:
 </thead>
 <tbody>
 <tr>
 <td>201 <br /> <em><a href="#daemonset-v1-apps">DaemonSet</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#daemonset-v1-apps">DaemonSet</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#daemonset-v1-apps">DaemonSet</a></em></td>
 <td>Created</td>
 </tr>
 </tbody>
 </table>
 <h2 id="delete-7">Delete</h2>
@@ -3512,13 +3498,13 @@ $ curl -X GET http:<span class="hljs-regexp">//</span><span class="hljs-number">
 </thead>
 <tbody>
 <tr>
 <td>201 <br /> <em><a href="#daemonset-v1-apps">DaemonSet</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#daemonset-v1-apps">DaemonSet</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#daemonset-v1-apps">DaemonSet</a></em></td>
 <td>Created</td>
 </tr>
 </tbody>
 </table>
 <hr>
@@ -5994,7 +5980,6 @@ $</span><span class="bash"> kubectl proxy</span>
 <tbody>
 <tr>
 <td>200 <br /> <em><a href="#deployment-v1-apps">Deployment</a></em></td>
 <<<<<<< HEAD
 <td>OK</td>
 </tr>
 <tr>
@@ -6266,14 +6251,8 @@ $</span><span class="bash"> kubectl proxy</span>
 <tbody>
 <tr>
 <td>200 <br /> <em><a href="#scale-v1-autoscaling">Scale</a></em></td>
 =======
 >>>>>>> bb8c59a640337f352e57a094ddac20bd6bbd4715
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#deployment-v1-apps">Deployment</a></em></td>
 <td>Created</td>
 </tr>
 </tbody>
 </table>
 <hr>
@@ -9942,10 +9921,6 @@ Appears In:
 <td>200 <br /> <em><a href="#pod-v1-core">Pod</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#pod-v1-core">Pod</a></em></td>
 <td>Created</td>
 </tr>
 </tbody>
 </table>
 <h2 id="replace-status-70">Replace Status</h2>
@@ -13157,13 +13132,13 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>201 <br /> <em><a href="#replicaset-v1-apps">ReplicaSet</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#replicaset-v1-apps">ReplicaSet</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#replicaset-v1-apps">ReplicaSet</a></em></td>
 <td>Created</td>
 </tr>
 </tbody>
 </table>
 <h2 id="-strong-misc-operations-strong--89"><strong>Misc Operations</strong></h2>
@@ -13727,10 +13702,6 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>202 <br /> <em><a href="#replicationcontroller-v1-core">ReplicationController</a></em></td>
 <td>Accepted</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#replicationcontroller-v1-core">ReplicationController</a></em></td>
 <td>OK</td>
 </tr>
@@ -13738,6 +13709,10 @@ Appears In:
 <td>201 <br /> <em><a href="#replicationcontroller-v1-core">ReplicationController</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>202 <br /> <em><a href="#replicationcontroller-v1-core">ReplicationController</a></em></td>
 <td>Accepted</td>
 </tr>
 </tbody>
 </table>
 <h2 id="patch-95">Patch</h2>
@@ -15729,13 +15704,13 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>201 <br /> <em><a href="#statefulset-v1-apps">StatefulSet</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#statefulset-v1-apps">StatefulSet</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#statefulset-v1-apps">StatefulSet</a></em></td>
 <td>Created</td>
 </tr>
 </tbody>
 </table>
 <h2 id="delete-118">Delete</h2>
@@ -17253,7 +17228,6 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <<<<<<< HEAD
 <td>200 <br /> <em><a href="#endpoints-v1-core">Endpoints</a></em></td>
 <td>OK</td>
 </tr>
@@ -17265,19 +17239,6 @@ Appears In:
 <td>202 <br /> <em><a href="#endpoints-v1-core">Endpoints</a></em></td>
 <td>Accepted</td>
 </tr>
 =======
 <td>201 <br /> <em><a href="#endpoints-v1-core">Endpoints</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>202 <br /> <em><a href="#endpoints-v1-core">Endpoints</a></em></td>
 <td>Accepted</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#endpoints-v1-core">Endpoints</a></em></td>
 <td>OK</td>
 </tr>
 >>>>>>> bb8c59a640337f352e57a094ddac20bd6bbd4715
 </tbody>
 </table>
 <h2 id="patch-137">Patch</h2>
@@ -25414,6 +25375,10 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>201 <br /> <em><a href="#persistentvolumeclaim-v1-core">PersistentVolumeClaim</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>202 <br /> <em><a href="#persistentvolumeclaim-v1-core">PersistentVolumeClaim</a></em></td>
 <td>Accepted</td>
 </tr>
@@ -25421,10 +25386,6 @@ Appears In:
 <td>200 <br /> <em><a href="#persistentvolumeclaim-v1-core">PersistentVolumeClaim</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#persistentvolumeclaim-v1-core">PersistentVolumeClaim</a></em></td>
 <td>Created</td>
 </tr>
 </tbody>
 </table>
 <h2 id="patch-228">Patch</h2>
@@ -27968,10 +27929,6 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>200 <br /> <em><a href="#volumeattachment-v1alpha1-storage">VolumeAttachment</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#volumeattachment-v1alpha1-storage">VolumeAttachment</a></em></td>
 <td>Created</td>
 </tr>
@@ -27979,6 +27936,10 @@ Appears In:
 <td>202 <br /> <em><a href="#volumeattachment-v1alpha1-storage">VolumeAttachment</a></em></td>
 <td>Accepted</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#volumeattachment-v1alpha1-storage">VolumeAttachment</a></em></td>
 <td>OK</td>
 </tr>
 </tbody>
 </table>
 <h2 id="patch-256">Patch</h2>
@@ -30113,6 +30074,10 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>200 <br /> <em><a href="#customresourcedefinition-v1beta1-apiextensions">CustomResourceDefinition</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#customresourcedefinition-v1beta1-apiextensions">CustomResourceDefinition</a></em></td>
 <td>Created</td>
 </tr>
@@ -30120,10 +30085,6 @@ Appears In:
 <td>202 <br /> <em><a href="#customresourcedefinition-v1beta1-apiextensions">CustomResourceDefinition</a></em></td>
 <td>Accepted</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#customresourcedefinition-v1beta1-apiextensions">CustomResourceDefinition</a></em></td>
 <td>OK</td>
 </tr>
 </tbody>
 </table>
 <h2 id="patch-280">Patch</h2>
@@ -35010,7 +34971,6 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <<<<<<< HEAD
 <td>202 <br /> <em><a href="#initializerconfiguration-v1alpha1-admissionregistration">InitializerConfiguration</a></em></td>
 <td>Accepted</td>
 </tr>
@@ -35022,19 +34982,6 @@ Appears In:
 <td>201 <br /> <em><a href="#initializerconfiguration-v1alpha1-admissionregistration">InitializerConfiguration</a></em></td>
 <td>Created</td>
 </tr>
 =======
 <td>201 <br /> <em><a href="#initializerconfiguration-v1alpha1-admissionregistration">InitializerConfiguration</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>202 <br /> <em><a href="#initializerconfiguration-v1alpha1-admissionregistration">InitializerConfiguration</a></em></td>
 <td>Accepted</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#initializerconfiguration-v1alpha1-admissionregistration">InitializerConfiguration</a></em></td>
 <td>OK</td>
 </tr>
 >>>>>>> bb8c59a640337f352e57a094ddac20bd6bbd4715
 </tbody>
 </table>
 <h2 id="patch-336">Patch</h2>
@@ -37780,10 +37727,6 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>200 <br /> <em><a href="#podtemplate-v1-core">PodTemplate</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#podtemplate-v1-core">PodTemplate</a></em></td>
 <td>Created</td>
 </tr>
@@ -37791,6 +37734,10 @@ Appears In:
 <td>202 <br /> <em><a href="#podtemplate-v1-core">PodTemplate</a></em></td>
 <td>Accepted</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#podtemplate-v1-core">PodTemplate</a></em></td>
 <td>OK</td>
 </tr>
 </tbody>
 </table>
 <h2 id="patch-369">Patch</h2>
@@ -40626,13 +40573,13 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>201 <br /> <em><a href="#priorityclass-v1alpha1-scheduling">PriorityClass</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#priorityclass-v1alpha1-scheduling">PriorityClass</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#priorityclass-v1alpha1-scheduling">PriorityClass</a></em></td>
 <td>Created</td>
 </tr>
 </tbody>
 </table>
 <h2 id="delete-401">Delete</h2>
@@ -41593,13 +41540,13 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>201 <br /> <em><a href="#podpreset-v1alpha1-settings">PodPreset</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#podpreset-v1alpha1-settings">PodPreset</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#podpreset-v1alpha1-settings">PodPreset</a></em></td>
 <td>Created</td>
 </tr>
 </tbody>
 </table>
 <h2 id="delete-412">Delete</h2>
@@ -42636,6 +42583,10 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>202 <br /> <em><a href="#podsecuritypolicy-v1beta1-extensions">PodSecurityPolicy</a></em></td>
 <td>Accepted</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#podsecuritypolicy-v1beta1-extensions">PodSecurityPolicy</a></em></td>
 <td>OK</td>
 </tr>
@@ -42643,10 +42594,6 @@ Appears In:
 <td>201 <br /> <em><a href="#podsecuritypolicy-v1beta1-extensions">PodSecurityPolicy</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>202 <br /> <em><a href="#podsecuritypolicy-v1beta1-extensions">PodSecurityPolicy</a></em></td>
 <td>Accepted</td>
 </tr>
 </tbody>
 </table>
 <h2 id="patch-423">Patch</h2>
@@ -44820,6 +44767,10 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>202 <br /> <em><a href="#certificatesigningrequest-v1beta1-certificates">CertificateSigningRequest</a></em></td>
 <td>Accepted</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#certificatesigningrequest-v1beta1-certificates">CertificateSigningRequest</a></em></td>
 <td>OK</td>
 </tr>
@@ -44827,10 +44778,6 @@ Appears In:
 <td>201 <br /> <em><a href="#certificatesigningrequest-v1beta1-certificates">CertificateSigningRequest</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>202 <br /> <em><a href="#certificatesigningrequest-v1beta1-certificates">CertificateSigningRequest</a></em></td>
 <td>Accepted</td>
 </tr>
 </tbody>
 </table>
 <h2 id="patch-449">Patch</h2>
@@ -45004,13 +44951,13 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>201 <br /> <em><a href="#certificatesigningrequest-v1beta1-certificates">CertificateSigningRequest</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#certificatesigningrequest-v1beta1-certificates">CertificateSigningRequest</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#certificatesigningrequest-v1beta1-certificates">CertificateSigningRequest</a></em></td>
 <td>Created</td>
 </tr>
 </tbody>
 </table>
 <h2 id="delete-451">Delete</h2>
@@ -47844,10 +47791,6 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>202 <br /> <em><a href="#localsubjectaccessreview-v1-authorization">LocalSubjectAccessReview</a></em></td>
 <td>Accepted</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#localsubjectaccessreview-v1-authorization">LocalSubjectAccessReview</a></em></td>
 <td>OK</td>
 </tr>
@@ -47855,6 +47798,10 @@ Appears In:
 <td>201 <br /> <em><a href="#localsubjectaccessreview-v1-authorization">LocalSubjectAccessReview</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>202 <br /> <em><a href="#localsubjectaccessreview-v1-authorization">LocalSubjectAccessReview</a></em></td>
 <td>Accepted</td>
 </tr>
 </tbody>
 </table>
 <hr>
@@ -50220,13 +50167,13 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>201 <br /> <em><a href="#node-v1-core">Node</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#node-v1-core">Node</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#node-v1-core">Node</a></em></td>
 <td>Created</td>
 </tr>
 </tbody>
 </table>
 <h2 id="-strong-proxy-operations-strong--516"><strong>Proxy Operations</strong></h2>
@@ -51967,13 +51914,13 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>201 <br /> <em><a href="#persistentvolume-v1-core">PersistentVolume</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#persistentvolume-v1-core">PersistentVolume</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#persistentvolume-v1-core">PersistentVolume</a></em></td>
 <td>Created</td>
 </tr>
 </tbody>
 </table>
 <h2 id="delete-539">Delete</h2>
@@ -53201,13 +53148,13 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>201 <br /> <em><a href="#resourcequota-v1-core">ResourceQuota</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#resourcequota-v1-core">ResourceQuota</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#resourcequota-v1-core">ResourceQuota</a></em></td>
 <td>Created</td>
 </tr>
 </tbody>
 </table>
 <h2 id="delete-554">Delete</h2>
@@ -54439,7 +54386,6 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <<<<<<< HEAD
 <td>200 <br /> <em><a href="#role-v1-rbac">Role</a></em></td>
 <td>OK</td>
 </tr>
@@ -54451,19 +54397,6 @@ Appears In:
 <td>202 <br /> <em><a href="#role-v1-rbac">Role</a></em></td>
 <td>Accepted</td>
 </tr>
 =======
 <td>201 <br /> <em><a href="#role-v1-rbac">Role</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>202 <br /> <em><a href="#role-v1-rbac">Role</a></em></td>
 <td>Accepted</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#role-v1-rbac">Role</a></em></td>
 <td>OK</td>
 </tr>
 >>>>>>> bb8c59a640337f352e57a094ddac20bd6bbd4715
 </tbody>
 </table>
 <h2 id="patch-569">Patch</h2>
@@ -57090,6 +57023,10 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>200 <br /> <em><a href="#serviceaccount-v1-core">ServiceAccount</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#serviceaccount-v1-core">ServiceAccount</a></em></td>
 <td>Created</td>
 </tr>
@@ -57097,10 +57034,6 @@ Appears In:
 <td>202 <br /> <em><a href="#serviceaccount-v1-core">ServiceAccount</a></em></td>
 <td>Accepted</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#serviceaccount-v1-core">ServiceAccount</a></em></td>
 <td>OK</td>
 </tr>
 </tbody>
 </table>
 <h2 id="patch-599">Patch</h2>
@@ -58287,6 +58220,10 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>200 <br /> <em><a href="#subjectaccessreview-v1-authorization">SubjectAccessReview</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#subjectaccessreview-v1-authorization">SubjectAccessReview</a></em></td>
 <td>Created</td>
 </tr>
@@ -58294,10 +58231,6 @@ Appears In:
 <td>202 <br /> <em><a href="#subjectaccessreview-v1-authorization">SubjectAccessReview</a></em></td>
 <td>Accepted</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#subjectaccessreview-v1-authorization">SubjectAccessReview</a></em></td>
 <td>OK</td>
 </tr>
 </tbody>
 </table>
 <hr>
@@ -70962,6 +70895,10 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>201 <br /> <em><a href="#clusterrole-v1alpha1-rbac">ClusterRole</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>202 <br /> <em><a href="#clusterrole-v1alpha1-rbac">ClusterRole</a></em></td>
 <td>Accepted</td>
 </tr>
@@ -70969,10 +70906,6 @@ Appears In:
 <td>200 <br /> <em><a href="#clusterrole-v1alpha1-rbac">ClusterRole</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#clusterrole-v1alpha1-rbac">ClusterRole</a></em></td>
 <td>Created</td>
 </tr>
 </tbody>
 </table>
 <h2 id="patch-640">Patch</h2>
@@ -71861,6 +71794,10 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>200 <br /> <em><a href="#clusterrolebinding-v1beta1-rbac">ClusterRoleBinding</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#clusterrolebinding-v1beta1-rbac">ClusterRoleBinding</a></em></td>
 <td>Created</td>
 </tr>
@@ -71868,10 +71805,6 @@ Appears In:
 <td>202 <br /> <em><a href="#clusterrolebinding-v1beta1-rbac">ClusterRoleBinding</a></em></td>
 <td>Accepted</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#clusterrolebinding-v1beta1-rbac">ClusterRoleBinding</a></em></td>
 <td>OK</td>
 </tr>
 </tbody>
 </table>
 <h2 id="patch-651">Patch</h2>
@@ -72045,13 +71978,13 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>200 <br /> <em><a href="#clusterrolebinding-v1beta1-rbac">ClusterRoleBinding</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#clusterrolebinding-v1beta1-rbac">ClusterRoleBinding</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#clusterrolebinding-v1beta1-rbac">ClusterRoleBinding</a></em></td>
 <td>OK</td>
 </tr>
 </tbody>
 </table>
 <h2 id="delete-653">Delete</h2>
@@ -72944,13 +72877,13 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>201 <br /> <em><a href="#clusterrolebinding-v1alpha1-rbac">ClusterRoleBinding</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#clusterrolebinding-v1alpha1-rbac">ClusterRoleBinding</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#clusterrolebinding-v1alpha1-rbac">ClusterRoleBinding</a></em></td>
 <td>Created</td>
 </tr>
 </tbody>
 </table>
 <h2 id="delete-664">Delete</h2>
@@ -73674,6 +73607,10 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>201 <br /> <em><a href="#controllerrevision-v1beta2-apps">ControllerRevision</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>202 <br /> <em><a href="#controllerrevision-v1beta2-apps">ControllerRevision</a></em></td>
 <td>Accepted</td>
 </tr>
@@ -73681,10 +73618,6 @@ Appears In:
 <td>200 <br /> <em><a href="#controllerrevision-v1beta2-apps">ControllerRevision</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#controllerrevision-v1beta2-apps">ControllerRevision</a></em></td>
 <td>Created</td>
 </tr>
 </tbody>
 </table>
 <h2 id="patch-673">Patch</h2>
@@ -74841,7 +74774,6 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <<<<<<< HEAD
 <td>201 <br /> <em><a href="#controllerrevision-v1beta1-apps">ControllerRevision</a></em></td>
 <td>Created</td>
 </tr>
@@ -74853,19 +74785,6 @@ Appears In:
 <td>200 <br /> <em><a href="#controllerrevision-v1beta1-apps">ControllerRevision</a></em></td>
 <td>OK</td>
 </tr>
 =======
 <td>202 <br /> <em><a href="#controllerrevision-v1beta1-apps">ControllerRevision</a></em></td>
 <td>Accepted</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#controllerrevision-v1beta1-apps">ControllerRevision</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#controllerrevision-v1beta1-apps">ControllerRevision</a></em></td>
 <td>Created</td>
 </tr>
 >>>>>>> bb8c59a640337f352e57a094ddac20bd6bbd4715
 </tbody>
 </table>
 <h2 id="patch-686">Patch</h2>
@@ -77802,10 +77721,6 @@ spec:
 </thead>
 <tbody>
 <tr>
 <td>202 <br /> <em><a href="#daemonset-v1beta2-apps">DaemonSet</a></em></td>
 <td>Accepted</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#daemonset-v1beta2-apps">DaemonSet</a></em></td>
 <td>OK</td>
 </tr>
@@ -77813,6 +77728,10 @@ spec:
 <td>201 <br /> <em><a href="#daemonset-v1beta2-apps">DaemonSet</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>202 <br /> <em><a href="#daemonset-v1beta2-apps">DaemonSet</a></em></td>
 <td>Accepted</td>
 </tr>
 </tbody>
 </table>
 <h2 id="patch-716">Patch</h2>
@@ -79662,13 +79581,13 @@ spec:
 </thead>
 <tbody>
 <tr>
 <td>200 <br /> <em><a href="#daemonset-v1beta1-extensions">DaemonSet</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#daemonset-v1beta1-extensions">DaemonSet</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#daemonset-v1beta1-extensions">DaemonSet</a></em></td>
 <td>OK</td>
 </tr>
 </tbody>
 </table>
 <h2 id="delete-735">Delete</h2>
@@ -89312,7 +89231,6 @@ $</span><span class="bash"> kubectl proxy</span>
 </thead>
 <tbody>
 <tr>
 <<<<<<< HEAD
 <td>200 <br /> <em><a href="#deploymentrollback-v1beta1-extensions">DeploymentRollback</a></em></td>
 <td>OK</td>
 </tr>
@@ -89323,14 +89241,6 @@ $</span><span class="bash"> kubectl proxy</span>
 <tr>
 <td>202 <br /> <em><a href="#deploymentrollback-v1beta1-extensions">DeploymentRollback</a></em></td>
 <td>Accepted</td>
 =======
 <td>201 <br /> <em><a href="#deployment-v1beta1-extensions">Deployment</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#deployment-v1beta1-extensions">Deployment</a></em></td>
 <td>OK</td>
 >>>>>>> bb8c59a640337f352e57a094ddac20bd6bbd4715
 </tr>
 </tbody>
 </table>
@@ -91228,13 +91138,13 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>201 <br /> <em><a href="#horizontalpodautoscaler-v2beta1-autoscaling">HorizontalPodAutoscaler</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#horizontalpodautoscaler-v2beta1-autoscaling">HorizontalPodAutoscaler</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#horizontalpodautoscaler-v2beta1-autoscaling">HorizontalPodAutoscaler</a></em></td>
 <td>Created</td>
 </tr>
 </tbody>
 </table>
 <h2 id="delete-829">Delete</h2>
@@ -92577,10 +92487,6 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>200 <br /> <em><a href="#localsubjectaccessreview-v1beta1-authorization">LocalSubjectAccessReview</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#localsubjectaccessreview-v1beta1-authorization">LocalSubjectAccessReview</a></em></td>
 <td>Created</td>
 </tr>
@@ -92588,6 +92494,10 @@ Appears In:
 <td>202 <br /> <em><a href="#localsubjectaccessreview-v1beta1-authorization">LocalSubjectAccessReview</a></em></td>
 <td>Accepted</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#localsubjectaccessreview-v1beta1-authorization">LocalSubjectAccessReview</a></em></td>
 <td>OK</td>
 </tr>
 </tbody>
 </table>
 <hr>
@@ -95968,15 +95878,7 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <<<<<<< HEAD
 <td>200 <br /> <em><a href="#scale-v1beta2-apps">Scale</a></em></td>
 =======
 <td>201 <br /> <em><a href="#replicaset-v1beta2-apps">ReplicaSet</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#replicaset-v1beta2-apps">ReplicaSet</a></em></td>
 >>>>>>> bb8c59a640337f352e57a094ddac20bd6bbd4715
 <td>OK</td>
 </tr>
 </tbody>
@@ -96228,6 +96130,10 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>200 <br /> <em><a href="#replicaset-v1beta1-extensions">ReplicaSet</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#replicaset-v1beta1-extensions">ReplicaSet</a></em></td>
 <td>Created</td>
 </tr>
@@ -96235,10 +96141,6 @@ Appears In:
 <td>202 <br /> <em><a href="#replicaset-v1beta1-extensions">ReplicaSet</a></em></td>
 <td>Accepted</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#replicaset-v1beta1-extensions">ReplicaSet</a></em></td>
 <td>OK</td>
 </tr>
 </tbody>
 </table>
 <h2 id="patch-880">Patch</h2>
@@ -99513,13 +99415,13 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>201 <br /> <em><a href="#role-v1alpha1-rbac">Role</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#role-v1alpha1-rbac">Role</a></em></td>
 <td>OK</td>
 </tr>
 <tr>
 <td>201 <br /> <em><a href="#role-v1alpha1-rbac">Role</a></em></td>
 <td>Created</td>
 </tr>
 </tbody>
 </table>
 <h2 id="delete-916">Delete</h2>
@@ -101639,10 +101541,6 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>202 <br /> <em><a href="#rolebinding-v1alpha1-rbac">RoleBinding</a></em></td>
 <td>Accepted</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#rolebinding-v1alpha1-rbac">RoleBinding</a></em></td>
 <td>OK</td>
 </tr>
@@ -101650,6 +101548,10 @@ Appears In:
 <td>201 <br /> <em><a href="#rolebinding-v1alpha1-rbac">RoleBinding</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>202 <br /> <em><a href="#rolebinding-v1alpha1-rbac">RoleBinding</a></em></td>
 <td>Accepted</td>
 </tr>
 </tbody>
 </table>
 <h2 id="patch-940">Patch</h2>
@@ -105622,10 +105524,6 @@ Appears In:
 </thead>
 <tbody>
 <tr>
 <td>202 <br /> <em><a href="#statefulset-v1beta1-apps">StatefulSet</a></em></td>
 <td>Accepted</td>
 </tr>
 <tr>
 <td>200 <br /> <em><a href="#statefulset-v1beta1-apps">StatefulSet</a></em></td>
 <td>OK</td>
 </tr>
@@ -105633,6 +105531,10 @@ Appears In:
 <td>201 <br /> <em><a href="#statefulset-v1beta1-apps">StatefulSet</a></em></td>
 <td>Created</td>
 </tr>
 <tr>
 <td>202 <br /> <em><a href="#statefulset-v1beta1-apps">StatefulSet</a></em></td>
 <td>Accepted</td>
 </tr>
 </tbody>
 </table>
 <h2 id="patch-978">Patch</h2>
@@ -19,7 +19,7 @@ We’re extremely grateful for security researchers and users that report vulner
 To make a report, please email the private [kubernetes-security@googlegroups.com](mailto:kubernetes-security@googlegroups.com) list with the security details and the details expected for [all Kubernetes bug reports](https://git.k8s.io/kubernetes/.github/ISSUE_TEMPLATE.md).
-You may encrypt your email to this list using the GPG keys of the [Product Security Team members](https://git.k8s.io/community/contributors/devel/security-release-process.md#product-security-team-pst). Encryption using GPG is NOT required to make a disclosure.
+You may encrypt your email to this list using the GPG keys of the [Product Security Team members](https://git.k8s.io/sig-release/security-release-process-documentation/security-release-process.md#product-security-team-pst). Encryption using GPG is NOT required to make a disclosure.
 ### When Should I Report a Vulnerability?
@@ -35,7 +35,7 @@ You may encrypt your email to this list using the GPG keys of the [Product Secur
 ## Security Vulnerability Response
-Each report is acknowledged and analyzed by Product Security Team members within 3 working days. This will set off the [Security Release Process](https://git.k8s.io/community/contributors/devel/security-release-process.md#product-security-team-pst).
+Each report is acknowledged and analyzed by Product Security Team members within 3 working days. This will set off the [Security Release Process](https://git.k8s.io/sig-release/security-release-process-documentation/security-release-process.md#disclosures).
 Any vulnerability information shared with Product Security Team stays within Kubernetes project and will not be disseminated to other projects unless it is necessary to get the issue fixed.
@@ -166,12 +166,8 @@ GCE                  | CoreOS       | CoreOS | flannel     | [docs](/docs/gettin
 Vagrant              | CoreOS       | CoreOS | flannel     | [docs](/docs/getting-started-guides/coreos/)                                 |  Community ([@pires](https://github.com/pires), [@AntonioMeireles](https://github.com/AntonioMeireles))
 Bare-metal (Offline) | CoreOS       | CoreOS | flannel     | [docs](/docs/getting-started-guides/coreos/bare_metal_offline/)              |  Community ([@jeffbean](https://github.com/jeffbean))
 CloudStack           | Ansible      | CoreOS | flannel     | [docs](/docs/getting-started-guides/cloudstack/)                             |  Community ([@sebgoa](https://github.com/sebgoa))
 <<<<<<< HEAD
 VMware vSphere       | any          | multi-support | multi-support     | [docs](https://vmware.github.io/vsphere-storage-for-kubernetes/documentation/)  |  [Community](https://vmware.github.io/vsphere-storage-for-kubernetes/documentation/contactus.html)
 =======
 Vmware vSphere       | Saltstack    | Debian | OVS         | [docs](/docs/getting-started-guides/vsphere/)                                |  Community ([@imkin](https://github.com/imkin))
 Bare-metal           | custom       | CentOS | flannel      | [docs](/docs/getting-started-guides/centos/centos_manual_config/)            |  Community ([@coolsvap](https://github.com/coolsvap))
 >>>>>>> bb8c59a640337f352e57a094ddac20bd6bbd4715
 lxd                  | Juju         | Ubuntu | flannel/canal            | [docs](/docs/getting-started-guides/ubuntu/local/)              |  [Commercial](https://www.ubuntu.com/kubernetes) and [Community](https://jujucharms.com/kubernetes)
 AWS                  | Juju         | Ubuntu | flannel/calico/canal     | [docs](/docs/getting-started-guides/ubuntu/)                    |  [Commercial](https://www.ubuntu.com/kubernetes) and [Community](https://jujucharms.com/kubernetes)
 Azure                | Juju         | Ubuntu | flannel/calico/canal     | [docs](/docs/getting-started-guides/ubuntu/)                    |  [Commercial](https://www.ubuntu.com/kubernetes) and [Community](https://jujucharms.com/kubernetes)
@@ -38,7 +38,7 @@ The output is similar to this:
 ```
 NAME                                    READY     STATUS    RESTARTS   AGE       IP              NODE
-weave-net-1t1qg                         2/2       Running   0          9d        192.168.2.10    workndoe3
+weave-net-1t1qg                         2/2       Running   0          9d        192.168.2.10    worknode3
 weave-net-231d7                         2/2       Running   1          7d        10.2.0.17       worknodegpu
 weave-net-7nmwt                         2/2       Running   3          9d        192.168.2.131   masternode
 weave-net-pmw8w                         2/2       Running   0          9d        192.168.2.216   worknode2
@@ -341,7 +341,7 @@ Output:
 - ingress: disabled
 ```
-Minikube must be running for these command to take effect. To enable `heapster` addon, for example:
+Minikube must be running for these commands to take effect. To enable `heapster` addon, for example:
 ```shell
 minikube addons enable heapster
@@ -12,7 +12,7 @@ def find_documents_to_rewrite():
    rewrites = []
    for doc in moved_docs:
        location = doc_location(doc)
-        destinations = get_desinations_for_doc(doc)
+        destinations = get_destinations_for_doc(doc)
        if len(destinations) == 0:
            print("Unable to get possible destinations for %s" % doc)
@@ -35,7 +35,7 @@ def doc_location(filename):
 REDIRECT_REGEX = re.compile("^.*\[(.*)\]\((.*)\)$")
-def get_desinations_for_doc(filename):
+def get_destinations_for_doc(filename):
    destination_paths = []
    with open(filename) as f:
        lines = [line.rstrip('\n').rstrip('\r') for line in f.readlines()]