Skip to content

Commit 0ed05f2

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#49133 from deads2k/gc-02-permissions
Automatic merge from submit-queue (batch tested with PRs 49133, 51557, 51749, 50842, 52018) add controller permissions to set blockOwnerDeletion fixes kubernetes#51970 `blockOwnerDeletion` requires delete permissions on the owner object. This adds that permission for our controllers. @kubernetes/sig-auth-misc ```release-note The OwnerReferencesPermissionEnforcement admission plugin now requires `update` permission on the `finalizers` subresource of the referenced owner in order to set `blockOwnerDeletion` on an owner reference. ```
2 parents 7be29bd + 2572ea5 commit 0ed05f2

4 files changed

Lines changed: 67 additions & 3 deletions

File tree

‎plugin/pkg/admission/gc/gc_admission.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func (a *gcPermissionsEnforcement) Admit(attributes admission.Attributes) (err e
122122
for _, record := range records {
123123
allowed, reason, err := a.authorizer.Authorize(record)
124124
if !allowed {
125-
return admission.NewForbidden(attributes, fmt.Errorf("cannot set blockOwnerDeletion if an ownerReference refers to a resource you can't delete: %v, %v", reason, err))
125+
return admission.NewForbidden(attributes, fmt.Errorf("cannot set blockOwnerDeletion if an ownerReference refers to a resource you can't set finalizers on: %v, %v", reason, err))
126126
}
127127
}
128128
}
@@ -178,12 +178,13 @@ func (a *gcPermissionsEnforcement) ownerRefToDeleteAttributeRecords(ref metav1.O
178178
for _, mapping := range mappings {
179179
ret = append(ret, authorizer.AttributesRecord{
180180
User: attributes.GetUserInfo(),
181-
Verb: "delete",
181+
Verb: "update",
182182
// ownerReference can only refer to an object in the same namespace, so attributes.GetNamespace() equals to the owner's namespace
183183
Namespace: attributes.GetNamespace(),
184184
APIGroup: groupVersion.Group,
185185
APIVersion: groupVersion.Version,
186186
Resource: mapping.Resource,
187+
Subresource: "finalizers",
187188
Name: ref.Name,
188189
ResourceRequest: true,
189190
Path: "",

‎plugin/pkg/admission/gc/gc_admission_test.go‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,29 @@ func (fakeAuthorizer) Authorize(a authorizer.Attributes) (bool, string, error) {
3939
if a.GetVerb() == "delete" {
4040
return false, "", nil
4141
}
42+
if a.GetVerb() == "update" && a.GetSubresource() == "finalizers" {
43+
return false, "", nil
44+
}
4245
return true, "", nil
4346
}
4447

4548
if username == "non-pod-deleter" {
4649
if a.GetVerb() == "delete" && a.GetResource() == "pods" {
4750
return false, "", nil
4851
}
52+
if a.GetVerb() == "update" && a.GetResource() == "pods" && a.GetSubresource() == "finalizers" {
53+
return false, "", nil
54+
}
4955
return true, "", nil
5056
}
5157

5258
if username == "non-rc-deleter" {
5359
if a.GetVerb() == "delete" && a.GetResource() == "replicationcontrollers" {
5460
return false, "", nil
5561
}
62+
if a.GetVerb() == "update" && a.GetResource() == "replicationcontrollers" && a.GetSubresource() == "finalizers" {
63+
return false, "", nil
64+
}
5665
return true, "", nil
5766
}
5867

@@ -326,7 +335,10 @@ func TestBlockOwnerDeletionAdmission(t *testing.T) {
326335
return err == nil
327336
}
328337
expectCantSetBlockOwnerDeletionError := func(err error) bool {
329-
return strings.Contains(err.Error(), "cannot set blockOwnerDeletion if an ownerReference refers to a resource you can't delete")
338+
if err == nil {
339+
return false
340+
}
341+
return strings.Contains(err.Error(), "cannot set blockOwnerDeletion if an ownerReference refers to a resource you can't set finalizers on")
330342
}
331343
tests := []struct {
332344
name string

‎plugin/pkg/auth/authorizer/rbac/bootstrappolicy/controller_policy.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ func buildControllerRoles() ([]rbac.ClusterRole, []rbac.ClusterRoleBinding) {
7474
rbac.NewRule("get", "list", "watch", "update").Groups(batchGroup).Resources("cronjobs").RuleOrDie(),
7575
rbac.NewRule("get", "list", "watch", "create", "update", "delete", "patch").Groups(batchGroup).Resources("jobs").RuleOrDie(),
7676
rbac.NewRule("update").Groups(batchGroup).Resources("cronjobs/status").RuleOrDie(),
77+
rbac.NewRule("update").Groups(batchGroup).Resources("cronjobs/finalizers").RuleOrDie(),
7778
rbac.NewRule("list", "delete").Groups(legacyGroup).Resources("pods").RuleOrDie(),
7879
eventsRule(),
7980
},
@@ -83,6 +84,7 @@ func buildControllerRoles() ([]rbac.ClusterRole, []rbac.ClusterRoleBinding) {
8384
Rules: []rbac.PolicyRule{
8485
rbac.NewRule("get", "list", "watch").Groups(extensionsGroup, appsGroup).Resources("daemonsets").RuleOrDie(),
8586
rbac.NewRule("update").Groups(extensionsGroup, appsGroup).Resources("daemonsets/status").RuleOrDie(),
87+
rbac.NewRule("update").Groups(extensionsGroup, appsGroup).Resources("daemonsets/finalizers").RuleOrDie(),
8688
rbac.NewRule("list", "watch").Groups(legacyGroup).Resources("nodes").RuleOrDie(),
8789
rbac.NewRule("list", "watch", "create", "delete", "patch").Groups(legacyGroup).Resources("pods").RuleOrDie(),
8890
rbac.NewRule("create").Groups(legacyGroup).Resources("pods/binding").RuleOrDie(),
@@ -95,6 +97,7 @@ func buildControllerRoles() ([]rbac.ClusterRole, []rbac.ClusterRoleBinding) {
9597
Rules: []rbac.PolicyRule{
9698
rbac.NewRule("get", "list", "watch", "update").Groups(extensionsGroup, appsGroup).Resources("deployments").RuleOrDie(),
9799
rbac.NewRule("update").Groups(extensionsGroup, appsGroup).Resources("deployments/status").RuleOrDie(),
100+
rbac.NewRule("update").Groups(extensionsGroup, appsGroup).Resources("deployments/finalizers").RuleOrDie(),
98101
rbac.NewRule("get", "list", "watch", "create", "update", "patch", "delete").Groups(extensionsGroup).Resources("replicasets").RuleOrDie(),
99102
// TODO: remove "update" once
100103
// https://github.com/kubernetes/kubernetes/issues/36897 is resolved.
@@ -168,6 +171,7 @@ func buildControllerRoles() ([]rbac.ClusterRole, []rbac.ClusterRoleBinding) {
168171
Rules: []rbac.PolicyRule{
169172
rbac.NewRule("get", "list", "watch", "update").Groups(batchGroup).Resources("jobs").RuleOrDie(),
170173
rbac.NewRule("update").Groups(batchGroup).Resources("jobs/status").RuleOrDie(),
174+
rbac.NewRule("update").Groups(batchGroup).Resources("jobs/finalizers").RuleOrDie(),
171175
rbac.NewRule("list", "watch", "create", "delete", "patch").Groups(legacyGroup).Resources("pods").RuleOrDie(),
172176
eventsRule(),
173177
},
@@ -225,6 +229,7 @@ func buildControllerRoles() ([]rbac.ClusterRole, []rbac.ClusterRoleBinding) {
225229
Rules: []rbac.PolicyRule{
226230
rbac.NewRule("get", "list", "watch", "update").Groups(extensionsGroup).Resources("replicasets").RuleOrDie(),
227231
rbac.NewRule("update").Groups(extensionsGroup).Resources("replicasets/status").RuleOrDie(),
232+
rbac.NewRule("update").Groups(extensionsGroup).Resources("replicasets/finalizers").RuleOrDie(),
228233
rbac.NewRule("list", "watch", "patch", "create", "delete").Groups(legacyGroup).Resources("pods").RuleOrDie(),
229234
eventsRule(),
230235
},
@@ -235,6 +240,7 @@ func buildControllerRoles() ([]rbac.ClusterRole, []rbac.ClusterRoleBinding) {
235240
// 1.0 controllers needed get, update, so without these old controllers break on new servers
236241
rbac.NewRule("get", "list", "watch", "update").Groups(legacyGroup).Resources("replicationcontrollers").RuleOrDie(),
237242
rbac.NewRule("update").Groups(legacyGroup).Resources("replicationcontrollers/status").RuleOrDie(),
243+
rbac.NewRule("update").Groups(legacyGroup).Resources("replicationcontrollers/finalizers").RuleOrDie(),
238244
rbac.NewRule("list", "watch", "patch", "create", "delete").Groups(legacyGroup).Resources("pods").RuleOrDie(),
239245
eventsRule(),
240246
},
@@ -278,6 +284,7 @@ func buildControllerRoles() ([]rbac.ClusterRole, []rbac.ClusterRoleBinding) {
278284
rbac.NewRule("list", "watch").Groups(legacyGroup).Resources("pods").RuleOrDie(),
279285
rbac.NewRule("get", "list", "watch").Groups(appsGroup).Resources("statefulsets").RuleOrDie(),
280286
rbac.NewRule("update").Groups(appsGroup).Resources("statefulsets/status").RuleOrDie(),
287+
rbac.NewRule("update").Groups(appsGroup).Resources("statefulsets/finalizers").RuleOrDie(),
281288
rbac.NewRule("get", "create", "delete", "update", "patch").Groups(legacyGroup).Resources("pods").RuleOrDie(),
282289
rbac.NewRule("get", "create", "delete", "update", "patch", "list", "watch").Groups(appsGroup).Resources("controllerrevisions").RuleOrDie(),
283290
rbac.NewRule("get", "create").Groups(legacyGroup).Resources("persistentvolumeclaims").RuleOrDie(),

‎plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-roles.yaml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,12 @@ items:
124124
- cronjobs/status
125125
verbs:
126126
- update
127+
- apiGroups:
128+
- batch
129+
resources:
130+
- cronjobs/finalizers
131+
verbs:
132+
- update
127133
- apiGroups:
128134
- ""
129135
resources:
@@ -165,6 +171,13 @@ items:
165171
- daemonsets/status
166172
verbs:
167173
- update
174+
- apiGroups:
175+
- apps
176+
- extensions
177+
resources:
178+
- daemonsets/finalizers
179+
verbs:
180+
- update
168181
- apiGroups:
169182
- ""
170183
resources:
@@ -234,6 +247,13 @@ items:
234247
- deployments/status
235248
verbs:
236249
- update
250+
- apiGroups:
251+
- apps
252+
- extensions
253+
resources:
254+
- deployments/finalizers
255+
verbs:
256+
- update
237257
- apiGroups:
238258
- extensions
239259
resources:
@@ -495,6 +515,12 @@ items:
495515
- jobs/status
496516
verbs:
497517
- update
518+
- apiGroups:
519+
- batch
520+
resources:
521+
- jobs/finalizers
522+
verbs:
523+
- update
498524
- apiGroups:
499525
- ""
500526
resources:
@@ -741,6 +767,12 @@ items:
741767
- replicasets/status
742768
verbs:
743769
- update
770+
- apiGroups:
771+
- extensions
772+
resources:
773+
- replicasets/finalizers
774+
verbs:
775+
- update
744776
- apiGroups:
745777
- ""
746778
resources:
@@ -784,6 +816,12 @@ items:
784816
- replicationcontrollers/status
785817
verbs:
786818
- update
819+
- apiGroups:
820+
- ""
821+
resources:
822+
- replicationcontrollers/finalizers
823+
verbs:
824+
- update
787825
- apiGroups:
788826
- ""
789827
resources:
@@ -958,6 +996,12 @@ items:
958996
- statefulsets/status
959997
verbs:
960998
- update
999+
- apiGroups:
1000+
- apps
1001+
resources:
1002+
- statefulsets/finalizers
1003+
verbs:
1004+
- update
9611005
- apiGroups:
9621006
- ""
9631007
resources:

0 commit comments

Comments
 (0)