github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify Create/Delete-TestingNamespace functions

Browse Source
This commit is contained in:
Wojciech Tyczyński
2022-05-15 15:33:19 +02:00
parent 9720d130e4
commit deef9e40de
35 changed files with 326 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/integration/util/util.go
View File

@@ -214,7 +214,7 @@ func CleanupTest(t *testing.T, testCtx *TestContext) {
testCtx.CancelFn()
// Cleanup nodes.
testCtx.ClientSet.CoreV1().Nodes().DeleteCollection(context.TODO(), metav1.DeleteOptions{}, metav1.ListOptions{})
framework.DeleteTestingNamespace(testCtx.NS, testCtx.HTTPServer, t)
framework.DeleteTestingNamespace(testCtx.NS, t)
testCtx.CloseFn()
}
@@ -351,9 +351,9 @@ func InitTestAPIServer(t *testing.T, nsPrefix string, admission admission.Interf
_, testCtx.HTTPServer, testCtx.CloseFn = framework.RunAnAPIServer(controlPlaneConfig)
if nsPrefix != "default" {
testCtx.NS = framework.CreateTestingNamespace(nsPrefix+string(uuid.NewUUID()), testCtx.HTTPServer, t)
testCtx.NS = framework.CreateTestingNamespace(nsPrefix+string(uuid.NewUUID()), t)
} else {
testCtx.NS = framework.CreateTestingNamespace("default", testCtx.HTTPServer, t)
testCtx.NS = framework.CreateTestingNamespace("default", t)
}
// 2. Create kubeclient