-
Notifications
You must be signed in to change notification settings - Fork 39.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Deprecate RBAC UserAll, convert v1alpha1 rolebindings to "User *" to …
…"Group system:authenticated"
- Loading branch information
Showing
10 changed files
with
230 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
/* | ||
Copyright 2016 The Kubernetes Authors. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package v1alpha1 | ||
|
||
import ( | ||
api "k8s.io/kubernetes/pkg/apis/rbac" | ||
"k8s.io/kubernetes/pkg/auth/user" | ||
"k8s.io/kubernetes/pkg/conversion" | ||
) | ||
|
||
func Convert_v1alpha1_Subject_To_rbac_Subject(in *Subject, out *api.Subject, s conversion.Scope) error { | ||
if err := autoConvert_v1alpha1_Subject_To_rbac_Subject(in, out, s); err != nil { | ||
return err | ||
} | ||
|
||
// User * in v1alpha1 will only match all authenticated users | ||
// This is only for compatibility with old RBAC bindings | ||
// Special treatment for * should not be included in v1beta1 | ||
if out.Kind == UserKind && out.Name == "*" { | ||
out.Kind = GroupKind | ||
out.Name = user.AllAuthenticated | ||
} | ||
|
||
return nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
/* | ||
Copyright 2016 The Kubernetes Authors. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package v1alpha1_test | ||
|
||
import ( | ||
"reflect" | ||
"testing" | ||
|
||
"k8s.io/kubernetes/pkg/api" | ||
rbacapi "k8s.io/kubernetes/pkg/apis/rbac" | ||
_ "k8s.io/kubernetes/pkg/apis/rbac/install" | ||
"k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" | ||
) | ||
|
||
func TestConversion(t *testing.T) { | ||
testcases := map[string]struct { | ||
old *v1alpha1.RoleBinding | ||
expected *rbacapi.RoleBinding | ||
}{ | ||
"specific user": { | ||
old: &v1alpha1.RoleBinding{ | ||
RoleRef: v1alpha1.RoleRef{Name: "foo", APIGroup: v1alpha1.GroupName}, | ||
Subjects: []v1alpha1.Subject{{Kind: "User", Name: "bob"}}, | ||
}, | ||
expected: &rbacapi.RoleBinding{ | ||
RoleRef: rbacapi.RoleRef{Name: "foo", APIGroup: v1alpha1.GroupName}, | ||
Subjects: []rbacapi.Subject{{Kind: "User", Name: "bob"}}, | ||
}, | ||
}, | ||
"wildcard user matches authenticated": { | ||
old: &v1alpha1.RoleBinding{ | ||
RoleRef: v1alpha1.RoleRef{Name: "foo", APIGroup: v1alpha1.GroupName}, | ||
Subjects: []v1alpha1.Subject{{Kind: "User", Name: "*"}}, | ||
}, | ||
expected: &rbacapi.RoleBinding{ | ||
RoleRef: rbacapi.RoleRef{Name: "foo", APIGroup: v1alpha1.GroupName}, | ||
Subjects: []rbacapi.Subject{{Kind: "Group", Name: "system:authenticated"}}, | ||
}, | ||
}, | ||
} | ||
for k, tc := range testcases { | ||
internal := &rbacapi.RoleBinding{} | ||
if err := api.Scheme.Convert(tc.old, internal, nil); err != nil { | ||
t.Errorf("%s: unexpected error: %v", k, err) | ||
} | ||
if !reflect.DeepEqual(internal, tc.expected) { | ||
t.Errorf("%s: expected\n\t%#v, got \n\t%#v", k, tc.expected, internal) | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters