Merge pull request #49274 from dixudx/add_const_for_rbd

Automatic merge from submit-queue (batch tested with PRs 48911, 49475, 49438, 49362, 49274) set RBD default values as constant vars **What this PR does / why we need it**: When working on #49225, I found some [default RBD parameters](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#ceph-rbd) had not been declared as constant values, which will be error-prone. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note set RBD default values as constant vars ```

Merge pull request #49274 from dixudx/add_const_for_rbd
ee7eb4a2 · Kubernetes Submit Queue · GitHub · f08e5302 · 50bfe02f · ee7eb4a2
Commit ee7eb4a2 authored Jul 24, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 24, 2017
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

rbd.go pkg/volume/rbd/rbd.go +8 -4

No files found.
--- a/pkg/volume/rbd/rbd.go
+++ b/pkg/volume/rbd/rbd.go
@@ -60,6 +60,10 @@ const (
 	secretKeyName                  = "key" // key name used in secret
 	rbdImageFormat1                = "1"
 	rbdImageFormat2                = "2"
+	rbdDefaultAdminId              = "admin"
+	rbdDefaultAdminSecretNamespace = "default"
+	rbdDefaultPool                 = "rbd"
+	rbdDefaultUserId               = rbdDefaultAdminId
 )

 func (plugin *rbdPlugin) Init(host volume.VolumeHost) error {
@@ -203,7 +207,7 @@ func (plugin *rbdPlugin) NewDeleter(spec *volume.Spec) (volume.Deleter, error) {
 		return nil, err
 	}
 	adminSecretName := ""
-	adminSecretNamespace := "default"
+	adminSecretNamespace := rbdDefaultAdminSecretNamespace
 	admin := ""

 	for k, v := range class.Parameters {
@@ -271,7 +275,7 @@ func (r *rbdVolumeProvisioner) Provision() (*v1.PersistentVolume, error) {
 	}
 	var err error
 	adminSecretName := ""
-	adminSecretNamespace := "default"
+	adminSecretNamespace := rbdDefaultAdminSecretNamespace
 	secretName := ""
 	secret := ""
 	imageFormat := rbdImageFormat1
@@ -333,10 +337,10 @@ func (r *rbdVolumeProvisioner) Provision() (*v1.PersistentVolume, error) {
 		return nil, fmt.Errorf("missing user secret name")
 	}
 	if r.adminId == "" {
-		r.adminId = "admin"
+		r.adminId = rbdDefaultAdminId
 	}
 	if r.Pool == "" {
-		r.Pool = "rbd"
+		r.Pool = rbdDefaultPool
 	}
 	if r.Id == "" {
 		r.Id = r.adminId