Merge pull request #19517 from deads2k/rebase-02-pick

UPSTREAM: 62146: Fix daemon-set-controller bootstrap RBAC policy
openshift · Apr 28, 2018 · 4c5c0b2 · 4c5c0b2
2 parents 10c5957 + 6de11d2
commit 4c5c0b2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/test/testdata/bootstrappolicy/bootstrap_cluster_roles.yaml b/test/testdata/bootstrappolicy/bootstrap_cluster_roles.yaml
@@ -3926,6 +3926,7 @@ items:
     verbs:
     - create
     - delete
+    - get
     - list
     - patch
     - update

diff --git a/test/testdata/bootstrappolicy/bootstrap_policy_file.yaml b/test/testdata/bootstrappolicy/bootstrap_policy_file.yaml
@@ -4305,6 +4305,7 @@ items:
     verbs:
     - create
     - delete
+    - get
     - list
     - patch
     - update

diff --git a/...or/k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/controller_policy.go b/...or/k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/controller_policy.go
diff --git a/...kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-roles.yaml b/...kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-roles.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -3926,6 +3926,7 @@ items: @@
         verbs:
         - create
         - delete
+        - get
         - list
         - patch
         - update
@@ Expand Down @@