Skip to content

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

Merge pull request #49271 from dixudx/fix_rbd_deleter_adminid

Automatic merge from submit-queue (batch tested with PRs 47357, 49514, 49271, 49572, 49476) set default adminid for rbd deleter if unset **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #49225 **Special notes for your reviewer**: /cc @BastiPaeltz @sjenning **Release note**: ```release-note set default adminid for rbd deleter if unset ```
parents 81c5547a 6addd4c9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
pkg/volume/rbd/rbd.go
View file @ 74b3d473
...@@ -221,6 +221,9 @@ func (plugin *rbdPlugin) NewDeleter(spec *volume.Spec) (volume.Deleter, error) { ...@@ -221,6 +221,9 @@ func (plugin *rbdPlugin) NewDeleter(spec *volume.Spec) (volume.Deleter, error) {
} }
} }
if admin == "" {
admin = rbdDefaultAdminId
}
secret, err := parsePVSecret(adminSecretNamespace, adminSecretName, plugin.host.GetKubeClient()) secret, err := parsePVSecret(adminSecretNamespace, adminSecretName, plugin.host.GetKubeClient())
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to get admin secret from [%q/%q]: %v", adminSecretNamespace, adminSecretName, err) return nil, fmt.Errorf("failed to get admin secret from [%q/%q]: %v", adminSecretNamespace, adminSecretName, err)
......
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