Merge pull request kubernetes#126323 from saschagrunert/image-volume-runtime-panic

k8s-ci-robot · web-flow · commit ceb58a4dbc67 · 2024-07-24T04:57:06.000-07:00
Fix runtime panic in imagevolume `CanSupport` method
diff --git a/pkg/volume/image/image.go b/pkg/volume/image/image.go
@@ -49,7 +49,7 @@ func (o *imagePlugin) GetPluginName() string                           { return
 func (o *imagePlugin) GetVolumeName(spec *volume.Spec) (string, error) { return o.spec.Name(), nil }
 
 func (o *imagePlugin) CanSupport(spec *volume.Spec) bool {
-	return spec.Volume.Image != nil
+	return spec != nil && spec.Volume != nil && spec.Volume.Image != nil
 }
 
 func (o *imagePlugin) NewMounter(spec *volume.Spec, podRef *v1.Pod) (volume.Mounter, error) {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func (o *imagePlugin) GetPluginName() string { return`
`49`	`49`	`func (o imagePlugin) GetVolumeName(spec volume.Spec) (string, error) { return o.spec.Name(), nil }`
`50`	`50`
`51`	`51`	`func (o imagePlugin) CanSupport(spec volume.Spec) bool {`
`52`		`- return spec.Volume.Image != nil`
	`52`	`+ return spec != nil && spec.Volume != nil && spec.Volume.Image != nil`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`func (o imagePlugin) NewMounter(spec volume.Spec, podRef *v1.Pod) (volume.Mounter, error) {`