From b5e6859d9202c48f5bf8f2a3782c4243c7b1cbc2 Mon Sep 17 00:00:00 2001 From: Cao Shufeng Date: Mon, 22 May 2017 19:10:32 +0800 Subject: [PATCH] Remove deprecated variable RBACSuperUser authorization-rbac-super-user is deprecated now. So we can remove the vaiable. Further more the comment about this variable is wrong. Remove them also. --- pkg/kubeapiserver/authorizer/config.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkg/kubeapiserver/authorizer/config.go b/pkg/kubeapiserver/authorizer/config.go index 5f5a8a74107..6ad2f2d8e63 100644 --- a/pkg/kubeapiserver/authorizer/config.go +++ b/pkg/kubeapiserver/authorizer/config.go @@ -51,11 +51,6 @@ type AuthorizationConfig struct { // TTL for caching of unauthorized responses from the webhook server. WebhookCacheUnauthorizedTTL time.Duration - // Options for RBAC - - // User which can bootstrap role policies - RBACSuperUser string - InformerFactory informers.SharedInformerFactory } @@ -151,9 +146,6 @@ func (config AuthorizationConfig) New() (authorizer.Authorizer, error) { if !authorizerMap[modes.ModeWebhook] && config.WebhookConfigFile != "" { return nil, errors.New("Cannot specify --authorization-webhook-config-file without mode Webhook") } - if !authorizerMap[modes.ModeRBAC] && config.RBACSuperUser != "" { - return nil, errors.New("Cannot specify --authorization-rbac-super-user without mode RBAC") - } return union.New(authorizers...), nil }