Merge pull request #107887 from bertinatto/fix-panic-kubelet

Fix panic in Kubelet
This commit is contained in:
Kubernetes Prow Robot 2022-02-11 12:58:07 -08:00 committed by GitHub
commit 1f041ccd54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -66,6 +66,11 @@ var _ volume.Detacher = &csiAttacher{}
var _ volume.DeviceMounter = &csiAttacher{}
func (c *csiAttacher) Attach(spec *volume.Spec, nodeName types.NodeName) (string, error) {
_, ok := c.plugin.host.(volume.KubeletVolumeHost)
if ok {
return "", errors.New("attaching volumes from the kubelet is not supported")
}
if spec == nil {
klog.Error(log("attacher.Attach missing volume.Spec"))
return "", errors.New("missing spec")
@ -404,6 +409,11 @@ var _ volume.Detacher = &csiAttacher{}
var _ volume.DeviceUnmounter = &csiAttacher{}
func (c *csiAttacher) Detach(volumeName string, nodeName types.NodeName) error {
_, ok := c.plugin.host.(volume.KubeletVolumeHost)
if ok {
return errors.New("detaching volumes from the kubelet is not supported")
}
var attachID string
var volID string