use default flags for apiserver on integration tests

Author: aojea

test/integration/apimachinery/watch_timeout_test.go

@@ -98,7 +98,7 @@ func websocketConfig(url *url.URL, config *restclient.Config, protocols []string
 
 func TestWebsocketWatchClientTimeout(t *testing.T) {
 	// server setup
-	server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd())
+	server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd())
 	defer server.TearDownFn()
 
 	// object setup
@@ -199,7 +199,7 @@ func TestWebsocketWatchClientTimeout(t *testing.T) {
 
 func TestWatchClientTimeoutXXX(t *testing.T) {
 	// server setup
-	server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd())
+	server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd())
 	defer server.TearDownFn()
 
 	t.Run("direct", func(t *testing.T) {

test/integration/apiserver/admissionwebhook/broken_webhook_test.go

@@ -45,7 +45,7 @@ func TestBrokenWebhook(t *testing.T) {
 	}()
 
 	etcdConfig := framework.SharedEtcd()
-	server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, etcdConfig)
+	server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), etcdConfig)
 	tearDownFn = server.TearDownFn
 
 	client, err := kubernetes.NewForConfig(server.ClientConfig)
@@ -80,7 +80,7 @@ func TestBrokenWebhook(t *testing.T) {
 	t.Logf("Restarting apiserver")
 	tearDownFn = nil
 	server.TearDownFn()
-	server = kubeapiservertesting.StartTestServerOrDie(t, nil, nil, etcdConfig)
+	server = kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), etcdConfig)
 	tearDownFn = server.TearDownFn
 
 	client, err = kubernetes.NewForConfig(server.ClientConfig)

test/integration/apiserver/apiserver_test.go

@@ -219,7 +219,7 @@ func Test4xxStatusCodeInvalidPatch(t *testing.T) {
 }
 
 func TestCacheControl(t *testing.T) {
-	server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd())
+	server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd())
 	defer server.TearDownFn()
 
 	rt, err := restclient.TransportFor(server.ClientConfig)
@@ -2749,7 +2749,7 @@ func expectPartialObjectMetaV1EventsProtobuf(t *testing.T, r io.Reader, values .
 func TestClientsetShareTransport(t *testing.T) {
 	var counter int
 	var mu sync.Mutex
-	server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd())
+	server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd())
 	defer server.TearDownFn()
 
 	dialFn := func(ctx context.Context, network, address string) (net.Conn, error) {
@@ -2806,7 +2806,7 @@ func TestClientsetShareTransport(t *testing.T) {
 }
 
 func TestDedupOwnerReferences(t *testing.T) {
-	server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd())
+	server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd())
 	defer server.TearDownFn()
 	etcd.CreateTestCRDs(t, apiextensionsclient.NewForConfigOrDie(server.ClientConfig), false, etcd.GetCustomResourceDefinitionData()[0])
 

test/integration/apiserver/apply/apply_test.go

@@ -49,7 +49,7 @@ import (
 
 func setup(t testing.TB) (clientset.Interface, kubeapiservertesting.TearDownFunc) {
 	// Disable ServiceAccount admission plugin as we don't have serviceaccount controller running.
-	server := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins=ServiceAccount"}, framework.SharedEtcd())
+	server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd())
 
 	config := restclient.CopyConfig(server.ClientConfig)
 	// There are some tests (in scale_test.go) that rely on the response to be returned in JSON.

test/integration/apiserver/cve_2021_29923_test.go

@@ -39,7 +39,7 @@ func gvr(g, v, r string) schema.GroupVersionResource {
 // xref: https://issues.k8s.io/100895
 func TestCanaryCVE_2021_29923(t *testing.T) {
 	// Disable ServiceAccount admission plugin as we don't have serviceaccount controller running.
-	server := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins=ServiceAccount"}, framework.SharedEtcd())
+	server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd())
 	defer server.TearDownFn()
 
 	client, err := clientset.NewForConfig(server.ClientConfig)

test/integration/apiserver/discovery/discovery_test.go

@@ -160,7 +160,7 @@ func init() {
 func setup(t *testing.T) (context.Context, testClientSet, context.CancelFunc) {
 	ctx, cancelCtx := context.WithCancel(context.Background())
 
-	server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd())
+	server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd())
 	t.Cleanup(server.TearDownFn)
 
 	kubeClientSet, err := kubernetes.NewForConfig(server.ClientConfig)

test/integration/apiserver/openapi/openapi_apiservice_test.go

@@ -44,7 +44,7 @@ func TestSlowAPIServiceOpenAPIDoesNotBlockHealthCheck(t *testing.T) {
 	defer cancelCtx()
 
 	etcd := framework.SharedEtcd()
-	setupServer := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, etcd)
+	setupServer := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), etcd)
 	client := generateTestClient(t, setupServer)
 
 	service := testdiscovery.NewFakeService("test-server", client, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -81,7 +81,7 @@ func TestSlowAPIServiceOpenAPIDoesNotBlockHealthCheck(t *testing.T) {
 	require.NoError(t, registerAPIService(ctx, client, groupVersion, service))
 
 	setupServer.TearDownFn()
-	server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, etcd)
+	server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), etcd)
 	t.Cleanup(server.TearDownFn)
 	client2 := generateTestClient(t, server)
 
@@ -100,7 +100,7 @@ func TestFetchingOpenAPIBeforeReady(t *testing.T) {
 	ctx, cancelCtx := context.WithCancel(context.Background())
 	defer cancelCtx()
 
-	server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd())
+	server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd())
 	t.Cleanup(server.TearDownFn)
 	client := generateTestClient(t, server)
 

test/integration/apiserver/portforward/portforward_test.go

@@ -79,7 +79,7 @@ func TestPortforward(t *testing.T) {
 	backendPort, _ := strconv.Atoi(backendURL.Port())
 
 	etcd := framework.SharedEtcd()
-	server := kastesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins=ServiceAccount"}, etcd)
+	server := kastesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), etcd)
 	defer server.TearDownFn()
 
 	adminClient, err := kubernetes.NewForConfig(server.ClientConfig)

test/integration/certificates/duration_test.go

@@ -53,7 +53,7 @@ import (
 func TestCSRDuration(t *testing.T) {
 	t.Parallel()
 
-	s := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd())
+	s := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd())
 	t.Cleanup(s.TearDownFn)
 
 	_, ctx := ktesting.NewTestContext(t)

test/integration/certificates/field_selector_test.go

@@ -36,7 +36,7 @@ import (
 
 // Verifies that the 'spec.signerName' field can be correctly used as a field selector on LIST requests
 func TestCSRSignerNameFieldSelector(t *testing.T) {
-	server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd())
+	server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd())
 	defer server.TearDownFn()
 
 	client := clientset.NewForConfigOrDie(server.ClientConfig)