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

Merge pull request #111324 from wojtek-t/cleanup_testing_namespace

Browse Source 
Cleanup no longer used Create/Delete TestingNamespace
This commit is contained in:
Kubernetes Prow Robot 2022-07-22 00:05:49 -07:00 committed by GitHub
commit cab41bd04d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/integration/framework/util.go
View File

@ -44,28 +44,6 @@ const (
singleCallTimeout = 5 * time.Minute
)
// CreateTestingNamespace creates a namespace for testing.
func CreateTestingNamespace(baseName string, t *testing.T) *v1.Namespace {
// TODO: Create a namespace with a given basename.
// Currently we neither create the namespace nor delete all of its contents at the end.
// But as long as tests are not using the same namespaces, this should work fine.
// Note: As the integration tests do not run with admission turned on, it's not actually
// required to persist a Namespace object to create other objects inside of it.
return &v1.Namespace{
ObjectMeta: metav1.ObjectMeta{
// TODO: Once we start creating namespaces, switch to GenerateName.
Name: baseName,
},
}
}
// DeleteTestingNamespace is currently a no-op function.
func DeleteTestingNamespace(ns *v1.Namespace, t *testing.T) {
// TODO: Remove all resources from a given namespace once we implement CreateTestingNamespace.
// Note: integration tests are not expected to run against persistent fixtures today, so not
// cleaning up data they create has no impact.
}
// CreateNamespaceOrDie creates a namespace.
func CreateNamespaceOrDie(c clientset.Interface, baseName string, t *testing.T) *v1.Namespace {
ns := &v1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: baseName}}

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

@ -213,7 +213,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, t)
framework.DeleteNamespaceOrDie(testCtx.ClientSet, testCtx.NS, t)
testCtx.CloseFn()
}