Merge branch 'master' into patch-2
commit
567374824e
|
@ -32,12 +32,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer__copyright">
|
||||
<b>© 2016 Kubernetes</b><br>
|
||||
developed and designed by<br>
|
||||
<a href="http://container-solutions.com/" target="_blank">Container Solutions</a> & <a href="http://www.remembertoplay.co" target="_blank">Remember to Play</a>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -96,12 +96,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer__copyright">
|
||||
<b>© 2016 Kubernetes</b><br>
|
||||
developed and designed by<br>
|
||||
<a href="http://container-solutions.com/" target="_blank">Container Solutions</a> & <a href="http://www.remembertoplay.co" target="_blank">Remember to Play</a>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -39,12 +39,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer__copyright">
|
||||
<b>© 2016 Kubernetes</b><br>
|
||||
developed and designed by<br>
|
||||
<a href="http://container-solutions.com/" target="_blank">Container Solutions</a> & <a href="http://www.remembertoplay.co" target="_blank">Remember to Play</a>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -44,12 +44,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer__copyright">
|
||||
<b>© 2016 Kubernetes</b><br>
|
||||
developed and designed by<br>
|
||||
<a href="http://container-solutions.com/" target="_blank">Container Solutions</a> & <a href="http://www.remembertoplay.co" target="_blank">Remember to Play</a>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -35,12 +35,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer__copyright">
|
||||
<b>© 2016 Kubernetes</b><br>
|
||||
developed and designed by<br>
|
||||
<a href="http://container-solutions.com/" target="_blank">Container Solutions</a> & <a href="http://www.remembertoplay.co" target="_blank">Remember to Play</a>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -98,12 +98,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer__copyright">
|
||||
<b>© 2016 Kubernetes</b><br>
|
||||
developed and designed by<br>
|
||||
<a href="http://container-solutions.com/" target="_blank">Container Solutions</a> & <a href="http://www.remembertoplay.co" target="_blank">Remember to Play</a>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -45,12 +45,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer__copyright">
|
||||
<b>© 2016 Kubernetes</b><br>
|
||||
developed and designed by<br>
|
||||
<a href="http://container-solutions.com/" target="_blank">Container Solutions</a> & <a href="http://www.remembertoplay.co" target="_blank">Remember to Play</a>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -35,12 +35,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer__copyright">
|
||||
<b>© 2016 Kubernetes</b><br>
|
||||
developed and designed by<br>
|
||||
<a href="http://container-solutions.com/" target="_blank">Container Solutions</a> & <a href="http://www.remembertoplay.co" target="_blank">Remember to Play</a>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -132,12 +132,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer__copyright">
|
||||
<b>© 2016 Kubernetes</b><br>
|
||||
developed and designed by<br>
|
||||
<a href="http://container-solutions.com/" target="_blank">Container Solutions</a> & <a href="http://www.remembertoplay.co" target="_blank">Remember to Play</a>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -46,12 +46,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer__copyright">
|
||||
<b>© 2016 Kubernetes</b><br>
|
||||
developed and designed by<br>
|
||||
<a href="http://container-solutions.com/" target="_blank">Container Solutions</a> & <a href="http://www.remembertoplay.co" target="_blank">Remember to Play</a>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -33,12 +33,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer__copyright">
|
||||
<b>© 2016 Kubernetes</b><br>
|
||||
developed and designed by<br>
|
||||
<a href="http://container-solutions.com/" target="_blank">Container Solutions</a> & <a href="http://www.remembertoplay.co" target="_blank">Remember to Play</a>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -126,12 +126,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer__copyright">
|
||||
<b>© 2016 Kubernetes</b><br>
|
||||
developed and designed by<br>
|
||||
<a href="http://container-solutions.com/" target="_blank">Container Solutions</a> & <a href="http://www.remembertoplay.co" target="_blank">Remember to Play</a>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -89,12 +89,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer__copyright">
|
||||
<b>© 2016 Kubernetes</b><br>
|
||||
developed and designed by<br>
|
||||
<a href="http://container-solutions.com/" target="_blank">Container Solutions</a> & <a href="http://www.remembertoplay.co" target="_blank">Remember to Play</a>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -44,12 +44,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer__copyright">
|
||||
<b>© 2016 Kubernetes</b><br>
|
||||
developed and designed by<br>
|
||||
<a href="http://container-solutions.com/" target="_blank">Container Solutions</a> & <a href="http://www.remembertoplay.co" target="_blank">Remember to Play</a>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -33,12 +33,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer__copyright">
|
||||
<b>© 2016 Kubernetes</b><br>
|
||||
developed and designed by<br>
|
||||
<a href="http://container-solutions.com/" target="_blank">Container Solutions</a> & <a href="http://www.remembertoplay.co" target="_blank">Remember to Play</a>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
|
||||
<a class="scrolltop" href="#top"></a>
|
||||
|
|
|
@ -110,12 +110,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer__copyright">
|
||||
<b>© 2016 Kubernetes</b><br>
|
||||
developed and designed by<br>
|
||||
<a href="http://container-solutions.com/" target="_blank">Container Solutions</a> & <a href="http://www.remembertoplay.co" target="_blank">Remember to Play</a>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -44,12 +44,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer__copyright">
|
||||
<b>© 2016 Kubernetes</b><br>
|
||||
developed and designed by<br>
|
||||
<a href="http://container-solutions.com/" target="_blank">Container Solutions</a> & <a href="http://www.remembertoplay.co" target="_blank">Remember to Play</a>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
|
||||
<a class="scrolltop" href="#top"></a>
|
||||
|
|
|
@ -28,12 +28,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer__copyright">
|
||||
<b>© 2016 Kubernetes</b><br>
|
||||
developed and designed by<br>
|
||||
<a href="http://container-solutions.com/" target="_blank">Container Solutions</a> & <a href="http://www.remembertoplay.co" target="_blank">Remember to Play</a>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -125,12 +125,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer__copyright">
|
||||
<b>© 2016 Kubernetes</b><br>
|
||||
developed and designed by<br>
|
||||
<a href="http://container-solutions.com/" target="_blank">Container Solutions</a> & <a href="http://www.remembertoplay.co" target="_blank">Remember to Play</a>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -399,3 +399,27 @@ parameters:
|
|||
|
||||
* `type`: [VolumeType](http://docs.openstack.org/admin-guide/dashboard-manage-volumes.html) created in Cinder. Default is empty.
|
||||
* `availability`: Availability Zone. Default is empty.
|
||||
|
||||
## Writing Portable Configuration
|
||||
|
||||
If you're writing configuration templates or examples that run on a wide range of clusters
|
||||
and need persistent storage, we recommend that you use the following pattern:
|
||||
|
||||
- Do include PersistentVolumeClaim objects in your bundle of config (alongside Deployments, ConfigMaps, etc).
|
||||
- Do not include PersistentVolume objects in the config, since the user instantiating the config may not have
|
||||
permission to create PersistentVolumes.
|
||||
- Give the user the option of providing a storage class name when instantating the template.
|
||||
- If the user provides a storage class name, and the cluster is version 1.4 or newer, put that value into the `volume.beta.kubernetes.io/storage-class` annotation of the PVC.
|
||||
This will cause the PVC to match the right storage class if the cluster has StorageClasses enabled by the admin.
|
||||
- If the user does not provide a storage class name or the cluster is version 1.3, then instead put a `volume.alpha.kubernetes.io/storage-class: default` annotation on the PVC.
|
||||
- This will cause a PV to be automatically provisioned for the user with sane default characteristics on some clusters.
|
||||
- Despite the word `alpha` in the name, the code behind this annotation has `beta` level support.
|
||||
- Do not use `volume.beta.kubernetes.io/storage-class:` with any value including the empty string since it will prevent DefaultStorageClass admission controller
|
||||
from running if enabled.
|
||||
- In your tooling, do watch for PVCs that are not getting bound after some time and surface this to the user, as this may indicate that the cluster has no dynamic
|
||||
storage support (in which case the user should create a matching PV) or the cluster has no storage system (in which case the user cannot deploy config requiring
|
||||
PVCs).
|
||||
- In the future, we expect most clusters to have `DefaultStorageClass` enabled, and to have some form of storage available. However, there may not be any
|
||||
storage class names which work on all clusters, so continue to not set one by default.
|
||||
At some point, the alpha annotation will cease to have meaning, but the unset `storageClass` field on the PVC
|
||||
will have the desired effect.
|
||||
|
|
Loading…
Reference in New Issue