Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
dddd4783
Commit
dddd4783
authored
Apr 21, 2017
by
Humble Chirammal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace variable name to be more go friendly.
Signed-off-by:
Humble Chirammal
<
hchiramm@redhat.com
>
parent
bf532a30
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
glusterfs.go
pkg/volume/glusterfs/glusterfs.go
+7
-7
No files found.
pkg/volume/glusterfs/glusterfs.go
View file @
dddd4783
...
@@ -134,16 +134,16 @@ func (plugin *glusterfsPlugin) GetAccessModes() []v1.PersistentVolumeAccessMode
...
@@ -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
)
{
func
(
plugin
*
glusterfsPlugin
)
NewMounter
(
spec
*
volume
.
Spec
,
pod
*
v1
.
Pod
,
_
volume
.
VolumeOptions
)
(
volume
.
Mounter
,
error
)
{
source
,
_
:=
plugin
.
getGlusterVolumeSource
(
spec
)
source
,
_
:=
plugin
.
getGlusterVolumeSource
(
spec
)
ep
_n
ame
:=
source
.
EndpointsName
ep
N
ame
:=
source
.
EndpointsName
// PVC/POD is in same ns.
// PVC/POD is in same ns.
ns
:=
pod
.
Namespace
ns
:=
pod
.
Namespace
kubeClient
:=
plugin
.
host
.
GetKubeClient
()
kubeClient
:=
plugin
.
host
.
GetKubeClient
()
if
kubeClient
==
nil
{
if
kubeClient
==
nil
{
return
nil
,
fmt
.
Errorf
(
"glusterfs: failed to get kube client to initialize mounter"
)
return
nil
,
fmt
.
Errorf
(
"glusterfs: failed to get kube client to initialize mounter"
)
}
}
ep
,
err
:=
kubeClient
.
Core
()
.
Endpoints
(
ns
)
.
Get
(
ep
_n
ame
,
metav1
.
GetOptions
{})
ep
,
err
:=
kubeClient
.
Core
()
.
Endpoints
(
ns
)
.
Get
(
ep
N
ame
,
metav1
.
GetOptions
{})
if
err
!=
nil
{
if
err
!=
nil
{
glog
.
Errorf
(
"glusterfs: failed to get endpoints %s[%v]"
,
ep
_n
ame
,
err
)
glog
.
Errorf
(
"glusterfs: failed to get endpoints %s[%v]"
,
ep
N
ame
,
err
)
return
nil
,
err
return
nil
,
err
}
}
glog
.
V
(
1
)
.
Infof
(
"glusterfs: endpoints %v"
,
ep
)
glog
.
V
(
1
)
.
Infof
(
"glusterfs: endpoints %v"
,
ep
)
...
@@ -680,7 +680,7 @@ func (r *glusterfsVolumeProvisioner) Provision() (*v1.PersistentVolume, error) {
...
@@ -680,7 +680,7 @@ func (r *glusterfsVolumeProvisioner) Provision() (*v1.PersistentVolume, error) {
glusterfs
,
sizeGB
,
err
:=
r
.
CreateVolume
(
gid
)
glusterfs
,
sizeGB
,
err
:=
r
.
CreateVolume
(
gid
)
if
err
!=
nil
{
if
err
!=
nil
{
if
release
_err
:=
gidTable
.
Release
(
gid
);
release_e
rr
!=
nil
{
if
release
Err
:=
gidTable
.
Release
(
gid
);
releaseE
rr
!=
nil
{
glog
.
Errorf
(
"glusterfs: error when releasing gid in storageclass: %s"
,
scName
)
glog
.
Errorf
(
"glusterfs: error when releasing gid in storageclass: %s"
,
scName
)
}
}
...
@@ -773,9 +773,9 @@ func (p *glusterfsVolumeProvisioner) CreateVolume(gid int) (r *v1.GlusterfsVolum
...
@@ -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
)
endpoint
,
service
,
err
:=
p
.
createEndpointService
(
epNamespace
,
epServiceName
,
dynamicHostIps
,
p
.
options
.
PVC
.
Name
)
if
err
!=
nil
{
if
err
!=
nil
{
glog
.
Errorf
(
"glusterfs: failed to create endpoint/service: %v"
,
err
)
glog
.
Errorf
(
"glusterfs: failed to create endpoint/service: %v"
,
err
)
delete
_e
rr
:=
cli
.
VolumeDelete
(
volume
.
Id
)
delete
E
rr
:=
cli
.
VolumeDelete
(
volume
.
Id
)
if
delete
_e
rr
!=
nil
{
if
delete
E
rr
!=
nil
{
glog
.
Errorf
(
"glusterfs: error when deleting the volume :%v , manual deletion required"
,
delete
_e
rr
)
glog
.
Errorf
(
"glusterfs: error when deleting the volume :%v , manual deletion required"
,
delete
E
rr
)
}
}
return
nil
,
0
,
fmt
.
Errorf
(
"failed to create endpoint/service %v"
,
err
)
return
nil
,
0
,
fmt
.
Errorf
(
"failed to create endpoint/service %v"
,
err
)
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment