github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Extract common function for OpenStack checking.

Browse Source
This commit is contained in:
Jan Safranek 2015-12-14 14:55:26 +01:00 committed by Paul Morie
parent 2f06ebf9b7
commit e8f08a969c
2 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/volume/cinder/cinder.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package cinder package cinder
import ( import (
"errors"
"fmt" "fmt"
"os" "os"
"path" "path"
@ -24,6 +25,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/cloudprovider/providers/openstack"
"k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/types"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/exec" "k8s.io/kubernetes/pkg/util/exec"
@ -146,6 +148,20 @@ func (plugin *cinderPlugin) newProvisionerInternal(options volume.VolumeOptions,
}, nil }, nil
} }
func (plugin *cinderPlugin) getCloudProvider() (*openstack.OpenStack, error) {
cloud := plugin.host.GetCloudProvider()
if cloud == nil {
glog.Errorf("Cloud provider not initialized properly")
return nil, errors.New("Cloud provider not initialized properly")
}
os := cloud.(*openstack.OpenStack)
if os == nil {
return nil, errors.New("Invalid cloud provider: expected OpenStack")
}
return os, nil
}
// Abstract interface to PD operations. // Abstract interface to PD operations.
type cdManager interface { type cdManager interface {
// Attaches the disk to the kubelet's host machine. // Attaches the disk to the kubelet's host machine.

37
pkg/volume/cinder/cinder_util.go
View File

@ -26,7 +26,6 @@ import (
"time" "time"
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/cloudprovider/providers/openstack"
"k8s.io/kubernetes/pkg/util/exec" "k8s.io/kubernetes/pkg/util/exec"
"k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/util/mount"
"k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume"
@ -41,12 +40,11 @@ func (util *CinderDiskUtil) AttachDisk(b *cinderVolumeBuilder, globalPDPath stri
if b.readOnly { if b.readOnly {
options = append(options, "ro") options = append(options, "ro")
} }
cloud := b.plugin.host.GetCloudProvider() cloud, err := b.plugin.getCloudProvider()
if cloud == nil { if err != nil {
glog.Errorf("Cloud provider not initialized properly") return err
return errors.New("Cloud provider not initialized properly")
} }
diskid, err := cloud.(*openstack.OpenStack).AttachDisk(b.pdName) diskid, err := cloud.AttachDisk(b.pdName)
if err != nil { if err != nil {
return err return err
} }
@ -120,13 +118,12 @@ func (util *CinderDiskUtil) DetachDisk(cd *cinderVolumeCleaner) error {
} }
glog.V(2).Infof("Successfully unmounted main device: %s\n", globalPDPath) glog.V(2).Infof("Successfully unmounted main device: %s\n", globalPDPath)
cloud := cd.plugin.host.GetCloudProvider() cloud, err := cd.plugin.getCloudProvider()
if cloud == nil { if err != nil {
glog.Errorf("Cloud provider not initialized properly") return err
return errors.New("Cloud provider not initialized properly")
} }
if err := cloud.(*openstack.OpenStack).DetachDisk(cd.pdName); err != nil { if err = cloud.DetachDisk(cd.pdName); err != nil {
return err return err
} }
glog.V(2).Infof("Successfully detached cinder volume %s", cd.pdName) glog.V(2).Infof("Successfully detached cinder volume %s", cd.pdName)
@ -134,13 +131,12 @@ func (util *CinderDiskUtil) DetachDisk(cd *cinderVolumeCleaner) error {
} }
func (util *CinderDiskUtil) DeleteVolume(cd *cinderVolumeDeleter) error { func (util *CinderDiskUtil) DeleteVolume(cd *cinderVolumeDeleter) error {
cloud := cd.plugin.host.GetCloudProvider() cloud, err := cd.plugin.getCloudProvider()
if cloud == nil { if err != nil {
glog.Errorf("Cloud provider not initialized properly") return err
return errors.New("Cloud provider not initialized properly")
} }
if err := cloud.(*openstack.OpenStack).DeleteVolume(cd.pdName); err != nil { if err = cloud.DeleteVolume(cd.pdName); err != nil {
glog.V(2).Infof("Error deleting cinder volume %s: %v", cd.pdName, err) glog.V(2).Infof("Error deleting cinder volume %s: %v", cd.pdName, err)
return err return err
} }
@ -149,16 +145,15 @@ func (util *CinderDiskUtil) DeleteVolume(cd *cinderVolumeDeleter) error {
} }
func (util *CinderDiskUtil) CreateVolume(c *cinderVolumeProvisioner) (volumeID string, volumeSizeGB int, err error) { func (util *CinderDiskUtil) CreateVolume(c *cinderVolumeProvisioner) (volumeID string, volumeSizeGB int, err error) {
cloud := c.plugin.host.GetCloudProvider() cloud, err := c.plugin.getCloudProvider()
if cloud == nil { if err != nil {
glog.Errorf("Cloud provider not initialized properly") return "", 0, err
return "", 0, errors.New("Cloud provider not initialized properly")
} }
volSizeBytes := c.options.Capacity.Value() volSizeBytes := c.options.Capacity.Value()
// Cinder works with gigabytes, convert to GiB with rounding up // Cinder works with gigabytes, convert to GiB with rounding up
volSizeGB := int(volume.RoundUpSize(volSizeBytes, 1024*1024*1024)) volSizeGB := int(volume.RoundUpSize(volSizeBytes, 1024*1024*1024))
name, err := cloud.(*openstack.OpenStack).CreateVolume(volSizeGB) name, err := cloud.CreateVolume(volSizeGB)
if err != nil { if err != nil {
glog.V(2).Infof("Error creating cinder volume: %v", err) glog.V(2).Infof("Error creating cinder volume: %v", err)
return "", 0, err return "", 0, err