Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions pkg/authorization/authorizer/bootstrap_policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -194,18 +194,6 @@ func GetBootstrapPolicyBinding(masterNamespace string) *authorizationapi.PolicyB
},
Groups: util.NewStringSet("system:authenticated"),
},
"insecure-cluster-admin-binding": {
ObjectMeta: kapi.ObjectMeta{
Name: "insecure-cluster-admin-binding",
Namespace: masterNamespace,
},
RoleRef: kapi.ObjectReference{
Name: "cluster-admin",
Namespace: masterNamespace,
},
// TODO until we decide to enforce policy, simply allow every one access
Groups: util.NewStringSet("system:authenticated", "system:unauthenticated"),
},
"system:delete-tokens-binding": {
ObjectMeta: kapi.ObjectMeta{
Name: "system:delete-tokens-binding",
Expand Down
2 changes: 1 addition & 1 deletion pkg/authorization/authorizer/subjects_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func TestSubjects(t *testing.T) {
Resource: "pods",
},
expectedUsers: []string{"Anna", "ClusterAdmin", "Ellen", "Valerie", "system:kube-client", "system:openshift-client", "system:openshift-deployer"},
expectedGroups: []string{"RootUsers", "system:authenticated", "system:cluster-admins", "system:unauthenticated"},
expectedGroups: []string{"RootUsers", "system:cluster-admins"},
}
test.policies = newDefaultGlobalPolicies()
test.policies = append(test.policies, newAdzePolicies()...)
Expand Down
24 changes: 0 additions & 24 deletions test/integration/authorization_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,6 @@ func TestRestrictedAccessForProjectAdmins(t *testing.T) {
t.Errorf("unexpected error: %v", err)
}

// TODO remove once bootstrap authorization rules are tightened
removeInsecureOptions := &policy.RemoveGroupOptions{
RoleNamespace: "master",
RoleName: "cluster-admin",
BindingNamespace: "master",
Client: openshiftClient,
Groups: []string{"system:authenticated", "system:unauthenticated"},
}
if err := removeInsecureOptions.Run(); err != nil {
t.Errorf("unexpected error: %v", err)
}

haroldClient, err := CreateNewProject(openshiftClient, *openshiftClientConfig, "hammer-project", "harold")
if err != nil {
t.Errorf("unexpected error: %v", err)
Expand Down Expand Up @@ -105,18 +93,6 @@ func TestResourceAccessReview(t *testing.T) {
t.Errorf("unexpected error: %v", err)
}

// TODO remove once bootstrap authorization rules are tightened
removeInsecureOptions := &policy.RemoveGroupOptions{
RoleNamespace: "master",
RoleName: "cluster-admin",
BindingNamespace: "master",
Client: openshiftClient,
Groups: []string{"system:authenticated", "system:unauthenticated"},
}
if err := removeInsecureOptions.Run(); err != nil {
t.Errorf("unexpected error: %v", err)
}

haroldClient, err := CreateNewProject(openshiftClient, *openshiftClientConfig, "hammer-project", "harold")
if err != nil {
t.Errorf("unexpected error: %v", err)
Expand Down