Merge pull request #113916 from songxiao-wang87/runwxs-test1

Migrate ttl_controller to contextual logging
This commit is contained in:
Kubernetes Prow Robot
2023-03-07 04:18:30 -08:00
committed by GitHub
4 changed files with 34 additions and 22 deletions

View File

@@ -32,6 +32,7 @@ import (
clientset "k8s.io/client-go/kubernetes"
listers "k8s.io/client-go/listers/core/v1"
restclient "k8s.io/client-go/rest"
"k8s.io/klog/v2/ktesting"
kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing"
"k8s.io/kubernetes/pkg/controller/ttl"
"k8s.io/kubernetes/test/integration/framework"
@@ -137,9 +138,10 @@ func TestTTLAnnotations(t *testing.T) {
testClient, informers := createClientAndInformers(t, server)
nodeInformer := informers.Core().V1().Nodes()
ttlc := ttl.NewTTLController(nodeInformer, testClient)
_, ctx := ktesting.NewTestContext(t)
ttlc := ttl.NewTTLController(ctx, nodeInformer, testClient)
ctx, cancel := context.WithCancel(context.Background())
ctx, cancel := context.WithCancel(ctx)
defer cancel()
go nodeInformer.Informer().Run(ctx.Done())
go ttlc.Run(ctx, 1)