scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #130526 from aojea/e2e_netpol_finalizers

Browse Source 
e2e network policies test support network policies with finalizers
This commit is contained in:
Kubernetes Prow Robot
2025-03-03 06:51:49 -08:00
committed by GitHub
parent b3095a49f5 09427ab558
commit 940e6bd357
1 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
test/e2e/network/netpol/network_policy_api.go
View File

@@ -197,9 +197,16 @@ var _ = common.SIGDescribe("Netpol API", func() {
ginkgo.By("deleting") ginkgo.By("deleting")
err = npClient.Delete(ctx, createdNetPol.Name, metav1.DeleteOptions{}) err = npClient.Delete(ctx, createdNetPol.Name, metav1.DeleteOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
err = wait.PollUntilContextTimeout(ctx, 2*time.Second, 1*time.Minute, false, func(ctx context.Context) (done bool, err error) {
_, err = npClient.Get(ctx, createdNetPol.Name, metav1.GetOptions{}) _, err = npClient.Get(ctx, createdNetPol.Name, metav1.GetOptions{})
if !apierrors.IsNotFound(err) { if !apierrors.IsNotFound(err) {
framework.Failf("expected 404, got %#v", err) framework.Logf("expected 404, got %#v", err)
return false, nil
}
return true, nil
})
if err != nil {
framework.Failf("unexpected error deleting existing network policy: %v", err)
} }
nps, err = npClient.List(ctx, metav1.ListOptions{LabelSelector: "special-label=" + f.UniqueName}) nps, err = npClient.List(ctx, metav1.ListOptions{LabelSelector: "special-label=" + f.UniqueName})
framework.ExpectNoError(err) framework.ExpectNoError(err)
@@ -208,9 +215,20 @@ var _ = common.SIGDescribe("Netpol API", func() {
ginkgo.By("deleting a collection") ginkgo.By("deleting a collection")
err = npClient.DeleteCollection(ctx, metav1.DeleteOptions{}, metav1.ListOptions{LabelSelector: "special-label=" + f.UniqueName}) err = npClient.DeleteCollection(ctx, metav1.DeleteOptions{}, metav1.ListOptions{LabelSelector: "special-label=" + f.UniqueName})
framework.ExpectNoError(err) framework.ExpectNoError(err)
err = wait.PollUntilContextTimeout(ctx, 2*time.Second, 1*time.Minute, false, func(ctx context.Context) (done bool, err error) {
nps, err = npClient.List(ctx, metav1.ListOptions{LabelSelector: "special-label=" + f.UniqueName}) nps, err = npClient.List(ctx, metav1.ListOptions{LabelSelector: "special-label=" + f.UniqueName})
framework.ExpectNoError(err) if err != nil {
gomega.Expect(nps.Items).To(gomega.BeEmpty(), "filtered list should have 0 items") return false, err
}
if len(nps.Items) > 0 {
framework.Logf("still %d network policies present, retrying ...", len(nps.Items))
return false, nil
}
return true, nil
})
if err != nil {
framework.Failf("unexpected error deleting existing network policies: %v", err)
}
}) })
/* /*
@@ -267,8 +285,19 @@ var _ = common.SIGDescribe("Netpol API", func() {
ginkgo.By("deleting all test collection") ginkgo.By("deleting all test collection")
err = npClient.DeleteCollection(ctx, metav1.DeleteOptions{}, metav1.ListOptions{LabelSelector: "special-label=" + f.UniqueName}) err = npClient.DeleteCollection(ctx, metav1.DeleteOptions{}, metav1.ListOptions{LabelSelector: "special-label=" + f.UniqueName})
framework.ExpectNoError(err) framework.ExpectNoError(err)
err = wait.PollUntilContextTimeout(ctx, 2*time.Second, 1*time.Minute, false, func(ctx context.Context) (done bool, err error) {
nps, err := npClient.List(ctx, metav1.ListOptions{LabelSelector: "special-label=" + f.UniqueName}) nps, err := npClient.List(ctx, metav1.ListOptions{LabelSelector: "special-label=" + f.UniqueName})
framework.ExpectNoError(err) if err != nil {
gomega.Expect(nps.Items).To(gomega.BeEmpty(), "filtered list should be 0 items") return false, err
}
if len(nps.Items) > 0 {
framework.Logf("still %d network policies present, retrying ...", len(nps.Items))
return false, nil
}
return true, nil
})
if err != nil {
framework.Failf("unexpected error deleting existing network policies: %v", err)
}
}) })
}) })