Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
4e397d97
Unverified
Commit
4e397d97
authored
Apr 02, 2019
by
Kubernetes Prow Robot
Committed by
GitHub
Apr 02, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #66635 from wgliang/feature/remove-aws-cloud-provider
Move cloud-specific roles out of RBAC bootstrap
parents
f83fcbef
128fd884
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
50 deletions
+0
-50
policy.go
plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go
+0
-8
cluster-role-bindings.yaml
.../rbac/bootstrappolicy/testdata/cluster-role-bindings.yaml
+0
-17
cluster-roles.yaml
...thorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml
+0
-25
No files found.
plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go
View file @
4e397d97
...
@@ -477,13 +477,6 @@ func ClusterRoles() []rbacv1.ClusterRole {
...
@@ -477,13 +477,6 @@ func ClusterRoles() []rbacv1.ClusterRole {
},
},
},
},
{
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
"system:aws-cloud-provider"
},
Rules
:
[]
rbacv1
.
PolicyRule
{
rbacv1helpers
.
NewRule
(
"get"
,
"patch"
)
.
Groups
(
legacyGroup
)
.
Resources
(
"nodes"
)
.
RuleOrDie
(),
eventsRule
(),
},
},
{
// a role making the csrapprover controller approve a node client CSR
// a role making the csrapprover controller approve a node client CSR
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
"system:certificates.k8s.io:certificatesigningrequests:nodeclient"
},
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
"system:certificates.k8s.io:certificatesigningrequests:nodeclient"
},
Rules
:
[]
rbacv1
.
PolicyRule
{
Rules
:
[]
rbacv1
.
PolicyRule
{
...
@@ -540,7 +533,6 @@ func ClusterRoleBindings() []rbacv1.ClusterRoleBinding {
...
@@ -540,7 +533,6 @@ func ClusterRoleBindings() []rbacv1.ClusterRoleBinding {
rbacv1helpers
.
NewClusterBinding
(
"system:kube-controller-manager"
)
.
Users
(
user
.
KubeControllerManager
)
.
BindingOrDie
(),
rbacv1helpers
.
NewClusterBinding
(
"system:kube-controller-manager"
)
.
Users
(
user
.
KubeControllerManager
)
.
BindingOrDie
(),
rbacv1helpers
.
NewClusterBinding
(
"system:kube-dns"
)
.
SAs
(
"kube-system"
,
"kube-dns"
)
.
BindingOrDie
(),
rbacv1helpers
.
NewClusterBinding
(
"system:kube-dns"
)
.
SAs
(
"kube-system"
,
"kube-dns"
)
.
BindingOrDie
(),
rbacv1helpers
.
NewClusterBinding
(
"system:kube-scheduler"
)
.
Users
(
user
.
KubeScheduler
)
.
BindingOrDie
(),
rbacv1helpers
.
NewClusterBinding
(
"system:kube-scheduler"
)
.
Users
(
user
.
KubeScheduler
)
.
BindingOrDie
(),
rbacv1helpers
.
NewClusterBinding
(
"system:aws-cloud-provider"
)
.
SAs
(
"kube-system"
,
"aws-cloud-provider"
)
.
BindingOrDie
(),
rbacv1helpers
.
NewClusterBinding
(
"system:volume-scheduler"
)
.
Users
(
user
.
KubeScheduler
)
.
BindingOrDie
(),
rbacv1helpers
.
NewClusterBinding
(
"system:volume-scheduler"
)
.
Users
(
user
.
KubeScheduler
)
.
BindingOrDie
(),
// This default binding of the system:node role to the system:nodes group is deprecated in 1.7 with the availability of the Node authorizer.
// This default binding of the system:node role to the system:nodes group is deprecated in 1.7 with the availability of the Node authorizer.
...
...
plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-role-bindings.yaml
View file @
4e397d97
...
@@ -25,23 +25,6 @@ items:
...
@@ -25,23 +25,6 @@ items:
creationTimestamp
:
null
creationTimestamp
:
null
labels
:
labels
:
kubernetes.io/bootstrapping
:
rbac-defaults
kubernetes.io/bootstrapping
:
rbac-defaults
name
:
system:aws-cloud-provider
roleRef
:
apiGroup
:
rbac.authorization.k8s.io
kind
:
ClusterRole
name
:
system:aws-cloud-provider
subjects
:
-
kind
:
ServiceAccount
name
:
aws-cloud-provider
namespace
:
kube-system
-
apiVersion
:
rbac.authorization.k8s.io/v1
kind
:
ClusterRoleBinding
metadata
:
annotations
:
rbac.authorization.kubernetes.io/autoupdate
:
"
true"
creationTimestamp
:
null
labels
:
kubernetes.io/bootstrapping
:
rbac-defaults
name
:
system:basic-user
name
:
system:basic-user
roleRef
:
roleRef
:
apiGroup
:
rbac.authorization.k8s.io
apiGroup
:
rbac.authorization.k8s.io
...
...
plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml
View file @
4e397d97
...
@@ -363,31 +363,6 @@ items:
...
@@ -363,31 +363,6 @@ items:
creationTimestamp
:
null
creationTimestamp
:
null
labels
:
labels
:
kubernetes.io/bootstrapping
:
rbac-defaults
kubernetes.io/bootstrapping
:
rbac-defaults
name
:
system:aws-cloud-provider
rules
:
-
apiGroups
:
-
"
"
resources
:
-
nodes
verbs
:
-
get
-
patch
-
apiGroups
:
-
"
"
resources
:
-
events
verbs
:
-
create
-
patch
-
update
-
apiVersion
:
rbac.authorization.k8s.io/v1
kind
:
ClusterRole
metadata
:
annotations
:
rbac.authorization.kubernetes.io/autoupdate
:
"
true"
creationTimestamp
:
null
labels
:
kubernetes.io/bootstrapping
:
rbac-defaults
name
:
system:basic-user
name
:
system:basic-user
rules
:
rules
:
-
apiGroups
:
-
apiGroups
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment