github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #104408 from martinkennelly/fix_fqdn_hostname_mismatch

Browse Source 
Fix comparison between FQDN and hostname
This commit is contained in:
Kubernetes Prow Robot 2021-08-27 19:58:52 -07:00 committed by GitHub
commit 80feff6f40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/network/service.go
View File

@ -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
@ -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)
@ -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)