mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-09 16:00:22 +00:00
rbd: healer detect Kubernetes version for right StagingTargetPath
Kubernetes 1.24 and newer use a different path for staging the volume.
That means the CSI-driver is requested to mount the volume at an other
location, compared to previous versions of Kubernetes. CSI-drivers
implementing the volumeHealer, must receive the correct path, otherwise
the after a nodeplugin restart the NBD mounts will bailout attempting
to NodeStageVolume() call and return an error.
See-also: kubernetes/kubernetes#107065
Fixes: #3176
Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
(cherry picked from commit 1da446d2f2
)
This commit is contained in:
parent
471c1342b1
commit
d18eaceab4
@ -54,7 +54,7 @@ const (
|
|||||||
defaultNS = "default"
|
defaultNS = "default"
|
||||||
|
|
||||||
defaultPluginPath = "/var/lib/kubelet/plugins"
|
defaultPluginPath = "/var/lib/kubelet/plugins"
|
||||||
defaultStagingPath = defaultPluginPath + "/kubernetes.io/csi/pv/"
|
defaultStagingPath = defaultPluginPath + "/kubernetes.io/csi/"
|
||||||
)
|
)
|
||||||
|
|
||||||
var conf util.Config
|
var conf util.Config
|
||||||
|
@ -18,6 +18,9 @@ package rbd
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"crypto/sha256"
|
||||||
|
"fmt"
|
||||||
|
"path/filepath"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/ceph/ceph-csi/internal/util"
|
"github.com/ceph/ceph-csi/internal/util"
|
||||||
@ -70,11 +73,39 @@ func getSecret(c *k8s.Clientset, ns, name string) (map[string]string, error) {
|
|||||||
return deviceSecret, nil
|
return deviceSecret, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// formatStagingTargetPath returns the path where the volume is expected to be
|
||||||
|
// mounted (or the block-device is attached/mapped). Different Kubernetes
|
||||||
|
// version use different paths.
|
||||||
|
func formatStagingTargetPath(c *k8s.Clientset, pv *v1.PersistentVolume, stagingPath string) (string, error) {
|
||||||
|
// Kubernetes 1.24+ uses a hash of the volume-id in the path name
|
||||||
|
unique := sha256.Sum256([]byte(pv.Spec.CSI.VolumeHandle))
|
||||||
|
targetPath := filepath.Join(stagingPath, pv.Spec.CSI.Driver, fmt.Sprintf("%x", unique), "globalmount")
|
||||||
|
|
||||||
|
major, minor, err := kubeclient.GetServerVersion(c)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to get server version: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 'encode' major/minor in a single integer
|
||||||
|
legacyVersion := 1024 // Kubernetes 1.24 => 1 * 1000 + 24
|
||||||
|
if ((major * 1000) + minor) < (legacyVersion) {
|
||||||
|
// path in Kubernetes < 1.24
|
||||||
|
targetPath = filepath.Join(stagingPath, "pv", pv.Name, "globalmount")
|
||||||
|
}
|
||||||
|
|
||||||
|
return targetPath, nil
|
||||||
|
}
|
||||||
|
|
||||||
func callNodeStageVolume(ns *NodeServer, c *k8s.Clientset, pv *v1.PersistentVolume, stagingPath string) error {
|
func callNodeStageVolume(ns *NodeServer, c *k8s.Clientset, pv *v1.PersistentVolume, stagingPath string) error {
|
||||||
publishContext := make(map[string]string)
|
publishContext := make(map[string]string)
|
||||||
|
|
||||||
volID := pv.Spec.PersistentVolumeSource.CSI.VolumeHandle
|
volID := pv.Spec.PersistentVolumeSource.CSI.VolumeHandle
|
||||||
stagingParentPath := stagingPath + pv.Name + "/globalmount"
|
stagingParentPath, err := formatStagingTargetPath(c, pv, stagingPath)
|
||||||
|
if err != nil {
|
||||||
|
log.ErrorLogMsg("formatStagingTargetPath failed volID: %s, err: %v", volID, err)
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
log.DefaultLog("sending nodeStageVolume for volID: %s, stagingPath: %s",
|
log.DefaultLog("sending nodeStageVolume for volID: %s, stagingPath: %s",
|
||||||
volID, stagingParentPath)
|
volID, stagingParentPath)
|
||||||
|
Loading…
Reference in New Issue
Block a user