github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #67160 from seans3/rbac-dependency 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Removes dependency on RBAC within kubernetes core

**What this PR does / why we need it**:

Removes an unneeded dependency. Kubectl should depend on repo "k8s.io/api/rbac"; not "k8s.io/kubernetes/pkg/apis/rbac"

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:

Fixes # 

https://github.com/kubernetes/kubectl/issues/91

```release-note
NONE
```
pull/8/head
Kubernetes Submit Queue 2018-08-09 15:06:15 -07:00 committed by GitHub
parent facc84752b ff6113dfc8
commit a0e5df4968
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubectl/cmd/set/BUILD
View File

@ -19,7 +19,6 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/set", importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/set",
visibility = ["//build/visible_to:pkg_kubectl_cmd_set_CONSUMERS"], visibility = ["//build/visible_to:pkg_kubectl_cmd_set_CONSUMERS"],
deps = [ deps = [
"//pkg/apis/rbac:go_default_library",
"//pkg/kubectl:go_default_library", "//pkg/kubectl:go_default_library",
"//pkg/kubectl/cmd/set/env:go_default_library", "//pkg/kubectl/cmd/set/env:go_default_library",
"//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/templates:go_default_library",

13
pkg/kubectl/cmd/set/set_subject.go
View File

@ -27,7 +27,6 @@ import (
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
utilerrors "k8s.io/apimachinery/pkg/util/errors" utilerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/kubernetes/pkg/apis/rbac"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates" "k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions" "k8s.io/kubernetes/pkg/kubectl/genericclioptions"
@ -183,7 +182,7 @@ func (o *SubjectOptions) Validate() error {
} }
for _, info := range o.Infos { for _, info := range o.Infos {
_, ok := info.Object.(*rbac.ClusterRoleBinding) _, ok := info.Object.(*rbacv1.ClusterRoleBinding)
if ok && tokens[0] == "" { if ok && tokens[0] == "" {
return fmt.Errorf("serviceaccount must be <namespace>:<name>, namespace must be specified") return fmt.Errorf("serviceaccount must be <namespace>:<name>, namespace must be specified")
} }
@ -198,16 +197,16 @@ func (o *SubjectOptions) Run(fn updateSubjects) error {
subjects := []rbacv1.Subject{} subjects := []rbacv1.Subject{}
for _, user := range sets.NewString(o.Users...).List() { for _, user := range sets.NewString(o.Users...).List() {
subject := rbacv1.Subject{ subject := rbacv1.Subject{
Kind: rbac.UserKind, Kind: rbacv1.UserKind,
APIGroup: rbac.GroupName, APIGroup: rbacv1.GroupName,
Name: user, Name: user,
} }
subjects = append(subjects, subject) subjects = append(subjects, subject)
} }
for _, group := range sets.NewString(o.Groups...).List() { for _, group := range sets.NewString(o.Groups...).List() {
subject := rbacv1.Subject{ subject := rbacv1.Subject{
Kind: rbac.GroupKind, Kind: rbacv1.GroupKind,
APIGroup: rbac.GroupName, APIGroup: rbacv1.GroupName,
Name: group, Name: group,
} }
subjects = append(subjects, subject) subjects = append(subjects, subject)
@ -220,7 +219,7 @@ func (o *SubjectOptions) Run(fn updateSubjects) error {
namespace = o.namespace namespace = o.namespace
} }
subject := rbacv1.Subject{ subject := rbacv1.Subject{
Kind: rbac.ServiceAccountKind, Kind: rbacv1.ServiceAccountKind,
Namespace: namespace, Namespace: namespace,
Name: name, Name: name,
} }