diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index a5aa5bf9cbb..f38af7331c3 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -320,7 +320,6 @@ func CreateKubeAPIServerConfig( var ( issuer serviceaccount.TokenGenerator - apiAudiences []string maxExpiration time.Duration ) @@ -358,7 +357,6 @@ func CreateKubeAPIServerConfig( lastErr = fmt.Errorf("failed to build token generator: %v", err) return } - apiAudiences = s.Authentication.APIAudiences maxExpiration = s.Authentication.ServiceAccounts.MaxExpiration } @@ -394,7 +392,6 @@ func CreateKubeAPIServerConfig( MasterCount: s.MasterCount, ServiceAccountIssuer: issuer, - APIAudiences: apiAudiences, ServiceAccountMaxExpiration: maxExpiration, VersionedInformers: versionedInformers, diff --git a/pkg/master/BUILD b/pkg/master/BUILD index 5c35db72d12..6c0ef9e50cf 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -104,7 +104,6 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/authentication/authenticator:go_default_library", "//staging/src/k8s.io/apiserver/pkg/endpoints/discovery:go_default_library", "//staging/src/k8s.io/apiserver/pkg/registry/generic:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server:go_default_library", diff --git a/pkg/master/master.go b/pkg/master/master.go index 3f8447c32ef..7dbc0b378d6 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -58,7 +58,6 @@ import ( storageapiv1beta1 "k8s.io/api/storage/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilnet "k8s.io/apimachinery/pkg/util/net" - "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/endpoints/discovery" "k8s.io/apiserver/pkg/registry/generic" genericapiserver "k8s.io/apiserver/pkg/server" @@ -169,8 +168,6 @@ type ExtraConfig struct { ServiceAccountIssuer serviceaccount.TokenGenerator ServiceAccountMaxExpiration time.Duration - APIAudiences authenticator.Audiences - VersionedInformers informers.SharedInformerFactory } @@ -324,7 +321,7 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget) LoopbackClientConfig: c.GenericConfig.LoopbackClientConfig, ServiceAccountIssuer: c.ExtraConfig.ServiceAccountIssuer, ServiceAccountMaxExpiration: c.ExtraConfig.ServiceAccountMaxExpiration, - APIAudiences: c.ExtraConfig.APIAudiences, + APIAudiences: c.GenericConfig.Authentication.APIAudiences, } m.InstallLegacyAPI(&c, c.GenericConfig.RESTOptionsGetter, legacyRESTStorageProvider) }