github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Clean shutdown of ttlcontroller integration tests

Browse Source
This commit is contained in:
Wojciech Tyczyński 2022-05-21 08:25:46 +02:00
parent c6e3bd732e
commit 284509f36e
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/integration/ttlcontroller/ttlcontroller_test.go
View File

@ -19,7 +19,6 @@ package ttlcontroller
import ( import (
"context" "context"
"fmt" "fmt"
"net/http/httptest"
"strconv" "strconv"
"sync" "sync"
"testing" "testing"
@ -33,17 +32,16 @@ import (
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
listers "k8s.io/client-go/listers/core/v1" listers "k8s.io/client-go/listers/core/v1"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing"
"k8s.io/kubernetes/pkg/controller/ttl" "k8s.io/kubernetes/pkg/controller/ttl"
"k8s.io/kubernetes/test/integration/framework" "k8s.io/kubernetes/test/integration/framework"
) )
func createClientAndInformers(t *testing.T, server *httptest.Server) (*clientset.Clientset, informers.SharedInformerFactory) { func createClientAndInformers(t *testing.T, server *kubeapiservertesting.TestServer) (*clientset.Clientset, informers.SharedInformerFactory) {
config := restclient.Config{ config := restclient.CopyConfig(server.ClientConfig)
Host: server.URL, config.QPS = 500
QPS: 500, config.Burst = 500
Burst: 500, testClient := clientset.NewForConfigOrDie(config)
}
testClient := clientset.NewForConfigOrDie(&config)
informers := informers.NewSharedInformerFactory(testClient, time.Second) informers := informers.NewSharedInformerFactory(testClient, time.Second)
return testClient, informers return testClient, informers
@ -134,8 +132,8 @@ func waitForNodesWithTTLAnnotation(t *testing.T, nodeLister listers.NodeLister,
// Test whether ttlcontroller sets correct ttl annotations. // Test whether ttlcontroller sets correct ttl annotations.
func TestTTLAnnotations(t *testing.T) { func TestTTLAnnotations(t *testing.T) {
_, server, closeFn := framework.RunAnAPIServer(nil) server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd())
defer closeFn() defer server.TearDownFn()
testClient, informers := createClientAndInformers(t, server) testClient, informers := createClientAndInformers(t, server)
nodeInformer := informers.Core().V1().Nodes() nodeInformer := informers.Core().V1().Nodes()