Skip to content

K
k3s
Commit baaaf266 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #40130 from xilabao/change-to-v1beta1-in-create-rolebinding

Automatic merge from submit-queue change APIVersion to v1beta1 in create rolebinding/clusterrolebinding
parents 6873d2a5 d969edeb
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
pkg/kubectl/clusterrolebinding.go
View file @ baaaf266
...@@ -119,14 +119,14 @@ func (s ClusterRoleBindingGeneratorV1) StructuredGenerate() (runtime.Object, err ...@@ -119,14 +119,14 @@ func (s ClusterRoleBindingGeneratorV1) StructuredGenerate() (runtime.Object, err
for _, user := range s.Users { for _, user := range s.Users {
clusterRoleBinding.Subjects = append(clusterRoleBinding.Subjects, rbac.Subject{ clusterRoleBinding.Subjects = append(clusterRoleBinding.Subjects, rbac.Subject{
Kind: rbac.UserKind, Kind: rbac.UserKind,
APIVersion: "rbac/v1alpha1", APIVersion: "rbac.authorization.k8s.io/v1beta1",
Name: user, Name: user,
}) })
} }
for _, group := range s.Groups { for _, group := range s.Groups {
clusterRoleBinding.Subjects = append(clusterRoleBinding.Subjects, rbac.Subject{ clusterRoleBinding.Subjects = append(clusterRoleBinding.Subjects, rbac.Subject{
Kind: rbac.GroupKind, Kind: rbac.GroupKind,
APIVersion: "rbac/v1alpha1", APIVersion: "rbac.authorization.k8s.io/v1beta1",
Name: group, Name: group,
}) })
} }
......
pkg/kubectl/rolebinding.go
View file @ baaaf266
...@@ -134,14 +134,14 @@ func (s RoleBindingGeneratorV1) StructuredGenerate() (runtime.Object, error) { ...@@ -134,14 +134,14 @@ func (s RoleBindingGeneratorV1) StructuredGenerate() (runtime.Object, error) {
for _, user := range s.Users { for _, user := range s.Users {
roleBinding.Subjects = append(roleBinding.Subjects, rbac.Subject{ roleBinding.Subjects = append(roleBinding.Subjects, rbac.Subject{
Kind: rbac.UserKind, Kind: rbac.UserKind,
APIVersion: "rbac/v1alpha1", APIVersion: "rbac.authorization.k8s.io/v1beta1",
Name: user, Name: user,
}) })
} }
for _, group := range s.Groups { for _, group := range s.Groups {
roleBinding.Subjects = append(roleBinding.Subjects, rbac.Subject{ roleBinding.Subjects = append(roleBinding.Subjects, rbac.Subject{
Kind: rbac.GroupKind, Kind: rbac.GroupKind,
APIVersion: "rbac/v1alpha1", APIVersion: "rbac.authorization.k8s.io/v1beta1",
Name: group, Name: group,
}) })
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment