Skip to content

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

Merge pull request #65691 from jsafrane/azure-managed-error

Automatic merge from submit-queue (batch tested with PRs 65348, 65599, 65635, 65688, 65691). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. azure: Add validation of resourceGroup option. ResourceGroup can be set only on `kind: Managed` disks. **Release note**: ```release-note NONE ``` /assign @andyzhangx
parents 38abda6d efdb29d5
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
pkg/volume/azure_dd/azure_provision.go
View file @ f7d95e20
...@@ -17,6 +17,7 @@ limitations under the License. ...@@ -17,6 +17,7 @@ limitations under the License.
package azure_dd package azure_dd
import ( import (
"errors"
"fmt" "fmt"
"strings" "strings"
...@@ -145,6 +146,10 @@ func (p *azureDiskProvisioner) Provision(selectedNode *v1.Node, allowedTopologie ...@@ -145,6 +146,10 @@ func (p *azureDiskProvisioner) Provision(selectedNode *v1.Node, allowedTopologie
return nil, err return nil, err
} }
if resourceGroup != "" && kind != v1.AzureManagedDisk {
return nil, errors.New("StorageClass option 'resourceGroup' can be used only for managed disks")
}
// create disk // create disk
diskURI := "" diskURI := ""
if kind == v1.AzureManagedDisk { if kind == v1.AzureManagedDisk {
......
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