Merge pull request kubernetes#81562 from andyzhangx/azurefile-trim

k8s-ci-robot · web-flow · commit bfb69dbb8f01 · 2019-08-21T04:35:17.000-07:00
fix: trim new line for azure storage account name
diff --git a/pkg/volume/azure_file/azure_util.go b/pkg/volume/azure_file/azure_util.go
@@ -66,6 +66,7 @@ func (s *azureSvc) GetAzureCredentials(host volume.VolumeHost, nameSpace, secret
 	if accountName == "" || accountKey == "" {
 		return "", "", fmt.Errorf("Invalid %v/%v, couldn't extract azurestorageaccountname or azurestorageaccountkey", nameSpace, secretName)
 	}
+	accountName = strings.TrimSpace(accountName)
 	return accountName, accountKey, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ func (s *azureSvc) GetAzureCredentials(host volume.VolumeHost, nameSpace, secret`
`66`	`66`	`if accountName == "" \|\| accountKey == "" {`
`67`	`67`	`return "", "", fmt.Errorf("Invalid %v/%v, couldn't extract azurestorageaccountname or azurestorageaccountkey", nameSpace, secretName)`
`68`	`68`	`}`
	`69`	`+ accountName = strings.TrimSpace(accountName)`
`69`	`70`	`return accountName, accountKey, nil`
`70`	`71`	`}`
`71`	`72`