kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85889 from oke-py/kubectl/726 

`kubectl create clusterrolebinding` creates rbac.authorization.k8s.io/v1 object

Kubernetes-commit: 37961763c02275d7e0706b22d06764b725b92f21
This commit is contained in:
Kubernetes Publisher 2020-02-07 18:32:12 -08:00
parent 9f35a6cd42 4d6d58409e
commit 44a5872ae6
2 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/generate/versioned/clusterrolebinding.go
View File

@ -21,7 +21,7 @@ import (
"strings" "strings"
rbacv1beta1 "k8s.io/api/rbac/v1beta1" rbacv1 "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/kubectl/pkg/generate" "k8s.io/kubectl/pkg/generate"
@ -110,24 +110,24 @@ func (s ClusterRoleBindingGeneratorV1) StructuredGenerate() (runtime.Object, err
if err := s.validate(); err != nil { if err := s.validate(); err != nil {
return nil, err return nil, err
} }
clusterRoleBinding := &rbacv1beta1.ClusterRoleBinding{} clusterRoleBinding := &rbacv1.ClusterRoleBinding{}
clusterRoleBinding.Name = s.Name clusterRoleBinding.Name = s.Name
clusterRoleBinding.RoleRef = rbacv1beta1.RoleRef{ clusterRoleBinding.RoleRef = rbacv1.RoleRef{
APIGroup: rbacv1beta1.GroupName, APIGroup: rbacv1.GroupName,
Kind: "ClusterRole", Kind: "ClusterRole",
Name: s.ClusterRole, Name: s.ClusterRole,
} }
for _, user := range sets.NewString(s.Users...).List() { for _, user := range sets.NewString(s.Users...).List() {
clusterRoleBinding.Subjects = append(clusterRoleBinding.Subjects, rbacv1beta1.Subject{ clusterRoleBinding.Subjects = append(clusterRoleBinding.Subjects, rbacv1.Subject{
Kind: rbacv1beta1.UserKind, Kind: rbacv1.UserKind,
APIGroup: rbacv1beta1.GroupName, APIGroup: rbacv1.GroupName,
Name: user, Name: user,
}) })
} }
for _, group := range sets.NewString(s.Groups...).List() { for _, group := range sets.NewString(s.Groups...).List() {
clusterRoleBinding.Subjects = append(clusterRoleBinding.Subjects, rbacv1beta1.Subject{ clusterRoleBinding.Subjects = append(clusterRoleBinding.Subjects, rbacv1.Subject{
Kind: rbacv1beta1.GroupKind, Kind: rbacv1.GroupKind,
APIGroup: rbacv1beta1.GroupName, APIGroup: rbacv1.GroupName,
Name: group, Name: group,
}) })
} }
@ -136,8 +136,8 @@ func (s ClusterRoleBindingGeneratorV1) StructuredGenerate() (runtime.Object, err
if len(tokens) != 2 || tokens[0] == "" || tokens[1] == "" { if len(tokens) != 2 || tokens[0] == "" || tokens[1] == "" {
return nil, fmt.Errorf("serviceaccount must be <namespace>:<name>") return nil, fmt.Errorf("serviceaccount must be <namespace>:<name>")
} }
clusterRoleBinding.Subjects = append(clusterRoleBinding.Subjects, rbacv1beta1.Subject{ clusterRoleBinding.Subjects = append(clusterRoleBinding.Subjects, rbacv1.Subject{
Kind: rbacv1beta1.ServiceAccountKind, Kind: rbacv1.ServiceAccountKind,
APIGroup: "", APIGroup: "",
Namespace: tokens[0], Namespace: tokens[0],
Name: tokens[1], Name: tokens[1],

60
pkg/generate/versioned/clusterrolebinding_test.go
View File

@ -20,7 +20,7 @@ import (
"reflect" "reflect"
"testing" "testing"
rbacv1beta1 "k8s.io/api/rbac/v1beta1" rbacv1 "k8s.io/api/rbac/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
) )
@ -28,7 +28,7 @@ func TestClusterRoleBindingGenerate(t *testing.T) {
tests := []struct { tests := []struct {
name string name string
params map[string]interface{} params map[string]interface{}
expected *rbacv1beta1.ClusterRoleBinding expected *rbacv1.ClusterRoleBinding
expectErr bool expectErr bool
}{ }{
{ {
@ -40,28 +40,28 @@ func TestClusterRoleBindingGenerate(t *testing.T) {
"group": []string{"group"}, "group": []string{"group"},
"serviceaccount": []string{"ns1:name1"}, "serviceaccount": []string{"ns1:name1"},
}, },
expected: &rbacv1beta1.ClusterRoleBinding{ expected: &rbacv1.ClusterRoleBinding{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "foo", Name: "foo",
}, },
RoleRef: rbacv1beta1.RoleRef{ RoleRef: rbacv1.RoleRef{
APIGroup: rbacv1beta1.GroupName, APIGroup: rbacv1.GroupName,
Kind: "ClusterRole", Kind: "ClusterRole",
Name: "admin", Name: "admin",
}, },
Subjects: []rbacv1beta1.Subject{ Subjects: []rbacv1.Subject{
{ {
APIGroup: rbacv1beta1.GroupName, APIGroup: rbacv1.GroupName,
Kind: rbacv1beta1.UserKind, Kind: rbacv1.UserKind,
Name: "user", Name: "user",
}, },
{ {
APIGroup: rbacv1beta1.GroupName, APIGroup: rbacv1.GroupName,
Kind: rbacv1beta1.GroupKind, Kind: rbacv1.GroupKind,
Name: "group", Name: "group",
}, },
{ {
Kind: rbacv1beta1.ServiceAccountKind, Kind: rbacv1.ServiceAccountKind,
APIGroup: "", APIGroup: "",
Namespace: "ns1", Namespace: "ns1",
Name: "name1", Name: "name1",
@ -79,44 +79,44 @@ func TestClusterRoleBindingGenerate(t *testing.T) {
"group": []string{"group1", "group2"}, "group": []string{"group1", "group2"},
"serviceaccount": []string{"ns1:name1", "ns2:name2"}, "serviceaccount": []string{"ns1:name1", "ns2:name2"},
}, },
expected: &rbacv1beta1.ClusterRoleBinding{ expected: &rbacv1.ClusterRoleBinding{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "foo", Name: "foo",
}, },
RoleRef: rbacv1beta1.RoleRef{ RoleRef: rbacv1.RoleRef{
APIGroup: rbacv1beta1.GroupName, APIGroup: rbacv1.GroupName,
Kind: "ClusterRole", Kind: "ClusterRole",
Name: "admin", Name: "admin",
}, },
Subjects: []rbacv1beta1.Subject{ Subjects: []rbacv1.Subject{
{ {
APIGroup: rbacv1beta1.GroupName, APIGroup: rbacv1.GroupName,
Kind: rbacv1beta1.UserKind, Kind: rbacv1.UserKind,
Name: "user1", Name: "user1",
}, },
{ {
APIGroup: rbacv1beta1.GroupName, APIGroup: rbacv1.GroupName,
Kind: rbacv1beta1.UserKind, Kind: rbacv1.UserKind,
Name: "user2", Name: "user2",
}, },
{ {
APIGroup: rbacv1beta1.GroupName, APIGroup: rbacv1.GroupName,
Kind: rbacv1beta1.GroupKind, Kind: rbacv1.GroupKind,
Name: "group1", Name: "group1",
}, },
{ {
APIGroup: rbacv1beta1.GroupName, APIGroup: rbacv1.GroupName,
Kind: rbacv1beta1.GroupKind, Kind: rbacv1.GroupKind,
Name: "group2", Name: "group2",
}, },
{ {
Kind: rbacv1beta1.ServiceAccountKind, Kind: rbacv1.ServiceAccountKind,
APIGroup: "", APIGroup: "",
Namespace: "ns1", Namespace: "ns1",
Name: "name1", Name: "name1",
}, },
{ {
Kind: rbacv1beta1.ServiceAccountKind, Kind: rbacv1.ServiceAccountKind,
APIGroup: "", APIGroup: "",
Namespace: "ns2", Namespace: "ns2",
Name: "name2", Name: "name2",
@ -131,12 +131,12 @@ func TestClusterRoleBindingGenerate(t *testing.T) {
"name": "foo", "name": "foo",
"clusterrole": "admin", "clusterrole": "admin",
}, },
expected: &rbacv1beta1.ClusterRoleBinding{ expected: &rbacv1.ClusterRoleBinding{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "foo", Name: "foo",
}, },
RoleRef: rbacv1beta1.RoleRef{ RoleRef: rbacv1.RoleRef{
APIGroup: rbacv1beta1.GroupName, APIGroup: rbacv1.GroupName,
Kind: "ClusterRole", Kind: "ClusterRole",
Name: "admin", Name: "admin",
}, },
@ -223,8 +223,8 @@ func TestClusterRoleBindingGenerate(t *testing.T) {
if tt.expectErr && err == nil { if tt.expectErr && err == nil {
t.Errorf("[%s] expect error, got nil", tt.name) t.Errorf("[%s] expect error, got nil", tt.name)
} }
if !reflect.DeepEqual(obj.(*rbacv1beta1.ClusterRoleBinding), tt.expected) { if !reflect.DeepEqual(obj.(*rbacv1.ClusterRoleBinding), tt.expected) {
t.Errorf("\n[%s] want:\n%#v\ngot:\n%#v", tt.name, tt.expected, obj.(*rbacv1beta1.ClusterRoleBinding)) t.Errorf("\n[%s] want:\n%#v\ngot:\n%#v", tt.name, tt.expected, obj.(*rbacv1.ClusterRoleBinding))
} }
}) })
} }