From c0149f78d7b3a2b1eedd3db46fa41e1ec0be75f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20Tyczy=C5=84ski?= Date: Sat, 21 May 2022 17:53:51 +0200 Subject: [PATCH] Clean shutdown of certificates integration tests --- test/integration/certificates/field_selector_test.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/integration/certificates/field_selector_test.go b/test/integration/certificates/field_selector_test.go index 70194b75def..87f04e162f9 100644 --- a/test/integration/certificates/field_selector_test.go +++ b/test/integration/certificates/field_selector_test.go @@ -27,20 +27,19 @@ import ( certv1 "k8s.io/api/certificates/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime/schema" clientset "k8s.io/client-go/kubernetes" certclientset "k8s.io/client-go/kubernetes/typed/certificates/v1" - restclient "k8s.io/client-go/rest" + kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/test/integration/framework" ) // Verifies that the 'spec.signerName' field can be correctly used as a field selector on LIST requests func TestCSRSignerNameFieldSelector(t *testing.T) { - _, s, closeFn := framework.RunAnAPIServer(nil) - defer closeFn() + server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + defer server.TearDownFn() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}}) + client := clientset.NewForConfigOrDie(server.ClientConfig) csrClient := client.CertificatesV1().CertificateSigningRequests() csr1 := createTestingCSR(t, csrClient, "csr-1", "example.com/signer-name-1", "") csr2 := createTestingCSR(t, csrClient, "csr-2", "example.com/signer-name-2", "")