mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
Merge pull request #114392 from pohly/e2e-apimachinery-cleanup
e2e apimachinery: simplify cleanup
This commit is contained in:
commit
63ff4a2659
@ -57,18 +57,8 @@ const (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var _ = SIGDescribe("Aggregator", func() {
|
var _ = SIGDescribe("Aggregator", func() {
|
||||||
var ns string
|
|
||||||
var c clientset.Interface
|
|
||||||
var aggrclient *aggregatorclient.Clientset
|
var aggrclient *aggregatorclient.Clientset
|
||||||
|
|
||||||
// BeforeEachs run in LIFO order, AfterEachs run in FIFO order.
|
|
||||||
// We want cleanTest to happen before the namespace cleanup AfterEach
|
|
||||||
// inserted by NewDefaultFramework, so we put this AfterEach in front
|
|
||||||
// of NewDefaultFramework.
|
|
||||||
ginkgo.AfterEach(func() {
|
|
||||||
cleanTest(c, aggrclient, ns)
|
|
||||||
})
|
|
||||||
|
|
||||||
f := framework.NewDefaultFramework("aggregator")
|
f := framework.NewDefaultFramework("aggregator")
|
||||||
f.NamespacePodSecurityEnforceLevel = admissionapi.LevelBaseline
|
f.NamespacePodSecurityEnforceLevel = admissionapi.LevelBaseline
|
||||||
|
|
||||||
@ -76,19 +66,15 @@ var _ = SIGDescribe("Aggregator", func() {
|
|||||||
// NewDefaultFramework to happen before this, so we put this BeforeEach
|
// NewDefaultFramework to happen before this, so we put this BeforeEach
|
||||||
// after NewDefaultFramework.
|
// after NewDefaultFramework.
|
||||||
ginkgo.BeforeEach(func() {
|
ginkgo.BeforeEach(func() {
|
||||||
c = f.ClientSet
|
config, err := framework.LoadConfig()
|
||||||
ns = f.Namespace.Name
|
if err != nil {
|
||||||
|
framework.Failf("could not load config: %v", err)
|
||||||
if aggrclient == nil {
|
|
||||||
config, err := framework.LoadConfig()
|
|
||||||
if err != nil {
|
|
||||||
framework.Failf("could not load config: %v", err)
|
|
||||||
}
|
|
||||||
aggrclient, err = aggregatorclient.NewForConfig(config)
|
|
||||||
if err != nil {
|
|
||||||
framework.Failf("could not create aggregator client: %v", err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
aggrclient, err = aggregatorclient.NewForConfig(config)
|
||||||
|
if err != nil {
|
||||||
|
framework.Failf("could not create aggregator client: %v", err)
|
||||||
|
}
|
||||||
|
ginkgo.DeferCleanup(cleanTest, f.ClientSet, aggrclient, f.Namespace.Name)
|
||||||
})
|
})
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user