From 492bad026cb5c7126716438ee2fd4eed363f1e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20Tyczy=C5=84ski?= Date: Sat, 21 May 2022 10:46:25 +0200 Subject: [PATCH] Clean shutdown of endpointslice integration tests --- .../endpointslicemirroring_test.go | 41 +++++++++---------- .../endpointsliceterminating_test.go | 15 ++++--- 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/test/integration/endpointslice/endpointslicemirroring_test.go b/test/integration/endpointslice/endpointslicemirroring_test.go index 6e622d971e1..2b0e0fdb50e 100644 --- a/test/integration/endpointslice/endpointslicemirroring_test.go +++ b/test/integration/endpointslice/endpointslicemirroring_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" 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/pkg/controller/endpointslice" "k8s.io/kubernetes/pkg/controller/endpointslicemirroring" @@ -40,12 +40,11 @@ import ( ) func TestEndpointSliceMirroring(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) } @@ -174,8 +173,8 @@ func TestEndpointSliceMirroring(t *testing.T) { for i, tc := range testCases { t.Run(tc.testName, func(t *testing.T) { - ns := framework.CreateTestingNamespace(fmt.Sprintf("test-endpointslice-mirroring-%d", i), t) - defer framework.DeleteTestingNamespace(ns, t) + ns := framework.CreateNamespaceOrDie(client, fmt.Sprintf("test-endpointslice-mirroring-%d", i), t) + defer framework.DeleteNamespaceOrDie(client, ns, t) resourceName := "" if tc.service != nil { @@ -234,12 +233,11 @@ func TestEndpointSliceMirroring(t *testing.T) { } func TestEndpointSliceMirroringUpdates(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) } @@ -294,8 +292,8 @@ func TestEndpointSliceMirroringUpdates(t *testing.T) { for i, tc := range testCases { t.Run(tc.testName, func(t *testing.T) { - ns := framework.CreateTestingNamespace(fmt.Sprintf("test-endpointslice-mirroring-%d", i), t) - defer framework.DeleteTestingNamespace(ns, t) + ns := framework.CreateNamespaceOrDie(client, fmt.Sprintf("test-endpointslice-mirroring-%d", i), t) + defer framework.DeleteNamespaceOrDie(client, ns, t) service := &corev1.Service{ ObjectMeta: metav1.ObjectMeta{ @@ -410,12 +408,11 @@ func TestEndpointSliceMirroringUpdates(t *testing.T) { } func TestEndpointSliceMirroringSelectorTransition(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) } @@ -476,8 +473,8 @@ func TestEndpointSliceMirroringSelectorTransition(t *testing.T) { for i, tc := range testCases { t.Run(tc.testName, func(t *testing.T) { - ns := framework.CreateTestingNamespace(fmt.Sprintf("test-endpointslice-mirroring-%d", i), t) - defer framework.DeleteTestingNamespace(ns, t) + ns := framework.CreateNamespaceOrDie(client, fmt.Sprintf("test-endpointslice-mirroring-%d", i), t) + defer framework.DeleteNamespaceOrDie(client, ns, t) meta := metav1.ObjectMeta{Name: "test-123", Namespace: ns.Name} service := &corev1.Service{ diff --git a/test/integration/endpointslice/endpointsliceterminating_test.go b/test/integration/endpointslice/endpointsliceterminating_test.go index 49bec70f586..0eb897f1520 100644 --- a/test/integration/endpointslice/endpointsliceterminating_test.go +++ b/test/integration/endpointslice/endpointsliceterminating_test.go @@ -30,8 +30,8 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/informers" clientset "k8s.io/client-go/kubernetes" - restclient "k8s.io/client-go/rest" featuregatetesting "k8s.io/component-base/featuregate/testing" + kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/controller/endpointslice" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/test/integration/framework" @@ -152,12 +152,11 @@ func TestEndpointSliceTerminating(t *testing.T) { t.Run(testcase.name, func(t *testing.T) { defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.EndpointSliceTerminatingCondition, testcase.terminatingGate)() - 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) } @@ -181,8 +180,8 @@ func TestEndpointSliceTerminating(t *testing.T) { go epsController.Run(1, stopCh) // 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) node := &corev1.Node{ ObjectMeta: metav1.ObjectMeta{