You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: docs/admin/admission-controllers.md
+14
Original file line number
Diff line number
Diff line change
@@ -416,7 +416,21 @@ This admission controller also protects the access to `metadata.ownerReferences[
416
416
of an object, so that only users with "update" permission to the `finalizers`
417
417
subresource of the referenced *owner* can change it.
418
418
419
+
<<<<<<< HEAD
419
420
### 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)
420
434
421
435
This admission controller automatically attaches region or zone labels to PersistentVolumes
422
436
as defined by the cloud provider (for example, GCE or AWS).
0 commit comments