github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace variable name to be more go friendly. 

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
pull/6/head
Humble Chirammal 2017-04-21 12:38:13 +05:30
parent bf532a30e3
commit dddd4783a4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/volume/glusterfs/glusterfs.go
View File

@ -134,16 +134,16 @@ func (plugin *glusterfsPlugin) GetAccessModes() []v1.PersistentVolumeAccessMode
func (plugin *glusterfsPlugin) NewMounter(spec *volume.Spec, pod *v1.Pod, _ volume.VolumeOptions) (volume.Mounter, error) {
source, _ := plugin.getGlusterVolumeSource(spec)
ep_name := source.EndpointsName
epName := source.EndpointsName
// PVC/POD is in same ns.
ns := pod.Namespace
kubeClient := plugin.host.GetKubeClient()
if kubeClient == nil {
return nil, fmt.Errorf("glusterfs: failed to get kube client to initialize mounter")
}
ep, err := kubeClient.Core().Endpoints(ns).Get(ep_name, metav1.GetOptions{})
ep, err := kubeClient.Core().Endpoints(ns).Get(epName, metav1.GetOptions{})
if err != nil {
glog.Errorf("glusterfs: failed to get endpoints %s[%v]", ep_name, err)
glog.Errorf("glusterfs: failed to get endpoints %s[%v]", epName, err)
return nil, err
}
glog.V(1).Infof("glusterfs: endpoints %v", ep)
@ -680,7 +680,7 @@ func (r *glusterfsVolumeProvisioner) Provision() (*v1.PersistentVolume, error) {
glusterfs, sizeGB, err := r.CreateVolume(gid)
if err != nil {
if release_err := gidTable.Release(gid); release_err != nil {
if releaseErr := gidTable.Release(gid); releaseErr != nil {
glog.Errorf("glusterfs: error when releasing gid in storageclass: %s", scName)
}
@ -773,9 +773,9 @@ func (p *glusterfsVolumeProvisioner) CreateVolume(gid int) (r *v1.GlusterfsVolum
endpoint, service, err := p.createEndpointService(epNamespace, epServiceName, dynamicHostIps, p.options.PVC.Name)
if err != nil {
glog.Errorf("glusterfs: failed to create endpoint/service: %v", err)
delete_err := cli.VolumeDelete(volume.Id)
if delete_err != nil {
glog.Errorf("glusterfs: error when deleting the volume :%v , manual deletion required", delete_err)
deleteErr := cli.VolumeDelete(volume.Id)
if deleteErr != nil {
glog.Errorf("glusterfs: error when deleting the volume :%v , manual deletion required", deleteErr)
}
return nil, 0, fmt.Errorf("failed to create endpoint/service %v", err)
}