Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport E2E fixes #4742

Merged
merged 13 commits into from
Oct 10, 2024
Merged

Backport E2E fixes #4742

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
da710de
Services E2Es: Reset test variables before each test
kyrtapz Sep 19, 2024
7d1f869
egressfirewall: avoid nil dereference on node delete
npinaeva May 6, 2024
cebf08e
e2e: Add applyEF function
npinaeva May 22, 2024
2e105cb
e2e: add checkConnectivity functions for EF tests.
npinaeva May 22, 2024
7a2daaf
e2e: use external containers for EF connectivity checks to make it
npinaeva May 22, 2024
422f5fa
e2e: move tests using external containers into their own context to
npinaeva May 22, 2024
1838308
e2e: Add EF test to make sure internal connections (pod2pod) are not
npinaeva May 22, 2024
1ad8c43
e2e: add chais test before node test.
npinaeva May 22, 2024
230ea3d
e2e: move node2ndaryIPs-related functionality to the only test case
npinaeva May 22, 2024
34ac5fc
e2e: remove duplicated functionality from the node-selector tests.
npinaeva May 22, 2024
f32c68f
e2e: remove egressfirewall from ipv6 exceptions
npinaeva May 22, 2024
b09216d
e2e: go mod tidy
npinaeva May 23, 2024
43f838e
e2e: Fix secondaryIPV6Subnet mask
kyrtapz Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions test/e2e/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,11 +708,8 @@ var _ = ginkgo.Describe("Services", func() {
var nodes *v1.NodeList
var err error
nodeIPs := make(map[string]map[int]string)
var egressPod *v1.Pod
var egressNode string
targetSecondaryNode := node{
name: "egressSecondaryTargetNode-allowed",
}
var targetSecondaryNode node

const (
endpointHTTPPort = 80
Expand All @@ -722,6 +719,14 @@ var _ = ginkgo.Describe("Services", func() {
clientContainerName = "npclient"
)

ginkgo.BeforeEach(func() {
nodeIPs = make(map[string]map[int]string)
egressNode = ""
targetSecondaryNode = node{
name: "egressSecondaryTargetNode-allowed",
}
})

ginkgo.AfterEach(func() {
ginkgo.By("Cleaning up external container")
deleteClusterExternalContainer(clientContainerName)
Expand All @@ -745,7 +750,6 @@ var _ = ginkgo.Describe("Services", func() {
e2ekubectl.RunKubectlOrDie("default", "delete", "eip", "egressip", "--ignore-not-found=true")
e2ekubectl.RunKubectlOrDie("default", "label", "node", egressNode, "k8s.ovn.org/egress-assignable-")
tearDownNetworkAndTargetForMultiNIC([]string{egressNode}, targetSecondaryNode)
targetSecondaryNode.nodeIP = ""
}
})

Expand Down Expand Up @@ -924,7 +928,7 @@ var _ = ginkgo.Describe("Services", func() {
}

ginkgo.By("Choosing egressIP pod")
egressPod = endPoints[0]
egressPod := endPoints[0]
framework.Logf("EgressIP pod is %s/%s", endPoints[0].Namespace, endPoints[0].Name)

ginkgo.By("Label egress node" + egressNode + " create external container to send egress traffic to via secondary MultiNIC EIP")
Expand Down
Loading