whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Storage Protection was renamed to Storage Object in Use Protection (#7576)

Browse Source 
* Storage Protection was renamed to Storage Object in Use Protection

The K8s PR: https://github.com/kubernetes/kubernetes/pull/59901
renamed Storage Protection to Storage Object in Use Protection.

That's why the same is also renamed in the documentation.

* Moved Storage Object in Use Protection admission plugin description down according to alphabetic order.
This commit is contained in:
Pavel Pospisil
2018-03-03 20:42:53 +01:00
committed by zacharysarah
parent 614d47c560
commit b4ccb71c3b
3 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/admin/admission-controllers.md
+8
View File
@@ -416,6 +416,7 @@ This admission controller also protects the access to `metadata.ownerReferences[
of an object, so that only users with "update" permission to the `finalizers`
subresource of the referenced *owner* can change it.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
### PersistentVolumeLabel (DEPRECATED)
@@ -439,6 +440,13 @@ The `PVCProtection` plugin adds the `kubernetes.io/pvc-protection` finalizer to
The `StorageProtection` plugin adds the `kubernetes.io/pvc-protection` or `kubernetes.io/pv-protection` finalizers to newly created Persistent Volume Claims (PVCs) or Persistent Volumes (PV). In case a user deletes a PVC or PV the PVC or PV is not removed until the finalizer is removed from the PVC or PV by PVC or PV Protection Controller. Refer to the [PVC Protection](/docs/concepts/storage/persistent-volumes/#persistent-volume-claim-protection) for more detailed information.
>>>>>>> Bring PVC Protection Feature to Beta (#7165)
||||||| merged common ancestors
### Storage Protection (beta)
{% assign for_k8s_version="v1.10" %}{% include feature-state-beta.md %}
The `StorageProtection` plugin adds the `kubernetes.io/pvc-protection` or `kubernetes.io/pv-protection` finalizers to newly created Persistent Volume Claims (PVCs) or Persistent Volumes (PV). In case a user deletes a PVC or PV the PVC or PV is not removed until the finalizer is removed from the PVC or PV by PVC or PV Protection Controller. Refer to the [PVC Protection](/docs/concepts/storage/persistent-volumes/#persistent-volume-claim-protection) for more detailed information.
=======
>>>>>>> Storage Protection was renamed to Storage Object in Use Protection (#7576)
### PersistentVolumeLabel (DEPRECATED)
>>>>>>> deprecate three admission controller (#7363)