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

Merge pull request #96305 from twosigma/fixe2etestbug

Browse Source 
Fixing expected pod subdomain to match framework.TestContext.ClusterD…
This commit is contained in:
Kubernetes Prow Robot 2020-11-09 08:22:26 -08:00 committed by GitHub
commit 23839ba649
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e_node/pod_hostnamefqdn_test.go
View File

@ -71,11 +71,6 @@ func testPod(podnamebase string) *v1.Pod {
var _ = SIGDescribe("Hostname of Pod [Feature:SetHostnameAsFQDN][NodeFeature:SetHostnameAsFQDN]", func() { var _ = SIGDescribe("Hostname of Pod [Feature:SetHostnameAsFQDN][NodeFeature:SetHostnameAsFQDN]", func() {
f := framework.NewDefaultFramework("hostfqdn") f := framework.NewDefaultFramework("hostfqdn")
dnsDomain := "cluster.local"
if cdn := framework.TestContext.ClusterDNSDomain; cdn != "" {
dnsDomain = cdn
}
/* /*
Release: v1.19 Release: v1.19
Testname: Create Pod without fully qualified domain name (FQDN) Testname: Create Pod without fully qualified domain name (FQDN)
@ -119,7 +114,7 @@ var _ = SIGDescribe("Hostname of Pod [Feature:SetHostnameAsFQDN][NodeFeature:Set
// Set PodSpec subdomain field to generate FQDN for pod // Set PodSpec subdomain field to generate FQDN for pod
pod.Spec.Subdomain = subdomain pod.Spec.Subdomain = subdomain
// Expected Pod FQDN // Expected Pod FQDN
hostFQDN := fmt.Sprintf("%s.%s.%s.svc.%s", pod.ObjectMeta.Name, subdomain, f.Namespace.Name, dnsDomain) hostFQDN := fmt.Sprintf("%s.%s.%s.svc.%s", pod.ObjectMeta.Name, subdomain, f.Namespace.Name, framework.TestContext.ClusterDNSDomain)
output := []string{fmt.Sprintf("%s;%s;", pod.ObjectMeta.Name, hostFQDN)} output := []string{fmt.Sprintf("%s;%s;", pod.ObjectMeta.Name, hostFQDN)}
// Create Pod // Create Pod
f.TestContainerOutput("shortname and fqdn", pod, 0, output) f.TestContainerOutput("shortname and fqdn", pod, 0, output)
@ -141,7 +136,7 @@ var _ = SIGDescribe("Hostname of Pod [Feature:SetHostnameAsFQDN][NodeFeature:Set
setHostnameAsFQDN := true setHostnameAsFQDN := true
pod.Spec.SetHostnameAsFQDN = &setHostnameAsFQDN pod.Spec.SetHostnameAsFQDN = &setHostnameAsFQDN
// Expected Pod FQDN // Expected Pod FQDN
hostFQDN := fmt.Sprintf("%s.%s.%s.svc.%s", pod.ObjectMeta.Name, subdomain, f.Namespace.Name, dnsDomain) hostFQDN := fmt.Sprintf("%s.%s.%s.svc.%s", pod.ObjectMeta.Name, subdomain, f.Namespace.Name, framework.TestContext.ClusterDNSDomain)
// Fail if FQDN is longer than 64 characters, otherwise the Pod will remain pending until test timeout. // Fail if FQDN is longer than 64 characters, otherwise the Pod will remain pending until test timeout.
// In Linux, 64 characters is the limit of the hostname kernel field, which this test sets to the pod FQDN. // In Linux, 64 characters is the limit of the hostname kernel field, which this test sets to the pod FQDN.
framework.ExpectEqual(len(hostFQDN) < 65, true, fmt.Sprintf("The FQDN of the Pod cannot be longer than 64 characters, requested %s which is %d characters long.", hostFQDN, len(hostFQDN))) framework.ExpectEqual(len(hostFQDN) < 65, true, fmt.Sprintf("The FQDN of the Pod cannot be longer than 64 characters, requested %s which is %d characters long.", hostFQDN, len(hostFQDN)))