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
50bfe02f
Commit
50bfe02f
authored
Jul 20, 2017
by
Di Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make default values as const vars
parent
acc19caf
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
8 deletions
+12
-8
rbd.go
pkg/volume/rbd/rbd.go
+12
-8
No files found.
pkg/volume/rbd/rbd.go
View file @
50bfe02f
...
@@ -56,10 +56,14 @@ var _ volume.DeletableVolumePlugin = &rbdPlugin{}
...
@@ -56,10 +56,14 @@ var _ volume.DeletableVolumePlugin = &rbdPlugin{}
var
_
volume
.
ProvisionableVolumePlugin
=
&
rbdPlugin
{}
var
_
volume
.
ProvisionableVolumePlugin
=
&
rbdPlugin
{}
const
(
const
(
rbdPluginName
=
"kubernetes.io/rbd"
rbdPluginName
=
"kubernetes.io/rbd"
secretKeyName
=
"key"
// key name used in secret
secretKeyName
=
"key"
// key name used in secret
rbdImageFormat1
=
"1"
rbdImageFormat1
=
"1"
rbdImageFormat2
=
"2"
rbdImageFormat2
=
"2"
rbdDefaultAdminId
=
"admin"
rbdDefaultAdminSecretNamespace
=
"default"
rbdDefaultPool
=
"rbd"
rbdDefaultUserId
=
rbdDefaultAdminId
)
)
func
(
plugin
*
rbdPlugin
)
Init
(
host
volume
.
VolumeHost
)
error
{
func
(
plugin
*
rbdPlugin
)
Init
(
host
volume
.
VolumeHost
)
error
{
...
@@ -203,7 +207,7 @@ func (plugin *rbdPlugin) NewDeleter(spec *volume.Spec) (volume.Deleter, error) {
...
@@ -203,7 +207,7 @@ func (plugin *rbdPlugin) NewDeleter(spec *volume.Spec) (volume.Deleter, error) {
return
nil
,
err
return
nil
,
err
}
}
adminSecretName
:=
""
adminSecretName
:=
""
adminSecretNamespace
:=
"default"
adminSecretNamespace
:=
rbdDefaultAdminSecretNamespace
admin
:=
""
admin
:=
""
for
k
,
v
:=
range
class
.
Parameters
{
for
k
,
v
:=
range
class
.
Parameters
{
...
@@ -271,7 +275,7 @@ func (r *rbdVolumeProvisioner) Provision() (*v1.PersistentVolume, error) {
...
@@ -271,7 +275,7 @@ func (r *rbdVolumeProvisioner) Provision() (*v1.PersistentVolume, error) {
}
}
var
err
error
var
err
error
adminSecretName
:=
""
adminSecretName
:=
""
adminSecretNamespace
:=
"default"
adminSecretNamespace
:=
rbdDefaultAdminSecretNamespace
secretName
:=
""
secretName
:=
""
secret
:=
""
secret
:=
""
imageFormat
:=
rbdImageFormat1
imageFormat
:=
rbdImageFormat1
...
@@ -330,10 +334,10 @@ func (r *rbdVolumeProvisioner) Provision() (*v1.PersistentVolume, error) {
...
@@ -330,10 +334,10 @@ func (r *rbdVolumeProvisioner) Provision() (*v1.PersistentVolume, error) {
return
nil
,
fmt
.
Errorf
(
"missing user secret name"
)
return
nil
,
fmt
.
Errorf
(
"missing user secret name"
)
}
}
if
r
.
adminId
==
""
{
if
r
.
adminId
==
""
{
r
.
adminId
=
"admin"
r
.
adminId
=
rbdDefaultAdminId
}
}
if
r
.
Pool
==
""
{
if
r
.
Pool
==
""
{
r
.
Pool
=
"rbd"
r
.
Pool
=
rbdDefaultPool
}
}
if
r
.
Id
==
""
{
if
r
.
Id
==
""
{
r
.
Id
=
r
.
adminId
r
.
Id
=
r
.
adminId
...
...
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