From b26e9dce9fe493e3d765f266711ab5bc27da257a Mon Sep 17 00:00:00 2001 From: deads2k Date: Tue, 10 Jan 2017 13:10:39 -0500 Subject: [PATCH] remove API to server library dependency --- pkg/apis/rbac/v1alpha1/BUILD | 1 - pkg/apis/rbac/v1alpha1/conversion.go | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/apis/rbac/v1alpha1/BUILD b/pkg/apis/rbac/v1alpha1/BUILD index 9eb14eacda6..d5e0c411c7e 100644 --- a/pkg/apis/rbac/v1alpha1/BUILD +++ b/pkg/apis/rbac/v1alpha1/BUILD @@ -35,7 +35,6 @@ go_library( "//pkg/types:go_default_library", "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/ugorji/go/codec", - "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/apis/rbac/v1alpha1/conversion.go b/pkg/apis/rbac/v1alpha1/conversion.go index ab5d971201b..269e0ad3b6e 100644 --- a/pkg/apis/rbac/v1alpha1/conversion.go +++ b/pkg/apis/rbac/v1alpha1/conversion.go @@ -17,11 +17,14 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/apiserver/pkg/authentication/user" api "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/conversion" ) +// allAuthenticated matches k8s.io/apiserver/pkg/authentication/user.AllAuthenticated, +// but we don't want an client library (which must include types), depending on a server library +const allAuthenticated = "system:authenticated" + 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 @@ -32,7 +35,7 @@ func Convert_v1alpha1_Subject_To_rbac_Subject(in *Subject, out *api.Subject, s c // Special treatment for * should not be included in v1beta1 if out.Kind == UserKind && out.Name == "*" { out.Kind = GroupKind - out.Name = user.AllAuthenticated + out.Name = allAuthenticated } return nil