From 890894ac4f746161240d80f6abf81db4efa99b35 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Thu, 30 Mar 2017 21:40:51 -0400 Subject: [PATCH] Disable RBAC post-start hook if not using the RBAC authorizer --- cmd/kube-apiserver/app/BUILD | 2 ++ cmd/kube-apiserver/app/server.go | 5 +++++ hack/make-rules/test-cmd.sh | 4 ++++ pkg/kubeapiserver/options/authorization.go | 7 +++++-- pkg/registry/rbac/rest/storage_rbac.go | 4 +++- 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/cmd/kube-apiserver/app/BUILD b/cmd/kube-apiserver/app/BUILD index a0216e0da28..fda7aadc899 100644 --- a/cmd/kube-apiserver/app/BUILD +++ b/cmd/kube-apiserver/app/BUILD @@ -32,12 +32,14 @@ go_library( "//pkg/kubeapiserver:go_default_library", "//pkg/kubeapiserver/admission:go_default_library", "//pkg/kubeapiserver/authenticator:go_default_library", + "//pkg/kubeapiserver/authorizer/modes:go_default_library", "//pkg/kubeapiserver/options:go_default_library", "//pkg/kubeapiserver/server:go_default_library", "//pkg/master:go_default_library", "//pkg/master/thirdparty:go_default_library", "//pkg/master/tunneler:go_default_library", "//pkg/registry/cachesize:go_default_library", + "//pkg/registry/rbac/rest:go_default_library", "//pkg/version:go_default_library", "//plugin/pkg/admission/admit:go_default_library", "//plugin/pkg/admission/alwayspullimages:go_default_library", diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index c283b2c3534..3c350885bae 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -66,11 +66,13 @@ import ( "k8s.io/kubernetes/pkg/kubeapiserver" kubeadmission "k8s.io/kubernetes/pkg/kubeapiserver/admission" kubeauthenticator "k8s.io/kubernetes/pkg/kubeapiserver/authenticator" + "k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" kubeserver "k8s.io/kubernetes/pkg/kubeapiserver/server" "k8s.io/kubernetes/pkg/master" "k8s.io/kubernetes/pkg/master/tunneler" "k8s.io/kubernetes/pkg/registry/cachesize" + rbacrest "k8s.io/kubernetes/pkg/registry/rbac/rest" "k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/bootstrap" ) @@ -353,6 +355,9 @@ func BuildGenericConfig(s *options.ServerRunOptions) (*genericapiserver.Config, if err != nil { return nil, nil, nil, fmt.Errorf("invalid authorization config: %v", err) } + if !sets.NewString(s.Authorization.Modes()...).Has(modes.ModeRBAC) { + genericConfig.DisabledPostStartHooks.Insert(rbacrest.PostStartHookName) + } genericConfig.AdmissionControl, err = BuildAdmission(s, client, sharedInformers, genericConfig.Authorizer) if err != nil { diff --git a/hack/make-rules/test-cmd.sh b/hack/make-rules/test-cmd.sh index 8c1e31ddd81..430cfdf6b3e 100755 --- a/hack/make-rules/test-cmd.sh +++ b/hack/make-rules/test-cmd.sh @@ -36,10 +36,14 @@ function run_kube_apiserver() { # Admission Controllers to invoke prior to persisting objects in cluster ADMISSION_CONTROL="NamespaceLifecycle,LimitRanger,ResourceQuota" + # Include RBAC (to exercise bootstrapping), and AlwaysAllow to allow all actions + AUTHORIZATION_MODE="RBAC,AlwaysAllow" + "${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \ --address="127.0.0.1" \ --public-address-override="127.0.0.1" \ --port="${API_PORT}" \ + --authorization-mode="${AUTHORIZATION_MODE}" \ --admission-control="${ADMISSION_CONTROL}" \ --etcd-servers="http://${ETCD_HOST}:${ETCD_PORT}" \ --public-address-override="127.0.0.1" \ diff --git a/pkg/kubeapiserver/options/authorization.go b/pkg/kubeapiserver/options/authorization.go index b5c8aca1eb2..510614c4ac6 100644 --- a/pkg/kubeapiserver/options/authorization.go +++ b/pkg/kubeapiserver/options/authorization.go @@ -75,14 +75,17 @@ func (s *BuiltInAuthorizationOptions) AddFlags(fs *pflag.FlagSet) { } -func (s *BuiltInAuthorizationOptions) ToAuthorizationConfig(informerFactory informers.SharedInformerFactory) authorizer.AuthorizationConfig { +func (s *BuiltInAuthorizationOptions) Modes() []string { modes := []string{} if len(s.Mode) > 0 { modes = strings.Split(s.Mode, ",") } + return modes +} +func (s *BuiltInAuthorizationOptions) ToAuthorizationConfig(informerFactory informers.SharedInformerFactory) authorizer.AuthorizationConfig { return authorizer.AuthorizationConfig{ - AuthorizationModes: modes, + AuthorizationModes: s.Modes(), PolicyFile: s.PolicyFile, WebhookConfigFile: s.WebhookConfigFile, WebhookCacheAuthorizedTTL: s.WebhookCacheAuthorizedTTL, diff --git a/pkg/registry/rbac/rest/storage_rbac.go b/pkg/registry/rbac/rest/storage_rbac.go index 6ac39c2cb9d..fdddc867f32 100644 --- a/pkg/registry/rbac/rest/storage_rbac.go +++ b/pkg/registry/rbac/rest/storage_rbac.go @@ -55,6 +55,8 @@ import ( "k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy" ) +const PostStartHookName = "rbac/bootstrap-roles" + type RESTStorageProvider struct { Authorizer authorizer.Authorizer } @@ -123,7 +125,7 @@ func (p RESTStorageProvider) storage(version schema.GroupVersion, apiResourceCon } func (p RESTStorageProvider) PostStartHook() (string, genericapiserver.PostStartHookFunc, error) { - return "rbac/bootstrap-roles", PostStartHook, nil + return PostStartHookName, PostStartHook, nil } func PostStartHook(hookContext genericapiserver.PostStartHookContext) error {