Skip to content

Commit 5e3ede3

Browse files
authored
Merge pull request #1297 from k8s-infra-cherrypick-robot/cherry-pick-1289-to-release-1.23
[release-1.23] chore: only use sas token for azcopy when useDataPlaneAPI is used
2 parents 9376356 + 5890b6f commit 5e3ede3

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

pkg/blob/blob.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ func NewDriver(options *DriverOptions, kubeClient kubernetes.Interface, cloud *p
266266
if d.accountSearchCache, err = azcache.NewTimedCache(time.Minute, getter, false); err != nil {
267267
klog.Fatalf("%v", err)
268268
}
269-
if d.dataPlaneAPIVolCache, err = azcache.NewTimedCache(10*time.Minute, getter, false); err != nil {
269+
if d.dataPlaneAPIVolCache, err = azcache.NewTimedCache(24*30*time.Hour, getter, false); err != nil {
270270
klog.Fatalf("%v", err)
271271
}
272272
if d.azcopySasTokenCache, err = azcache.NewTimedCache(15*time.Minute, getter, false); err != nil {

pkg/blob/controllerserver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ func (d *Driver) authorizeAzcopyWithIdentity() ([]string, error) {
826826
func (d *Driver) getAzcopyAuth(ctx context.Context, accountName, accountKey, storageEndpointSuffix string, accountOptions *azure.AccountOptions, secrets map[string]string, secretName, secretNamespace string) (string, []string, error) {
827827
var authAzcopyEnv []string
828828
useSasToken := false
829-
if len(secrets) == 0 && len(secretName) == 0 {
829+
if !d.useDataPlaneAPI("", accountName) && len(secrets) == 0 && len(secretName) == 0 {
830830
var err error
831831
authAzcopyEnv, err = d.authorizeAzcopyWithIdentity()
832832
if err != nil {

0 commit comments

Comments
 (0)