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

Merge pull request #117616 from claudiubelu/fix-kubelet-util-windows-ut

Browse Source 
unit tests: Fixes kubelet util unit tests for Windows
This commit is contained in:
Kubernetes Prow Robot 2023-05-10 19:51:09 -07:00 committed by GitHub
commit 122a459dcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/util/util_windows.go
View File

@ -24,6 +24,7 @@ import (
"fmt" "fmt"
"net" "net"
"net/url" "net/url"
"os"
"path/filepath" "path/filepath"
"strings" "strings"
"syscall" "syscall"
@ -165,6 +166,11 @@ func IsUnixDomainSocket(filePath string) (bool, error) {
// does NOT work in 1809 if the socket file is created within a bind mounted directory by a container // does NOT work in 1809 if the socket file is created within a bind mounted directory by a container
// and the FSCTL is issued in the host by the kubelet. // and the FSCTL is issued in the host by the kubelet.
// If the file does not exist, it cannot be a Unix domain socket.
if _, err := os.Stat(filePath); os.IsNotExist(err) {
return false, fmt.Errorf("File %s not found. Err: %v", filePath, err)
}
klog.V(6).InfoS("Function IsUnixDomainSocket starts", "filePath", filePath) klog.V(6).InfoS("Function IsUnixDomainSocket starts", "filePath", filePath)
// As detailed in https://github.com/kubernetes/kubernetes/issues/104584 we cannot rely // As detailed in https://github.com/kubernetes/kubernetes/issues/104584 we cannot rely
// on the Unix Domain socket working on the very first try, hence the potential need to // on the Unix Domain socket working on the very first try, hence the potential need to

2
pkg/kubelet/util/util_windows_test.go
View File

@ -22,6 +22,8 @@ package util
import ( import (
"fmt" "fmt"
"math/rand" "math/rand"
"net"
"os"
"reflect" "reflect"
"runtime" "runtime"
"sync" "sync"