Skip to content

Commit

Permalink
Simplify Create/Delete-TestingNamespace functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@wojtek-t
wojtek-t committed May 15, 2022
1 parent 9720d13 commit deef9e4
Show file tree
Hide file tree
Showing 35 changed files with 326 additions and 333 deletions.
4 changes: 2 additions & 2 deletions test/integration/apimachinery/watch_restart_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ func TestWatchRestartsIfTimeoutNotReached(t *testing.T) {
Host: s.URL,
}

namespaceObject := framework.CreateTestingNamespace("retry-watch", s, t)
defer framework.DeleteTestingNamespace(namespaceObject, s, t)
namespaceObject := framework.CreateTestingNamespace("retry-watch", t)
defer framework.DeleteTestingNamespace(namespaceObject, t)

getListFunc := func(c *kubernetes.Clientset, secret *corev1.Secret) func(options metav1.ListOptions) *corev1.SecretList {
return func(options metav1.ListOptions) *corev1.SecretList {
Expand Down
28 changes: 14 additions & 14 deletions test/integration/apiserver/apiserver_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,8 @@ func Test202StatusCode(t *testing.T) {
s, clientSet, closeFn := setup(t)
defer closeFn()

ns := framework.CreateTestingNamespace("status-code", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("status-code", t)
defer framework.DeleteTestingNamespace(ns, t)

rsClient := clientSet.AppsV1().ReplicaSets(ns.Name)

Expand Down Expand Up @@ -380,11 +380,11 @@ func TestListOptions(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.APIListChunking, true)()
etcdOptions := framework.DefaultEtcdOptions()
etcdOptions.EnableWatchCache = watchCacheEnabled
s, clientSet, closeFn := setupWithOptions(t, &framework.ControlPlaneConfigOptions{EtcdOptions: etcdOptions})
_, clientSet, closeFn := setupWithOptions(t, &framework.ControlPlaneConfigOptions{EtcdOptions: etcdOptions})
defer closeFn()

ns := framework.CreateTestingNamespace("list-options", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("list-options", t)
defer framework.DeleteTestingNamespace(ns, t)

rsClient := clientSet.AppsV1().ReplicaSets(ns.Name)

Expand Down Expand Up @@ -612,11 +612,11 @@ func TestListResourceVersion0(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.APIListChunking, true)()
etcdOptions := framework.DefaultEtcdOptions()
etcdOptions.EnableWatchCache = tc.watchCacheEnabled
s, clientSet, closeFn := setupWithOptions(t, &framework.ControlPlaneConfigOptions{EtcdOptions: etcdOptions})
_, clientSet, closeFn := setupWithOptions(t, &framework.ControlPlaneConfigOptions{EtcdOptions: etcdOptions})
defer closeFn()

ns := framework.CreateTestingNamespace("list-paging", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("list-paging", t)
defer framework.DeleteTestingNamespace(ns, t)

rsClient := clientSet.AppsV1().ReplicaSets(ns.Name)

Expand Down Expand Up @@ -665,11 +665,11 @@ func TestListResourceVersion0(t *testing.T) {

func TestAPIListChunking(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.APIListChunking, true)()
s, clientSet, closeFn := setup(t)
_, clientSet, closeFn := setup(t)
defer closeFn()

ns := framework.CreateTestingNamespace("list-paging", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("list-paging", t)
defer framework.DeleteTestingNamespace(ns, t)

rsClient := clientSet.AppsV1().ReplicaSets(ns.Name)

Expand Down Expand Up @@ -743,13 +743,13 @@ func makeSecret(name string) *v1.Secret {
}

func TestNameInFieldSelector(t *testing.T) {
s, clientSet, closeFn := setup(t)
_, clientSet, closeFn := setup(t)
defer closeFn()

numNamespaces := 3
for i := 0; i < 3; i++ {
ns := framework.CreateTestingNamespace(fmt.Sprintf("ns%d", i), s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace(fmt.Sprintf("ns%d", i), t)
defer framework.DeleteTestingNamespace(ns, t)

_, err := clientSet.CoreV1().Secrets(ns.Name).Create(context.TODO(), makeSecret("foo"), metav1.CreateOptions{})
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions test/integration/apiserver/cve_2021_29923_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ func TestCanaryCVE_2021_29923(t *testing.T) {
t.Fatalf("unexpected error creating dynamic client: %v", err)
}

ns := framework.CreateTestingNamespace("test-cve-2021-29923", server, t)
defer framework.DeleteTestingNamespace(ns, server, t)
ns := framework.CreateTestingNamespace("test-cve-2021-29923", t)
defer framework.DeleteTestingNamespace(ns, t)

objects := map[schema.GroupVersionResource]string{
// k8s.io/kubernetes/pkg/api/v1
Expand Down
6 changes: 3 additions & 3 deletions test/integration/apiserver/patch_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ import (

// Tests that the apiserver retries patches
func TestPatchConflicts(t *testing.T) {
s, clientSet, closeFn := setup(t)
_, clientSet, closeFn := setup(t)
defer closeFn()

ns := framework.CreateTestingNamespace("status-code", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("status-code", t)
defer framework.DeleteTestingNamespace(ns, t)

numOfConcurrentPatches := 100

Expand Down
4 changes: 2 additions & 2 deletions test/integration/apiserver/print_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ func TestServerSidePrint(t *testing.T) {
)
defer closeFn()

ns := framework.CreateTestingNamespace("server-print", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("server-print", t)
defer framework.DeleteTestingNamespace(ns, t)

tableParam := fmt.Sprintf("application/json;as=Table;g=%s;v=%s, application/json", metav1beta1.GroupName, metav1beta1.SchemeGroupVersion.Version)
printer := newFakePrinter(printersinternal.AddHandlers)
Expand Down
44 changes: 22 additions & 22 deletions test/integration/auth/auth_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -466,8 +466,8 @@ func TestAuthModeAlwaysAllow(t *testing.T) {
_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
defer closeFn()

ns := framework.CreateTestingNamespace("auth-always-allow", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("auth-always-allow", t)
defer framework.DeleteTestingNamespace(ns, t)

transport := http.DefaultTransport
previousResourceVersion := make(map[string]float64)
Expand Down Expand Up @@ -563,8 +563,8 @@ func TestAuthModeAlwaysDeny(t *testing.T) {
controlPlaneConfig.GenericConfig.Authorization.Authorizer = authorizerfactory.NewAlwaysDenyAuthorizer()
_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
defer closeFn()
ns := framework.CreateTestingNamespace("auth-always-deny", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("auth-always-deny", t)
defer framework.DeleteTestingNamespace(ns, t)
transport := resttransport.NewBearerAuthRoundTripper(framework.UnprivilegedUserToken, http.DefaultTransport)

for _, r := range getTestRequests(ns.Name) {
Expand Down Expand Up @@ -612,8 +612,8 @@ func TestAliceNotForbiddenOrUnauthorized(t *testing.T) {
_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
defer closeFn()

ns := framework.CreateTestingNamespace("auth-alice-not-forbidden", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("auth-alice-not-forbidden", t)
defer framework.DeleteTestingNamespace(ns, t)

previousResourceVersion := make(map[string]float64)
transport := http.DefaultTransport
Expand Down Expand Up @@ -681,8 +681,8 @@ func TestBobIsForbidden(t *testing.T) {
_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
defer closeFn()

ns := framework.CreateTestingNamespace("auth-bob-forbidden", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("auth-bob-forbidden", t)
defer framework.DeleteTestingNamespace(ns, t)

transport := http.DefaultTransport

Expand Down Expand Up @@ -725,8 +725,8 @@ func TestUnknownUserIsUnauthorized(t *testing.T) {
_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
defer closeFn()

ns := framework.CreateTestingNamespace("auth-unknown-unauthorized", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("auth-unknown-unauthorized", t)
defer framework.DeleteTestingNamespace(ns, t)

transport := http.DefaultTransport

Expand Down Expand Up @@ -787,8 +787,8 @@ func TestImpersonateIsForbidden(t *testing.T) {
_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
defer closeFn()

ns := framework.CreateTestingNamespace("auth-impersonate-forbidden", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("auth-impersonate-forbidden", t)
defer framework.DeleteTestingNamespace(ns, t)

transport := http.DefaultTransport

Expand Down Expand Up @@ -1092,8 +1092,8 @@ func TestAuthorizationAttributeDetermination(t *testing.T) {
_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
defer closeFn()

ns := framework.CreateTestingNamespace("auth-attribute-determination", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("auth-attribute-determination", t)
defer framework.DeleteTestingNamespace(ns, t)

transport := http.DefaultTransport

Expand Down Expand Up @@ -1158,8 +1158,8 @@ func TestNamespaceAuthorization(t *testing.T) {
_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
defer closeFn()

ns := framework.CreateTestingNamespace("auth-namespace", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("auth-namespace", t)
defer framework.DeleteTestingNamespace(ns, t)

previousResourceVersion := make(map[string]float64)
transport := http.DefaultTransport
Expand Down Expand Up @@ -1256,8 +1256,8 @@ func TestKindAuthorization(t *testing.T) {
_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
defer closeFn()

ns := framework.CreateTestingNamespace("auth-kind", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("auth-kind", t)
defer framework.DeleteTestingNamespace(ns, t)

previousResourceVersion := make(map[string]float64)
transport := http.DefaultTransport
Expand Down Expand Up @@ -1340,8 +1340,8 @@ func TestReadOnlyAuthorization(t *testing.T) {
_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
defer closeFn()

ns := framework.CreateTestingNamespace("auth-read-only", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("auth-read-only", t)
defer framework.DeleteTestingNamespace(ns, t)

transport := http.DefaultTransport

Expand Down Expand Up @@ -1417,8 +1417,8 @@ func testWebhookTokenAuthenticator(customDialer bool, t *testing.T) {
_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
defer closeFn()

ns := framework.CreateTestingNamespace("auth-webhook-token", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("auth-webhook-token", t)
defer framework.DeleteTestingNamespace(ns, t)

transport := http.DefaultTransport

Expand Down
4 changes: 2 additions & 2 deletions test/integration/auth/bootstraptoken_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ func TestBootstrapTokenAuth(t *testing.T) {
_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
defer closeFn()

ns := framework.CreateTestingNamespace("auth-bootstrap-token", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("auth-bootstrap-token", t)
defer framework.DeleteTestingNamespace(ns, t)

previousResourceVersion := make(map[string]float64)
transport := http.DefaultTransport
Expand Down
4 changes: 2 additions & 2 deletions test/integration/configmap/configmap_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ func TestConfigMap(t *testing.T) {

client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}})

ns := framework.CreateTestingNamespace("config-map", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace("config-map", t)
defer framework.DeleteTestingNamespace(ns, t)

DoTestConfigMap(t, client, ns)
}
Expand Down
11 changes: 5 additions & 6 deletions test/integration/cronjob/cronjob_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package cronjob
import (
"context"
"fmt"
"net/http/httptest"
"testing"
"time"

Expand All @@ -36,7 +35,7 @@ import (
"k8s.io/kubernetes/test/integration/framework"
)

func setup(t *testing.T) (*httptest.Server, framework.CloseFunc, *cronjob.ControllerV2, *job.Controller, informers.SharedInformerFactory, clientset.Interface, restclient.Config) {
func setup(t *testing.T) (framework.CloseFunc, *cronjob.ControllerV2, *job.Controller, informers.SharedInformerFactory, clientset.Interface, restclient.Config) {
controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfig()
_, server, closeFn := framework.RunAnAPIServer(controlPlaneConfig)

Expand All @@ -53,7 +52,7 @@ func setup(t *testing.T) (*httptest.Server, framework.CloseFunc, *cronjob.Contro
}
jc := job.NewController(informerSet.Core().V1().Pods(), informerSet.Batch().V1().Jobs(), clientSet)

return server, closeFn, cjc, jc, informerSet, clientSet, config
return closeFn, cjc, jc, informerSet, clientSet, config
}

func newCronJob(name, namespace, schedule string) *batchv1.CronJob {
Expand Down Expand Up @@ -144,14 +143,14 @@ func validateJobAndPod(t *testing.T, clientSet clientset.Interface, namespace st
}

func TestCronJobLaunchesPodAndCleansUp(t *testing.T) {
server, closeFn, cjc, jc, informerSet, clientSet, _ := setup(t)
closeFn, cjc, jc, informerSet, clientSet, _ := setup(t)
defer closeFn()

cronJobName := "foo"
namespaceName := "simple-cronjob-test"

ns := framework.CreateTestingNamespace(namespaceName, server, t)
defer framework.DeleteTestingNamespace(ns, server, t)
ns := framework.CreateTestingNamespace(namespaceName, t)
defer framework.DeleteTestingNamespace(ns, t)

cjClient := clientSet.BatchV1().CronJobs(ns.Name)

Expand Down

0 comments on commit deef9e4

Please sign in to comment.