From b54363aceb03f33ac1d2b562e07c0ed714776c90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20Tyczy=C5=84ski?= Date: Thu, 2 Jun 2022 20:21:50 +0200 Subject: [PATCH] Clean shutdown of storageversion integration tests --- pkg/controlplane/instance.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/controlplane/instance.go b/pkg/controlplane/instance.go index 20a16c9a53e..f3935b63e53 100644 --- a/pkg/controlplane/instance.go +++ b/pkg/controlplane/instance.go @@ -58,7 +58,6 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/endpoints/discovery" apiserverfeatures "k8s.io/apiserver/pkg/features" "k8s.io/apiserver/pkg/registry/generic" @@ -477,7 +476,7 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget) time.Duration(c.ExtraConfig.IdentityLeaseRenewIntervalSeconds)*time.Second, metav1.NamespaceSystem, labelAPIServerHeartbeat) - go controller.Run(wait.NeverStop) + go controller.Run(hookContext.StopCh) return nil }) 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, metav1.NamespaceSystem, KubeAPIServerIdentityLeaseLabelSelector, - ).Run(wait.NeverStop) + ).Run(hookContext.StopCh) return nil }) }