diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2024-07-11 10:16:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-11 10:16:54 +0800 |
| commit | 530bedfb151c4d1ac226c14a332fde59c7f2266c (patch) | |
| tree | 3ec616656344be9013c26929e03347bb12c35c82 /vendor/k8s.io/kubernetes/pkg/volume/csi/csi_block.go | |
| parent | Merge pull request #5545 from luomengY/automated-cherry-pick-of-#5467-upstrea... (diff) | |
| parent | update k8s version to v1.27.15 in CI (diff) | |
| download | kubeedge-530bedfb151c4d1ac226c14a332fde59c7f2266c.tar.gz | |
Merge pull request #5699 from Shelley-BaoYue/bump-k8s-v1.27.15
Bump k8s from v1.27.7 to v1.27.15
Diffstat (limited to 'vendor/k8s.io/kubernetes/pkg/volume/csi/csi_block.go')
| -rw-r--r-- | vendor/k8s.io/kubernetes/pkg/volume/csi/csi_block.go | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_block.go b/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_block.go index 3e68b7bb2..fa2570b42 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_block.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_block.go @@ -319,7 +319,9 @@ func (m *csiBlockMapper) SetUpDevice() (string, error) { csiClient, err := m.csiClientGetter.Get() if err != nil { - return "", errors.New(log("blockMapper.SetUpDevice failed to get CSI client: %v", err)) + // Treat the absence of the CSI driver as a transient error + // See https://github.com/kubernetes/kubernetes/issues/120268 + return "", volumetypes.NewTransientOperationFailure(log("blockMapper.SetUpDevice failed to get CSI client: %v", err)) } // Call NodeStageVolume @@ -379,7 +381,9 @@ func (m *csiBlockMapper) MapPodDevice() (string, error) { csiClient, err := m.csiClientGetter.Get() if err != nil { - return "", errors.New(log("blockMapper.MapPodDevice failed to get CSI client: %v", err)) + // Treat the absence of the CSI driver as a transient error + // See https://github.com/kubernetes/kubernetes/issues/120268 + return "", volumetypes.NewTransientOperationFailure(log("blockMapper.MapPodDevice failed to get CSI client: %v", err)) } // Call NodePublishVolume @@ -444,7 +448,9 @@ func (m *csiBlockMapper) TearDownDevice(globalMapPath, devicePath string) error csiClient, err := m.csiClientGetter.Get() if err != nil { - return errors.New(log("blockMapper.TearDownDevice failed to get CSI client: %v", err)) + // Treat the absence of the CSI driver as a transient error + // See https://github.com/kubernetes/kubernetes/issues/120268 + return volumetypes.NewTransientOperationFailure(log("blockMapper.TearDownDevice failed to get CSI client: %v", err)) } // Call NodeUnstageVolume @@ -506,7 +512,9 @@ func (m *csiBlockMapper) UnmapPodDevice() error { csiClient, err := m.csiClientGetter.Get() if err != nil { - return errors.New(log("blockMapper.UnmapPodDevice failed to get CSI client: %v", err)) + // Treat the absence of the CSI driver as a transient error + // See https://github.com/kubernetes/kubernetes/issues/120268 + return volumetypes.NewTransientOperationFailure(log("blockMapper.UnmapPodDevice failed to get CSI client: %v", err)) } ctx, cancel := createCSIOperationContext(m.spec, csiTimeout) |