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

Clean shutdown of endpoints integration tests

Browse Source
This commit is contained in:
Wojciech Tyczyński 2022-05-21 10:40:20 +02:00
parent 7ac6638f92
commit 7add7ba9e5
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/integration/endpoints/endpoints_test.go
View File

@ -30,18 +30,17 @@ import (
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/informers" "k8s.io/client-go/informers"
clientset "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/endpoint"
"k8s.io/kubernetes/test/integration/framework" "k8s.io/kubernetes/test/integration/framework"
) )
func TestEndpointUpdates(t *testing.T) { func TestEndpointUpdates(t *testing.T) {
controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfig() // Disable ServiceAccount admission plugin as we don't have serviceaccount controller running.
_, server, closeFn := framework.RunAnAPIServer(controlPlaneConfig) server := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins=ServiceAccount"}, framework.SharedEtcd())
defer closeFn() defer server.TearDownFn()
config := restclient.Config{Host: server.URL} client, err := clientset.NewForConfig(server.ClientConfig)
client, err := clientset.NewForConfig(&config)
if err != nil { if err != nil {
t.Fatalf("Error creating clientset: %v", err) t.Fatalf("Error creating clientset: %v", err)
} }
@ -62,8 +61,8 @@ func TestEndpointUpdates(t *testing.T) {
go epController.Run(ctx, 1) go epController.Run(ctx, 1)
// Create namespace // Create namespace
ns := framework.CreateTestingNamespace("test-endpoints-updates", t) ns := framework.CreateNamespaceOrDie(client, "test-endpoints-updates", t)
defer framework.DeleteTestingNamespace(ns, t) defer framework.DeleteNamespaceOrDie(client, ns, t)
// Create a pod with labels // Create a pod with labels
pod := &v1.Pod{ 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 // terminating endpoints in Endpoints, but in the mean time this test ensures we do not change
// this behavior accidentally. // this behavior accidentally.
func TestEndpointWithTerminatingPod(t *testing.T) { func TestEndpointWithTerminatingPod(t *testing.T) {
controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfig() // Disable ServiceAccount admission plugin as we don't have serviceaccount controller running.
_, server, closeFn := framework.RunAnAPIServer(controlPlaneConfig) server := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins=ServiceAccount"}, framework.SharedEtcd())
defer closeFn() defer server.TearDownFn()
config := restclient.Config{Host: server.URL} client, err := clientset.NewForConfig(server.ClientConfig)
client, err := clientset.NewForConfig(&config)
if err != nil { if err != nil {
t.Fatalf("Error creating clientset: %v", err) t.Fatalf("Error creating clientset: %v", err)
} }
@ -191,8 +189,8 @@ func TestEndpointWithTerminatingPod(t *testing.T) {
go epController.Run(ctx, 1) go epController.Run(ctx, 1)
// Create namespace // Create namespace
ns := framework.CreateTestingNamespace("test-endpoints-terminating", t) ns := framework.CreateNamespaceOrDie(client, "test-endpoints-terminating", t)
defer framework.DeleteTestingNamespace(ns, t) defer framework.DeleteNamespaceOrDie(client, ns, t)
// Create a pod with labels // Create a pod with labels
pod := &v1.Pod{ pod := &v1.Pod{