From 9939c7c9536752f10ecd19681cc019a5e07509a6 Mon Sep 17 00:00:00 2001 From: devin-donnelly Date: Sun, 26 Mar 2017 18:25:03 -0700 Subject: [PATCH] Update garbage-collection.md --- docs/concepts/workloads/controllers/garbage-collection.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/concepts/workloads/controllers/garbage-collection.md b/docs/concepts/workloads/controllers/garbage-collection.md index 7e13b15a20..085fd1e168 100644 --- a/docs/concepts/workloads/controllers/garbage-collection.md +++ b/docs/concepts/workloads/controllers/garbage-collection.md @@ -88,14 +88,14 @@ the following things are true: * The object's `deletionTimestamp` is set * The object's `metadata.finalizers` contains the value "foregroundDeletion". -Once the "deletion in progress" state is set, the the garbage +Once the "deletion in progress" state is set, the garbage collector deletes the object's dependents. Once the garbage collector has deleted all -dependents (objects with `ownerReference.blockOwnerDeletion=true`), it delete +"blocking" dependents (objects with `ownerReference.blockOwnerDeletion=true`), it delete the owner object. Note that in the "foregroundDeletion", only dependents with `ownerReference.blockOwnerDeletion` block the deletion of the owner object. -Kubernetes version 1.7, will add an admission controller that controls user access to set +Kubernetes version 1.7 will add an admission controller that controls user access to set `blockOwnerDeletion` to true based on delete permissions on the owner object, so that unauthorized dependents cannot delay deletion of an owner object.