0c5c3d8bb9
This patch removes pkg/util/mount completely, and replaces it with the mount package now located at k8s.io/utils/mount. The code found at k8s.io/utils/mount was moved there from pkg/util/mount, so the code is identical, just no longer in-tree to k/k.
74 lines
2.4 KiB
Go
74 lines
2.4 KiB
Go
/*
|
|
Copyright 2017 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package flexvolume
|
|
|
|
import (
|
|
"time"
|
|
|
|
"k8s.io/klog"
|
|
"k8s.io/utils/mount"
|
|
|
|
"k8s.io/apimachinery/pkg/types"
|
|
"k8s.io/kubernetes/pkg/volume"
|
|
)
|
|
|
|
type attacherDefaults flexVolumeAttacher
|
|
|
|
// Attach is part of the volume.Attacher interface
|
|
func (a *attacherDefaults) Attach(spec *volume.Spec, hostName types.NodeName) (string, error) {
|
|
klog.Warning(logPrefix(a.plugin.flexVolumePlugin), "using default Attach for volume ", spec.Name(), ", host ", hostName)
|
|
return "", nil
|
|
}
|
|
|
|
// WaitForAttach is part of the volume.Attacher interface
|
|
func (a *attacherDefaults) WaitForAttach(spec *volume.Spec, devicePath string, timeout time.Duration) (string, error) {
|
|
klog.Warning(logPrefix(a.plugin.flexVolumePlugin), "using default WaitForAttach for volume ", spec.Name(), ", device ", devicePath)
|
|
return devicePath, nil
|
|
}
|
|
|
|
// GetDeviceMountPath is part of the volume.Attacher interface
|
|
func (a *attacherDefaults) GetDeviceMountPath(spec *volume.Spec, mountsDir string) (string, error) {
|
|
return a.plugin.getDeviceMountPath(spec)
|
|
}
|
|
|
|
// MountDevice is part of the volume.Attacher interface
|
|
func (a *attacherDefaults) MountDevice(spec *volume.Spec, devicePath string, deviceMountPath string, mounter mount.Interface) error {
|
|
klog.Warning(logPrefix(a.plugin.flexVolumePlugin), "using default MountDevice for volume ", spec.Name(), ", device ", devicePath, ", deviceMountPath ", deviceMountPath)
|
|
|
|
volSourceFSType, err := getFSType(spec)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
readOnly, err := getReadOnly(spec)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
options := make([]string, 0)
|
|
|
|
if readOnly {
|
|
options = append(options, "ro")
|
|
} else {
|
|
options = append(options, "rw")
|
|
}
|
|
|
|
diskMounter := &mount.SafeFormatAndMount{Interface: mounter, Exec: a.plugin.host.GetExec(a.plugin.GetPluginName())}
|
|
|
|
return diskMounter.FormatAndMount(devicePath, deviceMountPath, volSourceFSType, options)
|
|
}
|