Skip to content

K
k3s
Commit ee7eb4a2 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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 ```
parents f08e5302 50bfe02f
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
pkg/volume/rbd/rbd.go
View file @ ee7eb4a2
...@@ -60,6 +60,10 @@ const ( ...@@ -60,6 +60,10 @@ const (
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
...@@ -333,10 +337,10 @@ func (r *rbdVolumeProvisioner) Provision() (*v1.PersistentVolume, error) { ...@@ -333,10 +337,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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment