Skip to content

Commit 57b86bc

Browse files
CaoShuFengzacharysarah
authored and
zacharysarah
committed
deprecate three admission controller (#7363)
1 parent 2335fc1 commit 57b86bc

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

docs/admin/admission-controllers.md

+14
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,21 @@ This admission controller also protects the access to `metadata.ownerReferences[
416416
of an object, so that only users with "update" permission to the `finalizers`
417417
subresource of the referenced *owner* can change it.
418418

419+
<<<<<<< HEAD
419420
### PersistentVolumeLabel (DEPRECATED)
421+
||||||| merged common ancestors
422+
### Persistent Volume Claim Protection (alpha)
423+
{% assign for_k8s_version="v1.9" %}{% include feature-state-alpha.md %}
424+
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.
425+
426+
### PersistentVolumeLabel
427+
=======
428+
### Persistent Volume Claim Protection (alpha)
429+
{% assign for_k8s_version="v1.9" %}{% include feature-state-alpha.md %}
430+
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.
431+
432+
### PersistentVolumeLabel (DEPRECATED)
433+
>>>>>>> deprecate three admission controller (#7363)
420434

421435
This admission controller automatically attaches region or zone labels to PersistentVolumes
422436
as defined by the cloud provider (for example, GCE or AWS).

0 commit comments

Comments
 (0)