github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Clean shutdown of storageversion integration tests

Browse Source
This commit is contained in:
Wojciech Tyczyński 2022-06-02 20:21:50 +02:00
parent e5ec28ff86
commit b54363aceb
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/controlplane/instance.go
View File

@ -58,7 +58,6 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
utilnet "k8s.io/apimachinery/pkg/util/net" utilnet "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apiserver/pkg/endpoints/discovery" "k8s.io/apiserver/pkg/endpoints/discovery"
apiserverfeatures "k8s.io/apiserver/pkg/features" apiserverfeatures "k8s.io/apiserver/pkg/features"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
@ -477,7 +476,7 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
time.Duration(c.ExtraConfig.IdentityLeaseRenewIntervalSeconds)*time.Second, time.Duration(c.ExtraConfig.IdentityLeaseRenewIntervalSeconds)*time.Second,
metav1.NamespaceSystem, metav1.NamespaceSystem,
labelAPIServerHeartbeat) labelAPIServerHeartbeat)
go controller.Run(wait.NeverStop) go controller.Run(hookContext.StopCh)
return nil return nil
}) })
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 {
@ -490,7 +489,7 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
time.Duration(c.ExtraConfig.IdentityLeaseDurationSeconds)*time.Second, time.Duration(c.ExtraConfig.IdentityLeaseDurationSeconds)*time.Second,
metav1.NamespaceSystem, metav1.NamespaceSystem,
KubeAPIServerIdentityLeaseLabelSelector, KubeAPIServerIdentityLeaseLabelSelector,
).Run(wait.NeverStop) ).Run(hookContext.StopCh)
return nil return nil
}) })
} }