diff --git a/docs/admin/admission-controllers.md b/docs/admin/admission-controllers.md index 26d192cbc2f3d..c1fcbcd4fb44e 100644 --- a/docs/admin/admission-controllers.md +++ b/docs/admin/admission-controllers.md @@ -416,7 +416,21 @@ 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 ### PersistentVolumeLabel (DEPRECATED) +||||||| merged common ancestors +### Persistent Volume Claim Protection (alpha) +{% assign for_k8s_version="v1.9" %}{% include feature-state-alpha.md %} +The `PVCProtection` plugin adds the `kubernetes.io/pvc-protection` finalizer to newly created Persistent Volume Claims (PVCs). In case a user deletes a PVC the PVC is not removed until the finalizer is removed from the PVC by PVC Protection Controller. Refer to the [PVC Protection](/docs/concepts/storage/persistent-volumes/#persistent-volume-claim-protection) for more detailed information. + +### PersistentVolumeLabel +======= +### Persistent Volume Claim Protection (alpha) +{% assign for_k8s_version="v1.9" %}{% include feature-state-alpha.md %} +The `PVCProtection` plugin adds the `kubernetes.io/pvc-protection` finalizer to newly created Persistent Volume Claims (PVCs). In case a user deletes a PVC the PVC is not removed until the finalizer is removed from the PVC by PVC Protection Controller. Refer to the [PVC Protection](/docs/concepts/storage/persistent-volumes/#persistent-volume-claim-protection) for more detailed information. + +### PersistentVolumeLabel (DEPRECATED) +>>>>>>> deprecate three admission controller (#7363) This admission controller automatically attaches region or zone labels to PersistentVolumes as defined by the cloud provider (for example, GCE or AWS).