Skip to content

Commit

Permalink
Merge pull request #14126 from deads2k/auth-14-switch
Browse files Browse the repository at this point in the history
Merged by openshift-bot
  • Loading branch information
OpenShift Bot authored May 17, 2017
2 parents 3d82103 + d0e3554 commit 71b89dc
Show file tree
Hide file tree
Showing 8 changed files with 190 additions and 1,405 deletions.
12 changes: 12 additions & 0 deletions pkg/cmd/server/bootstrappolicy/dead.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,17 @@ func GetDeadClusterRoles() []authorizationapi.ClusterRole {
}

func init() {
// these were replaced by kube controller roles
addDeadClusterRole("system:replication-controller")
addDeadClusterRole("system:endpoint-controller")
addDeadClusterRole("system:replicaset-controller")
addDeadClusterRole("system:garbage-collector-controller")
addDeadClusterRole("system:job-controller")
addDeadClusterRole("system:hpa-controller")
addDeadClusterRole("system:daemonset-controller")
addDeadClusterRole("system:disruption-controller")
addDeadClusterRole("system:namespace-controller")
addDeadClusterRole("system:gc-controller")
addDeadClusterRole("system:certificate-signing-controller")
addDeadClusterRole("system:statefulset-controller")
}
Loading

0 comments on commit 71b89dc

Please sign in to comment.