diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 0dd42697f04..c809654977e 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -395,6 +395,7 @@ const ( // owner: @dashpole // alpha: v1.13 + // beta: v1.15 // // Enables the kubelet's pod resources grpc endpoint KubeletPodResources featuregate.Feature = "KubeletPodResources" @@ -545,7 +546,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS VolumeSnapshotDataSource: {Default: false, PreRelease: featuregate.Alpha}, ProcMountType: {Default: false, PreRelease: featuregate.Alpha}, TTLAfterFinished: {Default: false, PreRelease: featuregate.Alpha}, - KubeletPodResources: {Default: false, PreRelease: featuregate.Alpha}, + KubeletPodResources: {Default: true, PreRelease: featuregate.Beta}, WindowsGMSA: {Default: false, PreRelease: featuregate.Alpha}, LocalStorageCapacityIsolationFSQuotaMonitoring: {Default: false, PreRelease: featuregate.Alpha}, NonPreemptingPriority: {Default: false, PreRelease: featuregate.Alpha}, diff --git a/pkg/kubelet/util/util_unix.go b/pkg/kubelet/util/util_unix.go index 46e8e2c5a88..05840582fdd 100644 --- a/pkg/kubelet/util/util_unix.go +++ b/pkg/kubelet/util/util_unix.go @@ -20,6 +20,7 @@ package util import ( "fmt" + "io/ioutil" "net" "net/url" "os" @@ -51,7 +52,30 @@ func CreateListener(endpoint string) (net.Listener, error) { return nil, fmt.Errorf("failed to unlink socket file %q: %v", addr, err) } - return net.Listen(protocol, addr) + if err := os.MkdirAll(filepath.Dir(addr), 0750); err != nil { + return nil, fmt.Errorf("error creating socket directory %q: %v", filepath.Dir(addr), err) + } + + // Create the socket on a tempfile and move it to the destination socket to handle improprer cleanup + file, err := ioutil.TempFile(filepath.Dir(addr), "") + if err != nil { + return nil, fmt.Errorf("failed to create temporary file: %v", err) + } + + if err := os.Remove(file.Name()); err != nil { + return nil, fmt.Errorf("failed to remove temporary file: %v", err) + } + + l, err := net.Listen(protocol, file.Name()) + if err != nil { + return nil, err + } + + if err = os.Rename(file.Name(), addr); err != nil { + return nil, fmt.Errorf("failed to move temporary file to addr %q: %v", addr, err) + } + + return l, nil } // GetAddressAndDialer returns the address parsed from the given endpoint and a dialer.