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

Fix comparison between FQDN and hostname #104408

Merged
merged 1 commit into from
Aug 28, 2021
Merged

Fix comparison between FQDN and hostname #104408

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions test/e2e/network/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2211,7 +2211,8 @@ var _ = common.SIGDescribe("Services", func() {
}
node0 := nodes.Items[0]
node1 := nodes.Items[1]

// split node name to ensure only hostname (and not FQDN) is compared with return from agnhost's /hostname endpoint.
node0Hostname := strings.Split(node0.Name, ".")[0]
serviceName := "svc-itp"
ns := f.Namespace.Name
servicePort := 80
Expand Down Expand Up @@ -2262,7 +2263,7 @@ var _ = common.SIGDescribe("Services", func() {
for i := 0; i < 5; i++ {
// the first pause pod should be on the same node as the webserver, so it can connect to the local pod using clusterIP
// note that the expected hostname is the node name because the backend pod is on host network
execHostnameTest(*pausePod0, serviceAddress, node0.Name)
execHostnameTest(*pausePod0, serviceAddress, node0Hostname)

// the second pause pod is on a different node, so it should see a connection error every time
cmd := fmt.Sprintf(`curl -q -s --connect-timeout 5 %s/hostname`, serviceAddress)
Expand Down Expand Up @@ -2291,7 +2292,7 @@ var _ = common.SIGDescribe("Services", func() {
for i := 0; i < 5; i++ {
// the first pause pod should be on the same node as the webserver, so it can connect to the local pod using clusterIP
// note that the expected hostname is the node name because the backend pod is on host network
execHostnameTest(*pausePod2, serviceAddress, node0.Name)
execHostnameTest(*pausePod2, serviceAddress, node0Hostname)

// the second pause pod is on a different node, so it should see a connection error every time
cmd := fmt.Sprintf(`curl -q -s --connect-timeout 5 %s/hostname`, serviceAddress)
Expand Down