github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #54956 from vladimirvivien/scaleio-remove-drv_cfg-dep

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Remove dependency on drv_cfg binary for querying ScaleIO devices

**What this PR does / why we need it**:
This PR fixes the issue where a ScleIO kubernetes plugin required additional binary `drv_cfg` to be present on the local node to work properly, making it harder for the kubelet binary to be containerized without providing access to local paths inside the container.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #54954 

**Special notes for your reviewer**:

**Release note**:

```release-note
ScaleIO driver completely removes dependency on drv_cfg binary so a Kubernetes cluster can easily run a containerized kubelet.
```
This commit is contained in:
Kubernetes Submit Queue 2017-11-03 03:18:56 -07:00 committed by GitHub
commit 6af21e8eb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkg/volume/scaleio/sio_client.go
View File

@ -373,49 +373,25 @@ func (c *sioClient) GetVolumeRefs(volId sioVolumeID) (refs int, err error) {
func (c *sioClient) Devs() (map[string]string, error) {
volumeMap := make(map[string]string)
// grab the sdc tool output
out, err := c.exec.Run(c.getSdcCmd(), "--query_vols")
if err != nil {
glog.Error(log("sdc --query_vols failed: %v", err))
return nil, err
}
// --query_vols output is a heading followed by list of attached vols as follows:
// Retrieve ? volume(s)
// VOL-ID a2b8419300000000 MDM-ID 788d9efb0a8f20cb
// ...
// parse output and store it in a map as map[<mdmID-volID>]volID
// that map is used later to retrieve device path (next section)
result := string(out)
mdmMap := make(map[string]string)
lines := strings.Split(result, "\n")
for _, line := range lines {
//line e.g.: "VOL-ID a2b8419300000000 MDM-ID 788d9efb0a8f20cb"
if strings.HasPrefix(line, "VOL-ID") {
//split[1] = volID; split[3] = mdmID
split := strings.Split(line, " ")
key := fmt.Sprintf("%s-%s", split[3], split[1])
mdmMap[key] = split[1]
}
}
files, err := c.getSioDiskPaths()
if err != nil {
return nil, err
}
for _, f := range files {
// remove emec-vol- prefix to be left with concated mdmID-volID
mdmVolumeID := strings.Replace(f.Name(), "emc-vol-", "", 1)
// split emc-vol-<mdmID>-<volumeID> to pull out volumeID
parts := strings.Split(f.Name(), "-")
if len(parts) != 4 {
return nil, errors.New("unexpected ScaleIO device name format")
}
volumeID := parts[3]
devPath, err := filepath.EvalSymlinks(fmt.Sprintf("%s/%s", sioDiskIDPath, f.Name()))
if err != nil {
glog.Error(log("devicepath-to-volID mapping error: %v", err))
return nil, err
}
// map volID to devicePath
if volumeID, ok := mdmMap[mdmVolumeID]; ok {
volumeMap[volumeID] = devPath
}
// map volumeID to devicePath
volumeMap[volumeID] = devPath
}
return volumeMap, nil
}