Skip to content

K
k3s
Commit 5913c5a4 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #42925 from janetkuo/ds-adopt-e2e

Automatic merge from submit-queue Allow DaemonSet controller to PATCH pods, and add more steps and logs in DaemonSet pods adoption e2e test DaemonSet pods adoption failed because DS controller aren't allowed to patch pods when claiming pods. [Edit] This PR fixes #42908 by modifying RBAC to allow DaemonSet controllers to patch pods, as well as adding more logs and steps to the original e2e test to make debugging easier. Tested locally with a local cluster and GCE cluster. @kargakis @lukaszo @kubernetes/sig-apps-pr-reviews
parents e6dc000d b6e3993c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
plugin/pkg/auth/authorizer/rbac/bootstrappolicy/controller_policy.go
View file @ 5913c5a4
...@@ -84,7 +84,7 @@ func init() { ...@@ -84,7 +84,7 @@ func init() {
rbac.NewRule("get", "list", "watch").Groups(extensionsGroup).Resources("daemonsets").RuleOrDie(), rbac.NewRule("get", "list", "watch").Groups(extensionsGroup).Resources("daemonsets").RuleOrDie(),
rbac.NewRule("update").Groups(extensionsGroup).Resources("daemonsets/status").RuleOrDie(), rbac.NewRule("update").Groups(extensionsGroup).Resources("daemonsets/status").RuleOrDie(),
rbac.NewRule("list", "watch").Groups(legacyGroup).Resources("nodes").RuleOrDie(), rbac.NewRule("list", "watch").Groups(legacyGroup).Resources("nodes").RuleOrDie(),
rbac.NewRule("list", "watch", "create", "delete").Groups(legacyGroup).Resources("pods").RuleOrDie(), rbac.NewRule("list", "watch", "create", "delete", "patch").Groups(legacyGroup).Resources("pods").RuleOrDie(),
rbac.NewRule("create").Groups(legacyGroup).Resources("pods/binding").RuleOrDie(), rbac.NewRule("create").Groups(legacyGroup).Resources("pods/binding").RuleOrDie(),
eventsRule(), eventsRule(),
}, },
......
plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-roles.yaml
View file @ 5913c5a4
...@@ -171,6 +171,7 @@ items: ...@@ -171,6 +171,7 @@ items:
- create - create
- delete - delete
- list - list
- patch
- watch - watch
- apiGroups: - apiGroups:
- "" - ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment