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

Merge pull request #121110 from sttts/sttts-clientset

Browse Source 
kube-apiserver: use only one client in apiserver controllers
This commit is contained in:
Kubernetes Prow Robot 2023-10-10 23:51:51 +02:00 committed by GitHub
commit a0984c1636
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/controlplane/instance.go
View File

@ -575,11 +575,6 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
if utilfeature.DefaultFeatureGate.Enabled(apiserverfeatures.APIServerIdentity) { if utilfeature.DefaultFeatureGate.Enabled(apiserverfeatures.APIServerIdentity) {
m.GenericAPIServer.AddPostStartHookOrDie("start-kube-apiserver-identity-lease-controller", func(hookContext genericapiserver.PostStartHookContext) error { m.GenericAPIServer.AddPostStartHookOrDie("start-kube-apiserver-identity-lease-controller", func(hookContext genericapiserver.PostStartHookContext) error {
kubeClient, err := kubernetes.NewForConfig(hookContext.LoopbackClientConfig)
if err != nil {
return err
}
// generate a context from stopCh. This is to avoid modifying files which are relying on apiserver // generate a context from stopCh. This is to avoid modifying files which are relying on apiserver
// TODO: See if we can pass ctx to the current method // TODO: See if we can pass ctx to the current method
ctx := wait.ContextForChannel(hookContext.StopCh) ctx := wait.ContextForChannel(hookContext.StopCh)
@ -591,7 +586,7 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
// must replace ':,[]' in [ip:port] to be able to store this as a valid label value // must replace ':,[]' in [ip:port] to be able to store this as a valid label value
controller := lease.NewController( controller := lease.NewController(
clock.RealClock{}, clock.RealClock{},
kubeClient, clientset,
holderIdentity, holderIdentity,
int32(IdentityLeaseDurationSeconds), int32(IdentityLeaseDurationSeconds),
nil, nil,
@ -605,12 +600,8 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
}) })
// TODO: move this into generic apiserver and make the lease identity value configurable // TODO: move this into generic apiserver and make the lease identity value configurable
m.GenericAPIServer.AddPostStartHookOrDie("start-kube-apiserver-identity-lease-garbage-collector", func(hookContext genericapiserver.PostStartHookContext) error { m.GenericAPIServer.AddPostStartHookOrDie("start-kube-apiserver-identity-lease-garbage-collector", func(hookContext genericapiserver.PostStartHookContext) error {
kubeClient, err := kubernetes.NewForConfig(hookContext.LoopbackClientConfig)
if err != nil {
return err
}
go apiserverleasegc.NewAPIServerLeaseGC( go apiserverleasegc.NewAPIServerLeaseGC(
kubeClient, clientset,
IdentityLeaseGCPeriod, IdentityLeaseGCPeriod,
metav1.NamespaceSystem, metav1.NamespaceSystem,
KubeAPIServerIdentityLeaseLabelSelector, KubeAPIServerIdentityLeaseLabelSelector,
@ -620,11 +611,7 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
} }
m.GenericAPIServer.AddPostStartHookOrDie("start-legacy-token-tracking-controller", func(hookContext genericapiserver.PostStartHookContext) error { m.GenericAPIServer.AddPostStartHookOrDie("start-legacy-token-tracking-controller", func(hookContext genericapiserver.PostStartHookContext) error {
kubeClient, err := kubernetes.NewForConfig(hookContext.LoopbackClientConfig) go legacytokentracking.NewController(clientset).Run(hookContext.StopCh)
if err != nil {
return err
}
go legacytokentracking.NewController(kubeClient).Run(hookContext.StopCh)
return nil return nil
}) })