diff --git a/test/integration/apimachinery/watch_timeout_test.go b/test/integration/apimachinery/watch_timeout_test.go index 529aaaa278d..6ec073fbd2b 100644 --- a/test/integration/apimachinery/watch_timeout_test.go +++ b/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) { diff --git a/test/integration/apiserver/admissionwebhook/broken_webhook_test.go b/test/integration/apiserver/admissionwebhook/broken_webhook_test.go index 9c9de69420c..3600da906f4 100644 --- a/test/integration/apiserver/admissionwebhook/broken_webhook_test.go +++ b/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) diff --git a/test/integration/apiserver/apiserver_test.go b/test/integration/apiserver/apiserver_test.go index 7341c71f430..63bb662561a 100644 --- a/test/integration/apiserver/apiserver_test.go +++ b/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]) diff --git a/test/integration/apiserver/apply/apply_test.go b/test/integration/apiserver/apply/apply_test.go index 735498b2fcf..62aafbf7afe 100644 --- a/test/integration/apiserver/apply/apply_test.go +++ b/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. diff --git a/test/integration/apiserver/cve_2021_29923_test.go b/test/integration/apiserver/cve_2021_29923_test.go index 03ae3cd1ed6..7ff551b0c7f 100644 --- a/test/integration/apiserver/cve_2021_29923_test.go +++ b/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) diff --git a/test/integration/apiserver/discovery/discovery_test.go b/test/integration/apiserver/discovery/discovery_test.go index f5dce339540..2a29d74ee28 100644 --- a/test/integration/apiserver/discovery/discovery_test.go +++ b/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) diff --git a/test/integration/apiserver/openapi/openapi_apiservice_test.go b/test/integration/apiserver/openapi/openapi_apiservice_test.go index a12374571bb..1ae233db16f 100644 --- a/test/integration/apiserver/openapi/openapi_apiservice_test.go +++ b/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) diff --git a/test/integration/apiserver/portforward/portforward_test.go b/test/integration/apiserver/portforward/portforward_test.go index 6193cef830d..240c9946942 100644 --- a/test/integration/apiserver/portforward/portforward_test.go +++ b/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) diff --git a/test/integration/certificates/duration_test.go b/test/integration/certificates/duration_test.go index 51285da2218..531a54315bd 100644 --- a/test/integration/certificates/duration_test.go +++ b/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) diff --git a/test/integration/certificates/field_selector_test.go b/test/integration/certificates/field_selector_test.go index 87f04e162f9..50c9314f7e3 100644 --- a/test/integration/certificates/field_selector_test.go +++ b/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) diff --git a/test/integration/client/client_test.go b/test/integration/client/client_test.go index 80d981c6c45..4802ca1e750 100644 --- a/test/integration/client/client_test.go +++ b/test/integration/client/client_test.go @@ -56,7 +56,7 @@ import ( ) func TestClient(t *testing.T) { - result := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins", "ServiceAccount"}, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() client := clientset.NewForConfigOrDie(result.ClientConfig) @@ -125,7 +125,7 @@ func TestClient(t *testing.T) { } func TestAtomicPut(t *testing.T) { - result := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins", "ServiceAccount"}, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() c := clientset.NewForConfigOrDie(result.ClientConfig) @@ -214,7 +214,7 @@ func TestAtomicPut(t *testing.T) { } func TestPatch(t *testing.T) { - result := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins", "ServiceAccount"}, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() c := clientset.NewForConfigOrDie(result.ClientConfig) @@ -333,7 +333,7 @@ func TestPatch(t *testing.T) { } func TestPatchWithCreateOnUpdate(t *testing.T) { - result := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() c := clientset.NewForConfigOrDie(result.ClientConfig) @@ -441,7 +441,7 @@ func TestPatchWithCreateOnUpdate(t *testing.T) { } func TestAPIVersions(t *testing.T) { - result := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() c := clientset.NewForConfigOrDie(result.ClientConfig) @@ -463,7 +463,7 @@ func TestAPIVersions(t *testing.T) { } func TestEventValidation(t *testing.T) { - result := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() client := clientset.NewForConfigOrDie(result.ClientConfig) @@ -571,7 +571,7 @@ func TestEventValidation(t *testing.T) { } func TestEventCompatibility(t *testing.T) { - result := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() client := clientset.NewForConfigOrDie(result.ClientConfig) @@ -681,7 +681,7 @@ func TestEventCompatibility(t *testing.T) { } func TestSingleWatch(t *testing.T) { - result := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() client := clientset.NewForConfigOrDie(result.ClientConfig) @@ -765,7 +765,7 @@ func TestMultiWatch(t *testing.T) { const watcherCount = 50 rt.GOMAXPROCS(watcherCount) - result := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() client := clientset.NewForConfigOrDie(result.ClientConfig) @@ -994,7 +994,7 @@ func TestApplyWithApplyConfiguration(t *testing.T) { ), ), ) - testServer := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins", "ServiceAccount"}, framework.SharedEtcd()) + testServer := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer testServer.TearDownFn() c := clientset.NewForConfigOrDie(testServer.ClientConfig) @@ -1153,7 +1153,7 @@ func TestExtractModifyApply(t *testing.T) { }, } - testServer := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins", "ServiceAccount"}, framework.SharedEtcd()) + testServer := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer testServer.TearDownFn() c := clientset.NewForConfigOrDie(testServer.ClientConfig) deploymentClient := c.AppsV1().Deployments("default") @@ -1225,7 +1225,7 @@ func TestExtractModifyApply(t *testing.T) { } func TestExtractModifyApply_ForceOwnership(t *testing.T) { - testServer := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins", "ServiceAccount"}, framework.SharedEtcd()) + testServer := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer testServer.TearDownFn() c := clientset.NewForConfigOrDie(testServer.ClientConfig) deploymentClient := c.AppsV1().Deployments("default") diff --git a/test/integration/client/dynamic_client_test.go b/test/integration/client/dynamic_client_test.go index 66e9e29789a..0db8c55e611 100644 --- a/test/integration/client/dynamic_client_test.go +++ b/test/integration/client/dynamic_client_test.go @@ -43,7 +43,7 @@ import ( ) func TestDynamicClient(t *testing.T) { - result := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins", "ServiceAccount"}, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() client := clientset.NewForConfigOrDie(result.ClientConfig) @@ -125,7 +125,7 @@ func TestDynamicClient(t *testing.T) { } func TestDynamicClientWatch(t *testing.T) { - result := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() client := clientset.NewForConfigOrDie(result.ClientConfig) @@ -208,7 +208,7 @@ func TestDynamicClientWatch(t *testing.T) { } func TestUnstructuredExtract(t *testing.T) { - result := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins", "ServiceAccount"}, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() dynamicClient, err := dynamic.NewForConfig(result.ClientConfig) diff --git a/test/integration/client/metrics/metrics_test.go b/test/integration/client/metrics/metrics_test.go index 066933eb0ed..5f0779823b4 100644 --- a/test/integration/client/metrics/metrics_test.go +++ b/test/integration/client/metrics/metrics_test.go @@ -50,7 +50,7 @@ func TestAPIServerTransportMetrics(t *testing.T) { // reset default registry metrics legacyregistry.Reset() - result := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins", "ServiceAccount"}, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() client := clientset.NewForConfigOrDie(result.ClientConfig) diff --git a/test/integration/cloudprovider/ccm_test.go b/test/integration/cloudprovider/ccm_test.go index f8076292e2c..fc373094b50 100644 --- a/test/integration/cloudprovider/ccm_test.go +++ b/test/integration/cloudprovider/ccm_test.go @@ -44,8 +44,7 @@ func Test_RemoveExternalCloudProviderTaint(t *testing.T) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() - // 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 := clientset.NewForConfigOrDie(server.ClientConfig) diff --git a/test/integration/configmap/configmap_test.go b/test/integration/configmap/configmap_test.go index 68c6d6cd4de..16d8565a9a6 100644 --- a/test/integration/configmap/configmap_test.go +++ b/test/integration/configmap/configmap_test.go @@ -33,7 +33,7 @@ import ( // TestConfigMap tests apiserver-side behavior of creation of ConfigMaps and pods that consume them. func TestConfigMap(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 := clientset.NewForConfigOrDie(server.ClientConfig) diff --git a/test/integration/controlplane/apiserver_identity_test.go b/test/integration/controlplane/apiserver_identity_test.go index caa1611fe0b..8043250f7f6 100644 --- a/test/integration/controlplane/apiserver_identity_test.go +++ b/test/integration/controlplane/apiserver_identity_test.go @@ -67,7 +67,7 @@ func expectedAPIServerIdentity(t *testing.T, hostname string) string { func TestCreateLeaseOnStart(t *testing.T) { featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.APIServerIdentity, true) - result := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() kubeclient, err := kubernetes.NewForConfig(result.ClientConfig) @@ -130,7 +130,7 @@ func TestLeaseGarbageCollection(t *testing.T) { controlplaneapiserver.IdentityLeaseRenewIntervalPeriod = time.Second featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.APIServerIdentity, true) - result := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() kubeclient, err := kubernetes.NewForConfig(result.ClientConfig) diff --git a/test/integration/controlplane/crd_test.go b/test/integration/controlplane/crd_test.go index c58df96ba48..1891ed0b354 100644 --- a/test/integration/controlplane/crd_test.go +++ b/test/integration/controlplane/crd_test.go @@ -44,7 +44,7 @@ import ( ) func TestCRDShadowGroup(t *testing.T) { - result := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() testNamespace := "test-crd-shadow-group" @@ -114,7 +114,7 @@ func TestCRDShadowGroup(t *testing.T) { } func TestCRD(t *testing.T) { - result := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() testNamespace := "test-crd" @@ -168,7 +168,7 @@ func TestCRD(t *testing.T) { } func TestCRDOpenAPI(t *testing.T) { - result := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() kubeclient, err := kubernetes.NewForConfig(result.ClientConfig) if err != nil { diff --git a/test/integration/controlplane/graceful_shutdown_test.go b/test/integration/controlplane/graceful_shutdown_test.go index 36ae8fa0a84..cf643ea22b8 100644 --- a/test/integration/controlplane/graceful_shutdown_test.go +++ b/test/integration/controlplane/graceful_shutdown_test.go @@ -30,7 +30,7 @@ import ( ) func TestGracefulShutdown(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) tearDownOnce := sync.Once{} defer tearDownOnce.Do(server.TearDownFn) diff --git a/test/integration/controlplane/kube_apiserver_test.go b/test/integration/controlplane/kube_apiserver_test.go index 0658516aa70..9cebd998a50 100644 --- a/test/integration/controlplane/kube_apiserver_test.go +++ b/test/integration/controlplane/kube_apiserver_test.go @@ -54,7 +54,7 @@ const ( ) func TestRun(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() client, err := kubernetes.NewForConfig(server.ClientConfig) @@ -133,7 +133,7 @@ func TestLivezAndReadyz(t *testing.T) { // apiextensions-server and the kube-aggregator server, both part of // the delegation chain in kube-apiserver. func TestOpenAPIDelegationChainPlumbing(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() kubeclient, err := kubernetes.NewForConfig(server.ClientConfig) @@ -191,7 +191,7 @@ func TestOpenAPIDelegationChainPlumbing(t *testing.T) { } func TestOpenAPIApiextensionsOverlapProtection(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() apiextensionsclient, err := apiextensionsclientset.NewForConfig(server.ClientConfig) if err != nil { diff --git a/test/integration/controlplane/synthetic_controlplane_test.go b/test/integration/controlplane/synthetic_controlplane_test.go index adc3da4cfa8..c5f661df736 100644 --- a/test/integration/controlplane/synthetic_controlplane_test.go +++ b/test/integration/controlplane/synthetic_controlplane_test.go @@ -56,7 +56,7 @@ const ( ) func testPrefix(t *testing.T, prefix string) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() transport, err := restclient.TransportFor(server.ClientConfig) @@ -109,7 +109,7 @@ func TestKubernetesService(t *testing.T) { } func TestEmptyList(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() transport, err := restclient.TransportFor(server.ClientConfig) @@ -380,7 +380,7 @@ func TestObjectSizeResponses(t *testing.T) { } func TestWatchSucceedsWithoutArgs(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() transport, err := restclient.TransportFor(server.ClientConfig) @@ -471,7 +471,7 @@ func appsPath(resource, namespace, name string) string { } func TestAutoscalingGroupBackwardCompatibility(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() transport, err := restclient.TransportFor(server.ClientConfig) @@ -520,7 +520,7 @@ func TestAutoscalingGroupBackwardCompatibility(t *testing.T) { } func TestAppsGroupBackwardCompatibility(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() transport, err := restclient.TransportFor(server.ClientConfig) @@ -572,7 +572,7 @@ func TestAppsGroupBackwardCompatibility(t *testing.T) { } func TestAccept(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() transport, err := restclient.TransportFor(server.ClientConfig) diff --git a/test/integration/cronjob/cronjob_test.go b/test/integration/cronjob/cronjob_test.go index 89335d38be7..de4d4eff8c2 100644 --- a/test/integration/cronjob/cronjob_test.go +++ b/test/integration/cronjob/cronjob_test.go @@ -39,7 +39,7 @@ import ( func setup(ctx context.Context, t *testing.T) (kubeapiservertesting.TearDownFunc, *cronjob.ControllerV2, *job.Controller, informers.SharedInformerFactory, clientset.Interface) { // 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) clientSet, err := clientset.NewForConfig(config) diff --git a/test/integration/deployment/util.go b/test/integration/deployment/util.go index 0917de55690..92a6f05b0f8 100644 --- a/test/integration/deployment/util.go +++ b/test/integration/deployment/util.go @@ -103,7 +103,7 @@ func newDeployment(name, ns string, replicas int32) *apps.Deployment { // dcSetup sets up necessities for Deployment integration test, including control plane, apiserver, informers, and clientset func dcSetup(ctx context.Context, t *testing.T) (kubeapiservertesting.TearDownFunc, *replicaset.ReplicaSetController, *deployment.DeploymentController, informers.SharedInformerFactory, clientset.Interface) { // 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) clientSet, err := clientset.NewForConfig(config) @@ -137,7 +137,7 @@ func dcSetup(ctx context.Context, t *testing.T) (kubeapiservertesting.TearDownFu // and clientset, but not controllers and informers func dcSimpleSetup(t *testing.T) (kubeapiservertesting.TearDownFunc, clientset.Interface) { // 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) clientSet, err := clientset.NewForConfig(config) diff --git a/test/integration/disruption/disruption_test.go b/test/integration/disruption/disruption_test.go index c28c7bfd4c9..9d6ae3bf2c3 100644 --- a/test/integration/disruption/disruption_test.go +++ b/test/integration/disruption/disruption_test.go @@ -65,7 +65,7 @@ import ( const stalePodDisruptionTimeout = 3 * time.Second func setup(ctx context.Context, t *testing.T) (*kubeapiservertesting.TestServer, *disruption.DisruptionController, informers.SharedInformerFactory, clientset.Interface, *apiextensionsclientset.Clientset, dynamic.Interface) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins", "ServiceAccount"}, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) clientSet, err := clientset.NewForConfig(server.ClientConfig) if err != nil { diff --git a/test/integration/endpoints/endpoints_test.go b/test/integration/endpoints/endpoints_test.go index 437cb7d2561..d0605eab035 100644 --- a/test/integration/endpoints/endpoints_test.go +++ b/test/integration/endpoints/endpoints_test.go @@ -37,7 +37,7 @@ import ( func TestEndpointUpdates(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) @@ -163,7 +163,7 @@ func TestEndpointUpdates(t *testing.T) { // without headless label func TestExternalNameToClusterIPTransition(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) @@ -272,7 +272,7 @@ func TestExternalNameToClusterIPTransition(t *testing.T) { // this behavior accidentally. func TestEndpointWithTerminatingPod(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) diff --git a/test/integration/endpointslice/endpointslicemirroring_test.go b/test/integration/endpointslice/endpointslicemirroring_test.go index c6b1ee981d4..9608c332263 100644 --- a/test/integration/endpointslice/endpointslicemirroring_test.go +++ b/test/integration/endpointslice/endpointslicemirroring_test.go @@ -40,7 +40,7 @@ import ( func TestEndpointSliceMirroring(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) @@ -313,7 +313,7 @@ func TestEndpointSliceMirroring(t *testing.T) { func TestEndpointSliceMirroringUpdates(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) @@ -488,7 +488,7 @@ func TestEndpointSliceMirroringUpdates(t *testing.T) { func TestEndpointSliceMirroringSelectorTransition(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) diff --git a/test/integration/endpointslice/endpointsliceterminating_test.go b/test/integration/endpointslice/endpointsliceterminating_test.go index 83647036af5..7be0ea78f54 100644 --- a/test/integration/endpointslice/endpointsliceterminating_test.go +++ b/test/integration/endpointslice/endpointsliceterminating_test.go @@ -105,7 +105,7 @@ func TestEndpointSliceTerminating(t *testing.T) { for _, testcase := range testcases { t.Run(testcase.name, func(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) diff --git a/test/integration/events/events_test.go b/test/integration/events/events_test.go index 904d1ac047e..2df67fd8b44 100644 --- a/test/integration/events/events_test.go +++ b/test/integration/events/events_test.go @@ -37,7 +37,7 @@ import ( ) func TestEventCompatibility(t *testing.T) { - result := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins", "ServiceAccount"}, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() client := clientset.NewForConfigOrDie(result.ClientConfig) @@ -99,7 +99,7 @@ func TestEventCompatibility(t *testing.T) { } func TestEventSeries(t *testing.T) { - result := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins", "ServiceAccount"}, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() client := clientset.NewForConfigOrDie(result.ClientConfig) diff --git a/test/integration/evictions/evictions_test.go b/test/integration/evictions/evictions_test.go index afe2b1730ac..4ab080e4108 100644 --- a/test/integration/evictions/evictions_test.go +++ b/test/integration/evictions/evictions_test.go @@ -688,7 +688,7 @@ func newV1Eviction(ns, evictionName string, deleteOption metav1.DeleteOptions) * func rmSetup(ctx context.Context, t *testing.T) (kubeapiservertesting.TearDownFunc, *disruption.DisruptionController, informers.SharedInformerFactory, *restclient.Config, clientset.Interface) { // 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) clientSet, err := clientset.NewForConfig(config) diff --git a/test/integration/garbagecollector/cluster_scoped_owner_test.go b/test/integration/garbagecollector/cluster_scoped_owner_test.go index f108ded740f..cb5c74e8b84 100644 --- a/test/integration/garbagecollector/cluster_scoped_owner_test.go +++ b/test/integration/garbagecollector/cluster_scoped_owner_test.go @@ -52,7 +52,7 @@ func (b *readDelayer) Read(p []byte) (n int, err error) { func TestClusterScopedOwners(t *testing.T) { // Start the test server and wrap the client to delay PV watch responses - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) server.ClientConfig.WrapTransport = func(rt http.RoundTripper) http.RoundTripper { return roundTripFunc(func(req *http.Request) (*http.Response, error) { if req.URL.Query().Get("watch") != "true" || !strings.Contains(req.URL.String(), "persistentvolumes") { diff --git a/test/integration/garbagecollector/garbage_collector_test.go b/test/integration/garbagecollector/garbage_collector_test.go index b5cd42faedd..0c00b2dad39 100644 --- a/test/integration/garbagecollector/garbage_collector_test.go +++ b/test/integration/garbagecollector/garbage_collector_test.go @@ -215,7 +215,7 @@ type testContext struct { // if workerCount > 0, will start the GC, otherwise it's up to the caller to Run() the GC. func setup(t *testing.T, workerCount int) *testContext { - return setupWithServer(t, kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()), workerCount) + return setupWithServer(t, kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()), workerCount) } func setupWithServer(t *testing.T, result *kubeapiservertesting.TestServer, workerCount int) *testContext { diff --git a/test/integration/job/job_test.go b/test/integration/job/job_test.go index 25a08d5f37b..44bb565a7ae 100644 --- a/test/integration/job/job_test.go +++ b/test/integration/job/job_test.go @@ -3927,7 +3927,7 @@ func createJobWithDefaults(ctx context.Context, clientSet clientset.Interface, n func setup(t testing.TB, nsBaseName string) (framework.TearDownFunc, *restclient.Config, clientset.Interface, *v1.Namespace) { // 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) config.QPS = 200 diff --git a/test/integration/kubelet/watch_manager_test.go b/test/integration/kubelet/watch_manager_test.go index 274d2c99710..0ef8a05664d 100644 --- a/test/integration/kubelet/watch_manager_test.go +++ b/test/integration/kubelet/watch_manager_test.go @@ -39,7 +39,7 @@ import ( func TestWatchBasedManager(t *testing.T) { testNamespace := "test-watch-based-manager" - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() const n = 10 diff --git a/test/integration/metrics/metrics_test.go b/test/integration/metrics/metrics_test.go index 0b90fc3595a..44cd7923a69 100644 --- a/test/integration/metrics/metrics_test.go +++ b/test/integration/metrics/metrics_test.go @@ -61,7 +61,7 @@ func TestAPIServerProcessMetrics(t *testing.T) { t.Skipf("not supported on GOOS=%s", runtime.GOOS) } - s := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + s := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer s.TearDownFn() metrics, err := scrapeMetrics(s) @@ -79,7 +79,7 @@ func TestAPIServerProcessMetrics(t *testing.T) { func TestAPIServerStorageMetrics(t *testing.T) { config := framework.SharedEtcd() config.Transport.ServerList = []string{config.Transport.ServerList[0], config.Transport.ServerList[0]} - s := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, config) + s := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), config) defer s.TearDownFn() metrics, err := scrapeMetrics(s) @@ -101,7 +101,7 @@ func TestAPIServerStorageMetrics(t *testing.T) { } func TestAPIServerMetrics(t *testing.T) { - s := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + s := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer s.TearDownFn() // Make a request to the apiserver to ensure there's at least one data point @@ -130,7 +130,7 @@ func TestAPIServerMetrics(t *testing.T) { func TestAPIServerMetricsLabels(t *testing.T) { // Disable ServiceAccount admission plugin as we don't have service account controller running. - s := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins=ServiceAccount"}, framework.SharedEtcd()) + s := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer s.TearDownFn() clientConfig := restclient.CopyConfig(s.ClientConfig) @@ -283,7 +283,7 @@ func TestAPIServerMetricsPods(t *testing.T) { } // Disable ServiceAccount admission plugin as we don't have service account 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() clientConfig := restclient.CopyConfig(server.ClientConfig) @@ -391,7 +391,7 @@ func TestAPIServerMetricsNamespaces(t *testing.T) { } } - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() clientConfig := restclient.CopyConfig(server.ClientConfig) diff --git a/test/integration/namespace/ns_conditions_test.go b/test/integration/namespace/ns_conditions_test.go index 2910988352c..042aa8308db 100644 --- a/test/integration/namespace/ns_conditions_test.go +++ b/test/integration/namespace/ns_conditions_test.go @@ -177,7 +177,7 @@ func jsonToUnstructured(stub, version, kind string) (*unstructured.Unstructured, func namespaceLifecycleSetup(t *testing.T) (kubeapiservertesting.TearDownFunc, *namespace.NamespaceController, informers.SharedInformerFactory, clientset.Interface, dynamic.Interface) { // 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) config.QPS = 10000 diff --git a/test/integration/pods/pods_test.go b/test/integration/pods/pods_test.go index 18eeace6ea8..4fda517b46e 100644 --- a/test/integration/pods/pods_test.go +++ b/test/integration/pods/pods_test.go @@ -34,7 +34,7 @@ import ( func TestPodUpdateActiveDeadlineSeconds(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 := clientset.NewForConfigOrDie(server.ClientConfig) @@ -152,7 +152,7 @@ func TestPodUpdateActiveDeadlineSeconds(t *testing.T) { func TestPodReadOnlyFilesystem(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 := clientset.NewForConfigOrDie(server.ClientConfig) @@ -187,7 +187,7 @@ func TestPodReadOnlyFilesystem(t *testing.T) { func TestPodCreateEphemeralContainers(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 := clientset.NewForConfigOrDie(server.ClientConfig) @@ -256,7 +256,7 @@ func setUpEphemeralContainers(podsClient typedv1.PodInterface, pod *v1.Pod, cont func TestPodPatchEphemeralContainers(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 := clientset.NewForConfigOrDie(server.ClientConfig) @@ -487,7 +487,7 @@ func TestPodPatchEphemeralContainers(t *testing.T) { func TestPodUpdateEphemeralContainers(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 := clientset.NewForConfigOrDie(server.ClientConfig) @@ -677,7 +677,7 @@ func TestPodUpdateEphemeralContainers(t *testing.T) { func TestMutablePodSchedulingDirectives(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 := clientset.NewForConfigOrDie(server.ClientConfig) diff --git a/test/integration/replicaset/replicaset_test.go b/test/integration/replicaset/replicaset_test.go index 9d1da466604..3886cfca949 100644 --- a/test/integration/replicaset/replicaset_test.go +++ b/test/integration/replicaset/replicaset_test.go @@ -121,7 +121,7 @@ func newMatchingPod(podName, namespace string) *v1.Pod { func rmSetup(t *testing.T) (context.Context, kubeapiservertesting.TearDownFunc, *replicaset.ReplicaSetController, informers.SharedInformerFactory, clientset.Interface) { tCtx := ktesting.Init(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()) config := restclient.CopyConfig(server.ClientConfig) clientSet, err := clientset.NewForConfig(config) @@ -149,7 +149,7 @@ func rmSetup(t *testing.T) (context.Context, kubeapiservertesting.TearDownFunc, func rmSimpleSetup(t *testing.T) (kubeapiservertesting.TearDownFunc, clientset.Interface) { // 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) clientSet, err := clientset.NewForConfig(config) diff --git a/test/integration/replicationcontroller/replicationcontroller_test.go b/test/integration/replicationcontroller/replicationcontroller_test.go index 6746729c5d6..632fee80902 100644 --- a/test/integration/replicationcontroller/replicationcontroller_test.go +++ b/test/integration/replicationcontroller/replicationcontroller_test.go @@ -114,7 +114,7 @@ func newMatchingPod(podName, namespace string) *v1.Pod { func rmSetup(t *testing.T) (context.Context, kubeapiservertesting.TearDownFunc, *replication.ReplicationManager, informers.SharedInformerFactory, clientset.Interface) { tCtx := ktesting.Init(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()) config := restclient.CopyConfig(server.ClientConfig) clientSet, err := clientset.NewForConfig(config) diff --git a/test/integration/secrets/secrets_test.go b/test/integration/secrets/secrets_test.go index acb77f4a591..00d62dc85f9 100644 --- a/test/integration/secrets/secrets_test.go +++ b/test/integration/secrets/secrets_test.go @@ -42,7 +42,7 @@ func deleteSecretOrErrorf(t *testing.T, c clientset.Interface, ns, name string) // TestSecrets tests apiserver-side behavior of creation of secret objects and their use by pods. func TestSecrets(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 := clientset.NewForConfigOrDie(server.ClientConfig) diff --git a/test/integration/service/loadbalancer_test.go b/test/integration/service/loadbalancer_test.go index 8797a5b8643..50124ca2c49 100644 --- a/test/integration/service/loadbalancer_test.go +++ b/test/integration/service/loadbalancer_test.go @@ -44,7 +44,7 @@ import ( // Test_ServiceLoadBalancerAllocateNodePorts tests that a Service with spec.allocateLoadBalancerNodePorts=false // does not allocate node ports for the Service. func Test_ServiceLoadBalancerDisableAllocateNodePorts(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() client, err := clientset.NewForConfig(server.ClientConfig) @@ -84,7 +84,7 @@ func Test_ServiceLoadBalancerDisableAllocateNodePorts(t *testing.T) { // Test_ServiceUpdateLoadBalancerAllocateNodePorts tests that a Service that is updated from ClusterIP to LoadBalancer // with spec.allocateLoadBalancerNodePorts=false does not allocate node ports for the Service func Test_ServiceUpdateLoadBalancerDisableAllocateNodePorts(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() client, err := clientset.NewForConfig(server.ClientConfig) @@ -134,7 +134,7 @@ func Test_ServiceUpdateLoadBalancerDisableAllocateNodePorts(t *testing.T) { // Test_ServiceLoadBalancerSwitchToDeallocatedNodePorts test that switching a Service // to spec.allocateLoadBalancerNodePorts=false, does not de-allocate existing node ports. func Test_ServiceLoadBalancerEnableThenDisableAllocatedNodePorts(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() client, err := clientset.NewForConfig(server.ClientConfig) @@ -184,7 +184,7 @@ func Test_ServiceLoadBalancerEnableThenDisableAllocatedNodePorts(t *testing.T) { // Test_ServiceLoadBalancerDisableAllocatedNodePort test that switching a Service // to spec.allocateLoadBalancerNodePorts=false can de-allocate existing node ports. func Test_ServiceLoadBalancerDisableAllocatedNodePort(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() client, err := clientset.NewForConfig(server.ClientConfig) @@ -235,7 +235,7 @@ func Test_ServiceLoadBalancerDisableAllocatedNodePort(t *testing.T) { // Test_ServiceLoadBalancerDisableAllocatedNodePorts test that switching a Service // to spec.allocateLoadBalancerNodePorts=false can de-allocate one of existing node ports. func Test_ServiceLoadBalancerDisableAllocatedNodePorts(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() client, err := clientset.NewForConfig(server.ClientConfig) @@ -293,7 +293,7 @@ func Test_ServiceLoadBalancerDisableAllocatedNodePorts(t *testing.T) { // Test_ServiceLoadBalancerDisableAllocatedNodePortsByPatch test that switching a Service // to spec.allocateLoadBalancerNodePorts=false with path can de-allocate one of existing node ports. func Test_ServiceLoadBalancerDisableAllocatedNodePortsByPatch(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() client, err := clientset.NewForConfig(server.ClientConfig) @@ -366,7 +366,7 @@ func Test_ServiceLoadBalancerDisableAllocatedNodePortsByPatch(t *testing.T) { // Test_ServiceLoadBalancerDisableThenEnableAllocatedNodePorts test that switching a Service // to spec.allocateLoadBalancerNodePorts=true from false, allocate new node ports. func Test_ServiceLoadBalancerDisableThenEnableAllocatedNodePorts(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() client, err := clientset.NewForConfig(server.ClientConfig) @@ -426,7 +426,7 @@ func serviceHasNodePorts(svc *corev1.Service) bool { // Test_ServiceLoadBalancerEnableLoadBalancerClass tests that when a LoadBalancer // type of service has spec.LoadBalancerClass set, cloud provider should not create default load balancer. func Test_ServiceLoadBalancerEnableLoadBalancerClass(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() client, err := clientset.NewForConfig(server.ClientConfig) @@ -472,7 +472,7 @@ func Test_ServiceLoadBalancerEnableLoadBalancerClass(t *testing.T) { // type of service has spec.LoadBalancerClass set, it should be immutable as long as the service type // is still LoadBalancer. func Test_SetLoadBalancerClassThenUpdateLoadBalancerClass(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() client, err := clientset.NewForConfig(server.ClientConfig) @@ -523,7 +523,7 @@ func Test_SetLoadBalancerClassThenUpdateLoadBalancerClass(t *testing.T) { // Test_UpdateLoadBalancerWithLoadBalancerClass tests that when a Load Balancer type of Service that // is updated from non loadBalancerClass set to loadBalancerClass set, it should be not allowed. func Test_UpdateLoadBalancerWithLoadBalancerClass(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() client, err := clientset.NewForConfig(server.ClientConfig) @@ -573,7 +573,7 @@ func Test_UpdateLoadBalancerWithLoadBalancerClass(t *testing.T) { // Test_ServiceLoadBalancerMixedProtocolSetup tests that a LoadBalancer Service with different protocol values // can be created. func Test_ServiceLoadBalancerMixedProtocolSetup(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() client, err := clientset.NewForConfig(server.ClientConfig) @@ -665,7 +665,7 @@ func Test_ServiceLoadBalancerIPMode(t *testing.T) { for _, tc := range testCases { t.Run("", func(t *testing.T) { featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.LoadBalancerIPMode, tc.ipModeEnabled) - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() client, err := clientset.NewForConfig(server.ClientConfig) diff --git a/test/integration/service/service_test.go b/test/integration/service/service_test.go index 8e14de639eb..9b72e19e295 100644 --- a/test/integration/service/service_test.go +++ b/test/integration/service/service_test.go @@ -55,7 +55,7 @@ import ( // the internalTrafficPolicy field was being defaulted in older versions. New versions stop defaulting the // field and drop on read, but for compatibility reasons we still accept the field. func Test_ExternalNameServiceStopsDefaultingInternalTrafficPolicy(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() client, err := clientset.NewForConfig(server.ClientConfig) @@ -99,7 +99,7 @@ func Test_ExternalNameServiceStopsDefaultingInternalTrafficPolicy(t *testing.T) // but drops the field on read. This test exists due to historic reasons where the internalTrafficPolicy field was being defaulted // in older versions. New versions stop defaulting the field and drop on read, but for compatibility reasons we still accept the field. func Test_ExternalNameServiceDropsInternalTrafficPolicy(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() client, err := clientset.NewForConfig(server.ClientConfig) @@ -146,7 +146,7 @@ func Test_ExternalNameServiceDropsInternalTrafficPolicy(t *testing.T) { // field was being defaulted in older versions. New versions stop defaulting the field and drop on read, but for compatibility reasons // we still accept the field. func Test_ConvertingToExternalNameServiceDropsInternalTrafficPolicy(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() client, err := clientset.NewForConfig(server.ClientConfig) @@ -207,7 +207,7 @@ func Test_ConvertingToExternalNameServiceDropsInternalTrafficPolicy(t *testing.T // Test_RemovingExternalIPsFromClusterIPServiceDropsExternalTrafficPolicy tests that removing externalIPs from a // ClusterIP Service results in the externalTrafficPolicy field being dropped. func Test_RemovingExternalIPsFromClusterIPServiceDropsExternalTrafficPolicy(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() client, err := clientset.NewForConfig(server.ClientConfig) @@ -298,7 +298,7 @@ func Test_TransitionsForTrafficDistribution(t *testing.T) { featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ServiceTrafficDistribution, true) // 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) @@ -569,7 +569,7 @@ func Test_TransitionsForTrafficDistribution(t *testing.T) { } func Test_ServiceClusterIPSelector(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() ctx, cancel := context.WithCancel(context.Background()) @@ -708,7 +708,7 @@ func Test_ServiceClusterIPSelector(t *testing.T) { func Test_ServiceWatchUntil(t *testing.T) { svcReadyTimeout := 30 * time.Second - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() ctx, cancel := context.WithCancel(context.Background()) diff --git a/test/integration/service/upgrade_test.go b/test/integration/service/upgrade_test.go index c80b09a18c2..46eb908f665 100644 --- a/test/integration/service/upgrade_test.go +++ b/test/integration/service/upgrade_test.go @@ -31,7 +31,7 @@ import ( func Test_UpgradeService(t *testing.T) { etcdOptions := framework.SharedEtcd() - s := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, etcdOptions) + s := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), etcdOptions) defer s.TearDownFn() serviceName := "test-old-service" ns := "old-service-ns" diff --git a/test/integration/statefulset/statefulset_test.go b/test/integration/statefulset/statefulset_test.go index f10e7a12722..d4c006dbfd8 100644 --- a/test/integration/statefulset/statefulset_test.go +++ b/test/integration/statefulset/statefulset_test.go @@ -55,7 +55,7 @@ const ( // TestVolumeTemplateNoopUpdate ensures embedded StatefulSet objects with embedded PersistentVolumes can be updated func TestVolumeTemplateNoopUpdate(t *testing.T) { // Start the server with default storage setup - server := apiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := apiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() c, err := dynamic.NewForConfig(server.ClientConfig) diff --git a/test/integration/statefulset/util.go b/test/integration/statefulset/util.go index 3cf528d8985..850ae374713 100644 --- a/test/integration/statefulset/util.go +++ b/test/integration/statefulset/util.go @@ -19,11 +19,12 @@ package statefulset import ( "context" "fmt" - "k8s.io/kubernetes/test/utils/ktesting" "sync" "testing" "time" + "k8s.io/kubernetes/test/utils/ktesting" + appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" @@ -165,7 +166,7 @@ func newStatefulSetPVC(name string) v1.PersistentVolumeClaim { func scSetup(t *testing.T) (context.Context, kubeapiservertesting.TearDownFunc, *statefulset.StatefulSetController, informers.SharedInformerFactory, clientset.Interface) { tCtx := ktesting.Init(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()) config := restclient.CopyConfig(server.ClientConfig) clientSet, err := clientset.NewForConfig(config) diff --git a/test/integration/storageversion/gc_test.go b/test/integration/storageversion/gc_test.go index 7ed4ff470ff..13065ebb20b 100644 --- a/test/integration/storageversion/gc_test.go +++ b/test/integration/storageversion/gc_test.go @@ -52,7 +52,7 @@ const ( func TestStorageVersionGarbageCollection(t *testing.T) { featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.APIServerIdentity, true) featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.StorageVersionAPI, true) - result := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer result.TearDownFn() kubeclient, err := kubernetes.NewForConfig(result.ClientConfig) diff --git a/test/integration/storageversion/storage_version_filter_test.go b/test/integration/storageversion/storage_version_filter_test.go index f8d2bcbbd1f..b95fa5505cd 100644 --- a/test/integration/storageversion/storage_version_filter_test.go +++ b/test/integration/storageversion/storage_version_filter_test.go @@ -148,7 +148,7 @@ func testBuiltinResourceRead(t *testing.T, cfg *rest.Config, shouldBlock bool) { func TestStorageVersionBootstrap(t *testing.T) { // Start server and create CRD etcdConfig := framework.SharedEtcd() - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, etcdConfig) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), etcdConfig) etcd.CreateTestCRDs(t, apiextensionsclientset.NewForConfigOrDie(server.ClientConfig), false, etcd.GetCustomResourceDefinitionData()[0]) server.TearDownFn() diff --git a/test/integration/ttlcontroller/ttlcontroller_test.go b/test/integration/ttlcontroller/ttlcontroller_test.go index bb3c628ccb6..0c0d0ea4d86 100644 --- a/test/integration/ttlcontroller/ttlcontroller_test.go +++ b/test/integration/ttlcontroller/ttlcontroller_test.go @@ -133,7 +133,7 @@ func waitForNodesWithTTLAnnotation(t *testing.T, nodeLister listers.NodeLister, // Test whether ttlcontroller sets correct ttl annotations. func TestTTLAnnotations(t *testing.T) { - server := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd()) + server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd()) defer server.TearDownFn() testClient, informers := createClientAndInformers(t, server) diff --git a/test/integration/volume/attach_detach_test.go b/test/integration/volume/attach_detach_test.go index bc374ba7a98..73474676bb2 100644 --- a/test/integration/volume/attach_detach_test.go +++ b/test/integration/volume/attach_detach_test.go @@ -142,7 +142,7 @@ var defaultTimerConfig = attachdetach.TimerConfig{ // gets cleaned up by Desired State of World populator. func TestPodDeletionWithDswp(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() namespaceName := "test-pod-deletion" @@ -216,7 +216,7 @@ func initCSIObjects(stopCh <-chan struct{}, informers clientgoinformers.SharedIn func TestPodUpdateWithWithADC(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() namespaceName := "test-pod-update" @@ -395,7 +395,7 @@ func createAdClients(ctx context.Context, t *testing.T, server *kubeapiservertes // gets added by Desired State of World populator. func TestPodAddedByDswp(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() namespaceName := "test-pod-deletion" @@ -472,7 +472,7 @@ func TestPodAddedByDswp(t *testing.T) { func TestPVCBoundWithADC(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() tCtx := ktesting.Init(t)