github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Skip test if cri proxy is disabled or undefined

Browse Source
This commit is contained in:
Sotiris Salloumis 2025-01-20 15:41:09 +01:00
parent 45fa12f8af
commit b345f64c76
3 changed files with 26 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e_node/container_restart_test.go
View File

@ -53,11 +53,9 @@ var _ = SIGDescribe("Container Restart", feature.CriProxy, framework.WithSerial(
if err := resetCRIProxyInjector(e2eCriProxy); err != nil { if err := resetCRIProxyInjector(e2eCriProxy); err != nil {
ginkgo.Skip("Skip the test since the CRI Proxy is undefined.") ginkgo.Skip("Skip the test since the CRI Proxy is undefined.")
} }
}) ginkgo.DeferCleanup(func() error {
return resetCRIProxyInjector(e2eCriProxy)
ginkgo.AfterEach(func() { })
err := resetCRIProxyInjector(e2eCriProxy)
framework.ExpectNoError(err)
}) })
ginkgo.It("Container restart backs off.", func(ctx context.Context) { ginkgo.It("Container restart backs off.", func(ctx context.Context) {
@ -77,11 +75,9 @@ var _ = SIGDescribe("Container Restart", feature.CriProxy, framework.WithSerial(
if err := resetCRIProxyInjector(e2eCriProxy); err != nil { if err := resetCRIProxyInjector(e2eCriProxy); err != nil {
ginkgo.Skip("Skip the test since the CRI Proxy is undefined.") ginkgo.Skip("Skip the test since the CRI Proxy is undefined.")
} }
}) ginkgo.DeferCleanup(func() error {
return resetCRIProxyInjector(e2eCriProxy)
ginkgo.AfterEach(func() { })
err := resetCRIProxyInjector(e2eCriProxy)
framework.ExpectNoError(err)
}) })
ginkgo.It("Alternate restart backs off.", func(ctx context.Context) { ginkgo.It("Alternate restart backs off.", func(ctx context.Context) {

24
test/e2e_node/criproxy_test.go
View File

@ -51,11 +51,9 @@ var _ = SIGDescribe(feature.CriProxy, framework.WithSerial(), func() {
if err := resetCRIProxyInjector(e2eCriProxy); err != nil { if err := resetCRIProxyInjector(e2eCriProxy); err != nil {
ginkgo.Skip("Skip the test since the CRI Proxy is undefined.") ginkgo.Skip("Skip the test since the CRI Proxy is undefined.")
} }
}) ginkgo.DeferCleanup(func() error {
return resetCRIProxyInjector(e2eCriProxy)
ginkgo.AfterEach(func() { })
err := resetCRIProxyInjector(e2eCriProxy)
framework.ExpectNoError(err)
}) })
ginkgo.It("Pod failed to start due to an image pull error.", func(ctx context.Context) { ginkgo.It("Pod failed to start due to an image pull error.", func(ctx context.Context) {
@ -89,11 +87,9 @@ var _ = SIGDescribe(feature.CriProxy, framework.WithSerial(), func() {
if err := resetCRIProxyInjector(e2eCriProxy); err != nil { if err := resetCRIProxyInjector(e2eCriProxy); err != nil {
ginkgo.Skip("Skip the test since the CRI Proxy is undefined.") ginkgo.Skip("Skip the test since the CRI Proxy is undefined.")
} }
}) ginkgo.DeferCleanup(func() error {
return resetCRIProxyInjector(e2eCriProxy)
ginkgo.AfterEach(func() { })
err := resetCRIProxyInjector(e2eCriProxy)
framework.ExpectNoError(err)
}) })
}) })
@ -103,11 +99,9 @@ var _ = SIGDescribe(feature.CriProxy, framework.WithSerial(), func() {
if err := resetCRIProxyInjector(e2eCriProxy); err != nil { if err := resetCRIProxyInjector(e2eCriProxy); err != nil {
ginkgo.Skip("Skip the test since the CRI Proxy is undefined.") ginkgo.Skip("Skip the test since the CRI Proxy is undefined.")
} }
}) ginkgo.DeferCleanup(func() error {
return resetCRIProxyInjector(e2eCriProxy)
ginkgo.AfterEach(func() { })
err := resetCRIProxyInjector(e2eCriProxy)
framework.ExpectNoError(err)
}) })
ginkgo.It("Image pull time exceeded 10 seconds", func(ctx context.Context) { ginkgo.It("Image pull time exceeded 10 seconds", func(ctx context.Context) {

35
test/e2e_node/image_pull_test.go
View File

@ -63,21 +63,13 @@ var _ = SIGDescribe("Pull Image", feature.CriProxy, framework.WithSerial(), func
if err := resetCRIProxyInjector(e2eCriProxy); err != nil { if err := resetCRIProxyInjector(e2eCriProxy); err != nil {
ginkgo.Skip("Skip the test since the CRI Proxy is undefined.") ginkgo.Skip("Skip the test since the CRI Proxy is undefined.")
} }
ginkgo.DeferCleanup(func() error {
return resetCRIProxyInjector(e2eCriProxy)
})
testpods = prepareAndCleanup(ctx, f) testpods = prepareAndCleanup(ctx, f)
gomega.Expect(len(testpods)).To(gomega.BeNumerically("<=", 5)) gomega.Expect(len(testpods)).To(gomega.BeNumerically("<=", 5))
}) })
ginkgo.AfterEach(func(ctx context.Context) {
err := resetCRIProxyInjector(e2eCriProxy)
framework.ExpectNoError(err)
ginkgo.By("cleanup pods")
for _, pod := range testpods {
deletePodSyncByName(ctx, f, pod.Name)
}
})
ginkgo.It("should pull immediately if no more than 5 pods", func(ctx context.Context) { ginkgo.It("should pull immediately if no more than 5 pods", func(ctx context.Context) {
var mu sync.Mutex var mu sync.Mutex
timeout := 20 * time.Second timeout := 20 * time.Second
@ -107,7 +99,8 @@ var _ = SIGDescribe("Pull Image", feature.CriProxy, framework.WithSerial(), func
framework.ExpectNoError(err) framework.ExpectNoError(err)
for _, testpod := range testpods { for _, testpod := range testpods {
_ = e2epod.NewPodClient(f).Create(ctx, testpod) pod := e2epod.NewPodClient(f).Create(ctx, testpod)
ginkgo.DeferCleanup(deletePodSyncByName, f, pod.Name)
} }
imagePulled, podStartTime, podEndTime, err := getPodImagePullDurations(ctx, f, testpods) imagePulled, podStartTime, podEndTime, err := getPodImagePullDurations(ctx, f, testpods)
@ -146,21 +139,13 @@ var _ = SIGDescribe("Pull Image", feature.CriProxy, framework.WithSerial(), func
if err := resetCRIProxyInjector(e2eCriProxy); err != nil { if err := resetCRIProxyInjector(e2eCriProxy); err != nil {
ginkgo.Skip("Skip the test since the CRI Proxy is undefined.") ginkgo.Skip("Skip the test since the CRI Proxy is undefined.")
} }
ginkgo.DeferCleanup(func() error {
return resetCRIProxyInjector(e2eCriProxy)
})
testpods = prepareAndCleanup(ctx, f) testpods = prepareAndCleanup(ctx, f)
gomega.Expect(len(testpods)).To(gomega.BeNumerically("<=", 5)) gomega.Expect(len(testpods)).To(gomega.BeNumerically("<=", 5))
}) })
ginkgo.AfterEach(func(ctx context.Context) {
err := resetCRIProxyInjector(e2eCriProxy)
framework.ExpectNoError(err)
ginkgo.By("cleanup pods")
for _, pod := range testpods {
deletePodSyncByName(ctx, f, pod.Name)
}
})
ginkgo.It("should be waiting more", func(ctx context.Context) { ginkgo.It("should be waiting more", func(ctx context.Context) {
// all serialize image pulls should timeout // all serialize image pulls should timeout
timeout := 20 * time.Second timeout := 20 * time.Second
@ -197,7 +182,9 @@ var _ = SIGDescribe("Pull Image", feature.CriProxy, framework.WithSerial(), func
var pods []*v1.Pod var pods []*v1.Pod
for _, testpod := range testpods { for _, testpod := range testpods {
pods = append(pods, e2epod.NewPodClient(f).Create(ctx, testpod)) pod := e2epod.NewPodClient(f).Create(ctx, testpod)
ginkgo.DeferCleanup(deletePodSyncByName, f, pod.Name)
pods = append(pods, pod)
} }
for _, pod := range pods { for _, pod := range pods {
err := e2epod.WaitForPodCondition(ctx, f.ClientSet, f.Namespace.Name, pod.Name, "Running", 2*time.Minute, func(pod *v1.Pod) (bool, error) { err := e2epod.WaitForPodCondition(ctx, f.ClientSet, f.Namespace.Name, pod.Name, "Running", 2*time.Minute, func(pod *v1.Pod) (bool, error) {