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

Merge pull request #110030 from wojtek-t/clean_shutdown_2

Browse Source 
Minor cleanups in integration test shutdown
This commit is contained in:
Kubernetes Prow Robot 2022-05-13 03:43:48 -07:00 committed by GitHub
commit 9720d130e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
test/integration/apiserver/apply/apply_test.go
View File

@ -22,7 +22,6 @@ import (
"flag" "flag"
"fmt" "fmt"
"net/http" "net/http"
"net/http/httptest"
"reflect" "reflect"
"strings" "strings"
"testing" "testing"
@ -49,7 +48,8 @@ import (
"k8s.io/kubernetes/test/integration/framework" "k8s.io/kubernetes/test/integration/framework"
) )
func setup(t testing.TB, groupVersions ...schema.GroupVersion) (*httptest.Server, clientset.Interface, framework.CloseFunc) { // TODO(wojtek-t): Migrate to use testing.TestServer instead.
func setup(t testing.TB, groupVersions ...schema.GroupVersion) (clientset.Interface, framework.CloseFunc) {
opts := framework.ControlPlaneConfigOptions{EtcdOptions: framework.DefaultEtcdOptions()} opts := framework.ControlPlaneConfigOptions{EtcdOptions: framework.DefaultEtcdOptions()}
opts.EtcdOptions.DefaultStorageMediaType = "application/vnd.kubernetes.protobuf" opts.EtcdOptions.DefaultStorageMediaType = "application/vnd.kubernetes.protobuf"
controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfigWithOptions(&opts) controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfigWithOptions(&opts)
@ -65,7 +65,7 @@ func setup(t testing.TB, groupVersions ...schema.GroupVersion) (*httptest.Server
if err != nil { if err != nil {
t.Fatalf("Error in create clientset: %v", err) t.Fatalf("Error in create clientset: %v", err)
} }
return s, clientSet, closeFn return clientSet, closeFn
} }
// TestApplyAlsoCreates makes sure that PATCH requests with the apply content type // TestApplyAlsoCreates makes sure that PATCH requests with the apply content type
@ -74,7 +74,7 @@ func setup(t testing.TB, groupVersions ...schema.GroupVersion) (*httptest.Server
func TestApplyAlsoCreates(t *testing.T) { func TestApplyAlsoCreates(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
testCases := []struct { testCases := []struct {
@ -155,7 +155,7 @@ func TestApplyAlsoCreates(t *testing.T) {
func TestNoOpUpdateSameResourceVersion(t *testing.T) { func TestNoOpUpdateSameResourceVersion(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
podName := "no-op" podName := "no-op"
@ -257,7 +257,7 @@ func TestNoOpUpdateSameResourceVersion(t *testing.T) {
func TestCreateOnApplyFailsWithUID(t *testing.T) { func TestCreateOnApplyFailsWithUID(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
_, err := client.CoreV1().RESTClient().Patch(types.ApplyPatchType). _, err := client.CoreV1().RESTClient().Patch(types.ApplyPatchType).
@ -289,7 +289,7 @@ func TestCreateOnApplyFailsWithUID(t *testing.T) {
func TestApplyUpdateApplyConflictForced(t *testing.T) { func TestApplyUpdateApplyConflictForced(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
obj := []byte(`{ obj := []byte(`{
@ -379,7 +379,7 @@ func TestApplyUpdateApplyConflictForced(t *testing.T) {
func TestApplyGroupsManySeparateUpdates(t *testing.T) { func TestApplyGroupsManySeparateUpdates(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
obj := []byte(`{ obj := []byte(`{
@ -443,7 +443,7 @@ func TestApplyGroupsManySeparateUpdates(t *testing.T) {
func TestCreateVeryLargeObject(t *testing.T) { func TestCreateVeryLargeObject(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
cfg := &v1.ConfigMap{ cfg := &v1.ConfigMap{
@ -489,7 +489,7 @@ func TestCreateVeryLargeObject(t *testing.T) {
func TestUpdateVeryLargeObject(t *testing.T) { func TestUpdateVeryLargeObject(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
cfg := &v1.ConfigMap{ cfg := &v1.ConfigMap{
@ -555,7 +555,7 @@ func TestUpdateVeryLargeObject(t *testing.T) {
func TestPatchVeryLargeObject(t *testing.T) { func TestPatchVeryLargeObject(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
cfg := &v1.ConfigMap{ cfg := &v1.ConfigMap{
@ -614,7 +614,7 @@ func TestPatchVeryLargeObject(t *testing.T) {
func TestApplyManagedFields(t *testing.T) { func TestApplyManagedFields(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
_, err := client.CoreV1().RESTClient().Patch(types.ApplyPatchType). _, err := client.CoreV1().RESTClient().Patch(types.ApplyPatchType).
@ -741,7 +741,7 @@ func TestApplyManagedFields(t *testing.T) {
func TestApplyRemovesEmptyManagedFields(t *testing.T) { func TestApplyRemovesEmptyManagedFields(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
obj := []byte(`{ obj := []byte(`{
@ -793,7 +793,7 @@ func TestApplyRemovesEmptyManagedFields(t *testing.T) {
func TestApplyRequiresFieldManager(t *testing.T) { func TestApplyRequiresFieldManager(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
obj := []byte(`{ obj := []byte(`{
@ -833,7 +833,7 @@ func TestApplyRequiresFieldManager(t *testing.T) {
func TestApplyRemoveContainerPort(t *testing.T) { func TestApplyRemoveContainerPort(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
obj := []byte(`{ obj := []byte(`{
@ -937,7 +937,7 @@ func TestApplyRemoveContainerPort(t *testing.T) {
func TestApplyFailsWithVersionMismatch(t *testing.T) { func TestApplyFailsWithVersionMismatch(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
obj := []byte(`{ obj := []byte(`{
@ -1034,7 +1034,7 @@ func TestApplyFailsWithVersionMismatch(t *testing.T) {
func TestApplyConvertsManagedFieldsVersion(t *testing.T) { func TestApplyConvertsManagedFieldsVersion(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
obj := []byte(`{ obj := []byte(`{
@ -1177,7 +1177,7 @@ func TestApplyConvertsManagedFieldsVersion(t *testing.T) {
func TestClearManagedFieldsWithMergePatch(t *testing.T) { func TestClearManagedFieldsWithMergePatch(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
_, err := client.CoreV1().RESTClient().Patch(types.ApplyPatchType). _, err := client.CoreV1().RESTClient().Patch(types.ApplyPatchType).
@ -1233,7 +1233,7 @@ func TestClearManagedFieldsWithMergePatch(t *testing.T) {
func TestClearManagedFieldsWithStrategicMergePatch(t *testing.T) { func TestClearManagedFieldsWithStrategicMergePatch(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
_, err := client.CoreV1().RESTClient().Patch(types.ApplyPatchType). _, err := client.CoreV1().RESTClient().Patch(types.ApplyPatchType).
@ -1293,7 +1293,7 @@ func TestClearManagedFieldsWithStrategicMergePatch(t *testing.T) {
func TestClearManagedFieldsWithJSONPatch(t *testing.T) { func TestClearManagedFieldsWithJSONPatch(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
_, err := client.CoreV1().RESTClient().Patch(types.ApplyPatchType). _, err := client.CoreV1().RESTClient().Patch(types.ApplyPatchType).
@ -1349,7 +1349,7 @@ func TestClearManagedFieldsWithJSONPatch(t *testing.T) {
func TestClearManagedFieldsWithUpdate(t *testing.T) { func TestClearManagedFieldsWithUpdate(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
_, err := client.CoreV1().RESTClient().Patch(types.ApplyPatchType). _, err := client.CoreV1().RESTClient().Patch(types.ApplyPatchType).
@ -1423,7 +1423,7 @@ func TestClearManagedFieldsWithUpdate(t *testing.T) {
func TestErrorsDontFail(t *testing.T) { func TestErrorsDontFail(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
// Tries to create with a managed fields that has an empty `fieldsType`. // Tries to create with a managed fields that has an empty `fieldsType`.
@ -1463,7 +1463,7 @@ func TestErrorsDontFail(t *testing.T) {
func TestErrorsDontFailUpdate(t *testing.T) { func TestErrorsDontFailUpdate(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
_, err := client.CoreV1().RESTClient().Post(). _, err := client.CoreV1().RESTClient().Post().
@ -1527,7 +1527,7 @@ func TestErrorsDontFailUpdate(t *testing.T) {
func TestErrorsDontFailPatch(t *testing.T) { func TestErrorsDontFailPatch(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
_, err := client.CoreV1().RESTClient().Post(). _, err := client.CoreV1().RESTClient().Post().
@ -1577,7 +1577,7 @@ func TestErrorsDontFailPatch(t *testing.T) {
func TestApplyDoesNotChangeManagedFieldsViaSubresources(t *testing.T) { func TestApplyDoesNotChangeManagedFieldsViaSubresources(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
podBytes := []byte(`{ podBytes := []byte(`{
@ -1680,7 +1680,7 @@ func TestApplyDoesNotChangeManagedFieldsViaSubresources(t *testing.T) {
func TestClearManagedFieldsWithUpdateEmptyList(t *testing.T) { func TestClearManagedFieldsWithUpdateEmptyList(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
_, err := client.CoreV1().RESTClient().Patch(types.ApplyPatchType). _, err := client.CoreV1().RESTClient().Patch(types.ApplyPatchType).
@ -1765,7 +1765,7 @@ func TestClearManagedFieldsWithUpdateEmptyList(t *testing.T) {
func TestApplyUnsetExclusivelyOwnedFields(t *testing.T) { func TestApplyUnsetExclusivelyOwnedFields(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
// spec.replicas is a optional, defaulted field // spec.replicas is a optional, defaulted field
@ -1874,7 +1874,7 @@ func TestApplyUnsetExclusivelyOwnedFields(t *testing.T) {
func TestApplyUnsetSharedFields(t *testing.T) { func TestApplyUnsetSharedFields(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
// spec.replicas is a optional, defaulted field // spec.replicas is a optional, defaulted field
@ -1986,7 +1986,7 @@ func TestApplyUnsetSharedFields(t *testing.T) {
func TestApplyCanTransferFieldOwnershipToController(t *testing.T) { func TestApplyCanTransferFieldOwnershipToController(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
// Applier creates a deployment with replicas set to 3 // Applier creates a deployment with replicas set to 3
@ -2105,7 +2105,7 @@ func TestApplyCanTransferFieldOwnershipToController(t *testing.T) {
func TestApplyCanRemoveMapItemsContributedToByControllers(t *testing.T) { func TestApplyCanRemoveMapItemsContributedToByControllers(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
// Applier creates a deployment with a name=nginx container // Applier creates a deployment with a name=nginx container
@ -2225,7 +2225,7 @@ func TestApplyCanRemoveMapItemsContributedToByControllers(t *testing.T) {
func TestDefaultMissingKeys(t *testing.T) { func TestDefaultMissingKeys(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
// Applier creates a deployment with containerPort but no protocol // Applier creates a deployment with containerPort but no protocol
@ -2474,7 +2474,7 @@ func encodePod(pod v1.Pod) []byte {
func BenchmarkNoServerSideApply(b *testing.B) { func BenchmarkNoServerSideApply(b *testing.B) {
defer featuregatetesting.SetFeatureGateDuringTest(b, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, false)() defer featuregatetesting.SetFeatureGateDuringTest(b, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, false)()
_, client, closeFn := setup(b) client, closeFn := setup(b)
defer closeFn() defer closeFn()
flag.Lookup("v").Value.Set("0") flag.Lookup("v").Value.Set("0")
@ -2487,7 +2487,8 @@ func getPodSizeWhenEnabled(b *testing.B, pod v1.Pod) int {
func getPodBytesWhenEnabled(b *testing.B, pod v1.Pod, format string) []byte { func getPodBytesWhenEnabled(b *testing.B, pod v1.Pod, format string) []byte {
defer featuregatetesting.SetFeatureGateDuringTest(b, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(b, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(b)
client, closeFn := setup(b)
defer closeFn() defer closeFn()
flag.Lookup("v").Value.Set("0") flag.Lookup("v").Value.Set("0")
@ -2511,7 +2512,7 @@ func BenchmarkNoServerSideApplyButSameSize(b *testing.B) {
ssaPodSize := getPodSizeWhenEnabled(b, pod) ssaPodSize := getPodSizeWhenEnabled(b, pod)
defer featuregatetesting.SetFeatureGateDuringTest(b, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, false)() defer featuregatetesting.SetFeatureGateDuringTest(b, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, false)()
_, client, closeFn := setup(b) client, closeFn := setup(b)
defer closeFn() defer closeFn()
flag.Lookup("v").Value.Set("0") flag.Lookup("v").Value.Set("0")
@ -2547,7 +2548,7 @@ func BenchmarkServerSideApply(b *testing.B) {
defer featuregatetesting.SetFeatureGateDuringTest(b, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(b, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(b) client, closeFn := setup(b)
defer closeFn() defer closeFn()
flag.Lookup("v").Value.Set("0") flag.Lookup("v").Value.Set("0")
@ -2683,7 +2684,7 @@ func benchRepeatedUpdate(client kubernetes.Interface, podName string) func(*test
func TestUpgradeClientSideToServerSideApply(t *testing.T) { func TestUpgradeClientSideToServerSideApply(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
obj := []byte(` obj := []byte(`
@ -2913,7 +2914,7 @@ spec:
func TestRenamingAppliedFieldManagers(t *testing.T) { func TestRenamingAppliedFieldManagers(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
// Creating an object // Creating an object
@ -3005,7 +3006,7 @@ func TestRenamingAppliedFieldManagers(t *testing.T) {
func TestRenamingUpdatedFieldManagers(t *testing.T) { func TestRenamingUpdatedFieldManagers(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
// Creating an object // Creating an object
@ -3107,7 +3108,7 @@ func TestRenamingUpdatedFieldManagers(t *testing.T) {
func TestDroppingSubresourceField(t *testing.T) { func TestDroppingSubresourceField(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
// Creating an object // Creating an object
@ -3220,7 +3221,7 @@ func TestDroppingSubresourceField(t *testing.T) {
func TestDroppingSubresourceFromSpecField(t *testing.T) { func TestDroppingSubresourceFromSpecField(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
// Creating an object // Creating an object
@ -3334,7 +3335,7 @@ func TestDroppingSubresourceFromSpecField(t *testing.T) {
func TestSubresourceField(t *testing.T) { func TestSubresourceField(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
// Creating a deployment // Creating a deployment

4
test/integration/apiserver/apply/scale_test.go
View File

@ -51,7 +51,7 @@ type scaleTest struct {
func TestScaleAllResources(t *testing.T) { func TestScaleAllResources(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
tests := []scaleTest{ tests := []scaleTest{
@ -241,7 +241,7 @@ func TestScaleAllResources(t *testing.T) {
func TestScaleUpdateOnlyStatus(t *testing.T) { func TestScaleUpdateOnlyStatus(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, client, closeFn := setup(t) client, closeFn := setup(t)
defer closeFn() defer closeFn()
resource := "deployments" resource := "deployments"

3
test/integration/apiserver/tracing/tracing_test.go
View File

@ -74,13 +74,12 @@ endpoint: %s`, listener.Addr().String())), os.FileMode(0755)); err != nil {
} }
// Start the API Server with our tracing configuration // Start the API Server with our tracing configuration
stopCh := make(chan struct{})
defer close(stopCh)
testServer := kubeapiservertesting.StartTestServerOrDie(t, testServer := kubeapiservertesting.StartTestServerOrDie(t,
kubeapiservertesting.NewDefaultTestServerOptions(), kubeapiservertesting.NewDefaultTestServerOptions(),
[]string{"--tracing-config-file=" + tracingConfigFile.Name()}, []string{"--tracing-config-file=" + tracingConfigFile.Name()},
framework.SharedEtcd(), framework.SharedEtcd(),
) )
defer testServer.TearDownFn()
clientConfig := testServer.ClientConfig clientConfig := testServer.ClientConfig
// Create a client that creates sampled traces. // Create a client that creates sampled traces.