github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-03 18:27:49 +00:00
Code Issues Projects Releases Wiki Activity

dedup APIAudiences config in kube-apiserver, use GenericConfig field

Browse Source
This commit is contained in:
Mike Danese
2018-11-12 15:50:20 -08:00
parent bfb95290b9
commit 766aab509a
3 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kube-apiserver/app/server.go
View File

@@ -320,7 +320,6 @@ func CreateKubeAPIServerConfig(
var ( var (
issuer serviceaccount.TokenGenerator issuer serviceaccount.TokenGenerator
apiAudiences []string
maxExpiration time.Duration maxExpiration time.Duration
) )
@@ -358,7 +357,6 @@ func CreateKubeAPIServerConfig(
lastErr = fmt.Errorf("failed to build token generator: %v", err) lastErr = fmt.Errorf("failed to build token generator: %v", err)
return return
} }
apiAudiences = s.Authentication.APIAudiences
maxExpiration = s.Authentication.ServiceAccounts.MaxExpiration maxExpiration = s.Authentication.ServiceAccounts.MaxExpiration
} }
@@ -394,7 +392,6 @@ func CreateKubeAPIServerConfig(
MasterCount: s.MasterCount, MasterCount: s.MasterCount,
ServiceAccountIssuer: issuer, ServiceAccountIssuer: issuer,
APIAudiences: apiAudiences,
ServiceAccountMaxExpiration: maxExpiration, ServiceAccountMaxExpiration: maxExpiration,
VersionedInformers: versionedInformers, VersionedInformers: versionedInformers,

1
pkg/master/BUILD
View File

@@ -104,7 +104,6 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_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/runtime:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/wait: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/endpoints/discovery:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/registry/generic:go_default_library", "//staging/src/k8s.io/apiserver/pkg/registry/generic:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/server:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server:go_default_library",

5
pkg/master/master.go
View File

@@ -58,7 +58,6 @@ import (
storageapiv1beta1 "k8s.io/api/storage/v1beta1" storageapiv1beta1 "k8s.io/api/storage/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
utilnet "k8s.io/apimachinery/pkg/util/net" utilnet "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/endpoints/discovery" "k8s.io/apiserver/pkg/endpoints/discovery"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericapiserver "k8s.io/apiserver/pkg/server" genericapiserver "k8s.io/apiserver/pkg/server"
@@ -169,8 +168,6 @@ type ExtraConfig struct {
ServiceAccountIssuer serviceaccount.TokenGenerator ServiceAccountIssuer serviceaccount.TokenGenerator
ServiceAccountMaxExpiration time.Duration ServiceAccountMaxExpiration time.Duration
APIAudiences authenticator.Audiences
VersionedInformers informers.SharedInformerFactory VersionedInformers informers.SharedInformerFactory
} }
@@ -324,7 +321,7 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
LoopbackClientConfig: c.GenericConfig.LoopbackClientConfig, LoopbackClientConfig: c.GenericConfig.LoopbackClientConfig,
ServiceAccountIssuer: c.ExtraConfig.ServiceAccountIssuer, ServiceAccountIssuer: c.ExtraConfig.ServiceAccountIssuer,
ServiceAccountMaxExpiration: c.ExtraConfig.ServiceAccountMaxExpiration, ServiceAccountMaxExpiration: c.ExtraConfig.ServiceAccountMaxExpiration,
APIAudiences: c.ExtraConfig.APIAudiences, APIAudiences: c.GenericConfig.Authentication.APIAudiences,
} }
m.InstallLegacyAPI(&c, c.GenericConfig.RESTOptionsGetter, legacyRESTStorageProvider) m.InstallLegacyAPI(&c, c.GenericConfig.RESTOptionsGetter, legacyRESTStorageProvider)
} }