Snip dependencies on internal API type

liggitt · Oct 25, 2018 · eeb44ef · eeb44ef
1 parent 5d4334b
commit eeb44ef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/pkg/process.go b/pkg/process.go
@@ -6,7 +6,6 @@ import (
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
-	"k8s.io/kubernetes/pkg/apis/rbac"
 	rbacv1helper "k8s.io/kubernetes/pkg/apis/rbac/v1"
 	"k8s.io/kubernetes/pkg/registry/rbac/validation"
 	rbacauthorizer "k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac"
@@ -168,7 +167,7 @@ func (g *Generator) ensureClusterRoleAndBinding(subject rbacv1.Subject) *rbacv1.
 	}
 	g.clusterRoleBinding = &rbacv1.ClusterRoleBinding{
 		ObjectMeta: metav1.ObjectMeta{Name: g.Options.Name, Labels: g.Options.Labels, Annotations: g.Options.Annotations},
-		RoleRef:    rbacv1.RoleRef{APIGroup: rbac.GroupName, Kind: "ClusterRole", Name: g.clusterRole.Name},
+		RoleRef:    rbacv1.RoleRef{APIGroup: rbacv1.GroupName, Kind: "ClusterRole", Name: g.clusterRole.Name},
 		Subjects:   []rbacv1.Subject{subject},
 	}
 
@@ -191,7 +190,7 @@ func (g *Generator) ensureNamespacedRoleAndBinding(subject rbacv1.Subject, names
 	}
 	g.namespacedRoleBinding[namespace] = &rbacv1.RoleBinding{
 		ObjectMeta: metav1.ObjectMeta{Name: g.Options.Name, Namespace: namespace, Labels: g.Options.Labels, Annotations: g.Options.Annotations},
-		RoleRef:    rbacv1.RoleRef{APIGroup: rbac.GroupName, Kind: "Role", Name: g.namespacedRole[namespace].Name},
+		RoleRef:    rbacv1.RoleRef{APIGroup: rbacv1.GroupName, Kind: "Role", Name: g.namespacedRole[namespace].Name},
 		Subjects:   []rbacv1.Subject{subject},
 	}
 

diff --git a/pkg/util.go b/pkg/util.go
@@ -19,7 +19,6 @@ import (
 	"k8s.io/apiserver/pkg/authentication/serviceaccount"
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
-	"k8s.io/kubernetes/pkg/apis/rbac"
 	rbacv1helper "k8s.io/kubernetes/pkg/apis/rbac/v1"
 	"k8s.io/kubernetes/pkg/registry/rbac/validation"
 )
@@ -28,7 +27,7 @@ func userToSubject(user user.Info) rbacv1.Subject {
 	if ns, name, err := serviceaccount.SplitUsername(user.GetName()); err == nil {
 		return rbacv1.Subject{Name: name, Namespace: ns, Kind: "ServiceAccount"}
 	}
-	return rbacv1.Subject{Name: user.GetName(), Kind: "User", APIGroup: rbac.GroupName}
+	return rbacv1.Subject{Name: user.GetName(), Kind: "User", APIGroup: rbacv1.GroupName}
 }
 
 func attributesToResourceRule(request authorizer.AttributesRecord, options GenerateOptions) rbacv1.PolicyRule {
@@ -184,9 +183,6 @@ func init() {
 	if err := rbacv1.AddToScheme(Scheme); err != nil {
 		panic(err)
 	}
-	if err := rbac.AddToScheme(Scheme); err != nil {
-		panic(err)
-	}
 
 	if err := auditv1.AddToScheme(Scheme); err != nil {
 		panic(err)