Merge pull request kubernetes-sigs#2240 from k8s-infra-cherrypick-robot/cherry-pick-2237-to-release-1.25

k8s-ci-robot · web-flow · commit be2f80429885 · 2025-11-08T06:24:52.000-08:00
[release-1.25] Revert "fix: respect secretName during volume creation"
diff --git a/pkg/blob/controllerserver.go b/pkg/blob/controllerserver.go
@@ -435,7 +435,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 	}
 
 	accountOptions.Name = accountName
-	if len(secrets) == 0 && (useDataPlaneAPI || secretName != "") {
+	if len(secrets) == 0 && useDataPlaneAPI {
 		if accountKey == "" {
 			if accountName, accountKey, err = d.GetStorageAccesskey(ctx, accountOptions, secrets, secretName, secretNamespace); err != nil {
 				return nil, status.Errorf(codes.Internal, "failed to GetStorageAccesskey on account(%s) rg(%s), error: %v", accountOptions.Name, accountOptions.ResourceGroup, err)

Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ func (d Driver) CreateVolume(ctx context.Context, req csi.CreateVolumeRequest)`
`435`	`435`	`}`
`436`	`436`
`437`	`437`	`accountOptions.Name = accountName`
`438`		`- if len(secrets) == 0 && (useDataPlaneAPI \|\| secretName != "") {`
	`438`	`+ if len(secrets) == 0 && useDataPlaneAPI {`
`439`	`439`	`if accountKey == "" {`
`440`	`440`	`if accountName, accountKey, err = d.GetStorageAccesskey(ctx, accountOptions, secrets, secretName, secretNamespace); err != nil {`
`441`	`441`	`return nil, status.Errorf(codes.Internal, "failed to GetStorageAccesskey on account(%s) rg(%s), error: %v", accountOptions.Name, accountOptions.ResourceGroup, err)`