Merge pull request kubernetes#131464 from pacoxu/fix-windows

k8s-ci-robot · web-flow · commit 736f03bb8818 · 2025-04-25T06:24:31.000-07:00
[kubelet] fix nil pointer panic on windows node
diff --git a/pkg/volume/volume_unsupported.go b/pkg/volume/volume_unsupported.go
@@ -27,7 +27,7 @@ import (
 
 // NewVolumeOwnership returns an interface that can be used to recursively change volume permissions and ownership
 func NewVolumeOwnership(mounter Mounter, dir string, fsGroup *int64, fsGroupChangePolicy *v1.PodFSGroupChangePolicy, completeFunc func(types.CompleteFuncParam)) VolumeOwnershipChanger {
-	return nil
+	return &VolumeOwnership{}
 }
 
 func (vo *VolumeOwnership) AddProgressNotifier(pod *v1.Pod, recorder record.EventRecorder) VolumeOwnershipChanger {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`
`28`	`28`	`// NewVolumeOwnership returns an interface that can be used to recursively change volume permissions and ownership`
`29`	`29`	`func NewVolumeOwnership(mounter Mounter, dir string, fsGroup int64, fsGroupChangePolicy v1.PodFSGroupChangePolicy, completeFunc func(types.CompleteFuncParam)) VolumeOwnershipChanger {`
`30`		`- return nil`
	`30`	`+ return &VolumeOwnership{}`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`func (vo VolumeOwnership) AddProgressNotifier(pod v1.Pod, recorder record.EventRecorder) VolumeOwnershipChanger {`