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

Merge pull request #107786 from shiftstack/fqdn_hostname_comparison

Browse Source 
Ensure the execHostnameTest() compares hostnames
This commit is contained in:
Kubernetes Prow Robot 2022-01-27 00:58:02 -08:00 committed by GitHub
commit 3f6793de48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2214,8 +2214,7 @@ var _ = common.SIGDescribe("Services", func() {
} }
node0 := nodes.Items[0] node0 := nodes.Items[0]
node1 := nodes.Items[1] 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" serviceName := "svc-itp"
ns := f.Namespace.Name ns := f.Namespace.Name
servicePort := 80 servicePort := 80
@ -2266,7 +2265,7 @@ var _ = common.SIGDescribe("Services", func() {
for i := 0; i < 5; i++ { 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 // 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 // note that the expected hostname is the node name because the backend pod is on host network
execHostnameTest(*pausePod0, serviceAddress, node0Hostname) execHostnameTest(*pausePod0, serviceAddress, node0.Name)
// the second pause pod is on a different node, so it should see a connection error every time // 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) cmd := fmt.Sprintf(`curl -q -s --connect-timeout 5 %s/hostname`, serviceAddress)
@ -2295,7 +2294,7 @@ var _ = common.SIGDescribe("Services", func() {
for i := 0; i < 5; i++ { 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 // 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 // note that the expected hostname is the node name because the backend pod is on host network
execHostnameTest(*pausePod2, serviceAddress, node0Hostname) execHostnameTest(*pausePod2, serviceAddress, node0.Name)
// the second pause pod is on a different node, so it should see a connection error every time // 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) cmd := fmt.Sprintf(`curl -q -s --connect-timeout 5 %s/hostname`, serviceAddress)

8
test/e2e/network/util.go
View File

@ -143,6 +143,8 @@ func execSourceIPTest(sourcePod v1.Pod, targetAddr string) (string, string) {
// execHostnameTest executes curl to access "/hostname" endpoint on target address // execHostnameTest executes curl to access "/hostname" endpoint on target address
// from given Pod to check the hostname of the target destination. // from given Pod to check the hostname of the target destination.
// It also converts FQDNs to hostnames, so if an FQDN is passed as
// targetHostname only the hostname part will be considered for comparison.
func execHostnameTest(sourcePod v1.Pod, targetAddr, targetHostname string) { func execHostnameTest(sourcePod v1.Pod, targetAddr, targetHostname string) {
var ( var (
err error err error
@ -166,8 +168,12 @@ func execHostnameTest(sourcePod v1.Pod, targetAddr, targetHostname string) {
break break
} }
// Ensure we're comparing hostnames and not FQDNs
targetHostname = strings.Split(targetHostname, ".")[0]
hostname := strings.TrimSpace(strings.Split(stdout, ".")[0])
framework.ExpectNoError(err) framework.ExpectNoError(err)
framework.ExpectEqual(strings.TrimSpace(stdout), targetHostname) framework.ExpectEqual(hostname, targetHostname)
} }
// createSecondNodePortService creates a service with the same selector as config.NodePortService and same HTTP Port // createSecondNodePortService creates a service with the same selector as config.NodePortService and same HTTP Port