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

Merge pull request #110014 from claudiubelu/windows-tests/fix-long-hostname

Browse Source 
tests Windows: Fixes test failures related to COMPUTERNAMEs being truncated
This commit is contained in:
Kubernetes Prow Robot 2022-12-15 12:15:35 -08:00 committed by GitHub
commit c43e83ceed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e/windows/host_process.go
View File

@ -68,8 +68,11 @@ const (
Write-Output $c Write-Output $c
throw "Contents of /etc/secret/foo.txt are not as expected" throw "Contents of /etc/secret/foo.txt are not as expected"
} }
if ($env:NODE_NAME_TEST -ne $env:COMPUTERNAME) { # Windows ComputerNames cannot exceed 15 characters, which means that the $env:COMPUTERNAME
throw "NODE_NAME_TEST env var ($env:NODE_NAME_TEST) does not equal COMPUTERNAME ($env:COMPUTERNAME)" # can only be a substring of $env:NODE_NAME_TEST. We compare it with the hostname instead.
# The following comparison is case insensitive.
if ($env:NODE_NAME_TEST -ine "$(hostname)") {
throw "NODE_NAME_TEST env var ($env:NODE_NAME_TEST) does not equal hostname"
} }
Write-Output "SUCCESS"` Write-Output "SUCCESS"`
) )
@ -99,6 +102,8 @@ var _ = SIGDescribe("[Feature:WindowsHostProcessContainers] [MinimumKubeletVersi
ginkgo.By("scheduling a pod with a container that verifies %COMPUTERNAME% matches selected node name") ginkgo.By("scheduling a pod with a container that verifies %COMPUTERNAME% matches selected node name")
image := imageutils.GetConfig(imageutils.BusyBox) image := imageutils.GetConfig(imageutils.BusyBox)
podName := "host-process-test-pod" podName := "host-process-test-pod"
// We're passing this to powershell.exe -Command. Inside, we must use apostrophes for strings.
command := fmt.Sprintf(`& {if ('%s' -ine "$(hostname)") { exit -1 }}`, targetNode.Name)
pod := &v1.Pod{ pod := &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: podName, Name: podName,
@ -115,7 +120,7 @@ var _ = SIGDescribe("[Feature:WindowsHostProcessContainers] [MinimumKubeletVersi
{ {
Image: image.GetE2EImage(), Image: image.GetE2EImage(),
Name: "computer-name-test", Name: "computer-name-test",
Command: []string{"cmd.exe", "/K", "IF", "NOT", "%COMPUTERNAME%", "==", targetNode.Name, "(", "exit", "-1", ")"}, Command: []string{"powershell.exe", "-Command", command},
}, },
}, },
RestartPolicy: v1.RestartPolicyNever, RestartPolicy: v1.RestartPolicyNever,