From 7add7ba9e5fdc5da8bbba201f17e7d4a1727cbf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20Tyczy=C5=84ski?= Date: Sat, 21 May 2022 10:40:20 +0200 Subject: [PATCH] Clean shutdown of endpoints integration tests --- test/integration/endpoints/endpoints_test.go | 28 +++++++++----------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/test/integration/endpoints/endpoints_test.go b/test/integration/endpoints/endpoints_test.go index d5e3c850053..368456d51f1 100644 --- a/test/integration/endpoints/endpoints_test.go +++ b/test/integration/endpoints/endpoints_test.go @@ -30,18 +30,17 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/informers" clientset "k8s.io/client-go/kubernetes" - restclient "k8s.io/client-go/rest" + kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/controller/endpoint" "k8s.io/kubernetes/test/integration/framework" ) func TestEndpointUpdates(t *testing.T) { - controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfig() - _, server, closeFn := framework.RunAnAPIServer(controlPlaneConfig) - defer closeFn() + // Disable ServiceAccount admission plugin as we don't have serviceaccount controller running. + server := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins=ServiceAccount"}, framework.SharedEtcd()) + defer server.TearDownFn() - config := restclient.Config{Host: server.URL} - client, err := clientset.NewForConfig(&config) + client, err := clientset.NewForConfig(server.ClientConfig) if err != nil { t.Fatalf("Error creating clientset: %v", err) } @@ -62,8 +61,8 @@ func TestEndpointUpdates(t *testing.T) { go epController.Run(ctx, 1) // Create namespace - ns := framework.CreateTestingNamespace("test-endpoints-updates", t) - defer framework.DeleteTestingNamespace(ns, t) + ns := framework.CreateNamespaceOrDie(client, "test-endpoints-updates", t) + defer framework.DeleteNamespaceOrDie(client, ns, t) // Create a pod with labels pod := &v1.Pod{ @@ -165,12 +164,11 @@ func TestEndpointUpdates(t *testing.T) { // terminating endpoints in Endpoints, but in the mean time this test ensures we do not change // this behavior accidentally. func TestEndpointWithTerminatingPod(t *testing.T) { - controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfig() - _, server, closeFn := framework.RunAnAPIServer(controlPlaneConfig) - defer closeFn() + // Disable ServiceAccount admission plugin as we don't have serviceaccount controller running. + server := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins=ServiceAccount"}, framework.SharedEtcd()) + defer server.TearDownFn() - config := restclient.Config{Host: server.URL} - client, err := clientset.NewForConfig(&config) + client, err := clientset.NewForConfig(server.ClientConfig) if err != nil { t.Fatalf("Error creating clientset: %v", err) } @@ -191,8 +189,8 @@ func TestEndpointWithTerminatingPod(t *testing.T) { go epController.Run(ctx, 1) // Create namespace - ns := framework.CreateTestingNamespace("test-endpoints-terminating", t) - defer framework.DeleteTestingNamespace(ns, t) + ns := framework.CreateNamespaceOrDie(client, "test-endpoints-terminating", t) + defer framework.DeleteNamespaceOrDie(client, ns, t) // Create a pod with labels pod := &v1.Pod{