Skip to content

Commit 9c9d3a2

Browse files
authored
Merge pull request #1296 from k8s-infra-cherrypick-robot/cherry-pick-1289-to-release-1.24
[release-1.24] chore: only use sas token for azcopy when useDataPlaneAPI is used
2 parents 2fe530a + 1e3b8b5 commit 9c9d3a2

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
@@ -285,7 +285,7 @@ func NewDriver(options *DriverOptions, kubeClient kubernetes.Interface, cloud *p
285285
if d.accountSearchCache, err = azcache.NewTimedCache(time.Minute, getter, false); err != nil {
286286
klog.Fatalf("%v", err)
287287
}
288-
if d.dataPlaneAPIVolCache, err = azcache.NewTimedCache(10*time.Minute, getter, false); err != nil {
288+
if d.dataPlaneAPIVolCache, err = azcache.NewTimedCache(24*30*time.Hour, getter, false); err != nil {
289289
klog.Fatalf("%v", err)
290290
}
291291
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
@@ -844,7 +844,7 @@ func (d *Driver) authorizeAzcopyWithIdentity() ([]string, error) {
844844
func (d *Driver) getAzcopyAuth(ctx context.Context, accountName, accountKey, storageEndpointSuffix string, accountOptions *azure.AccountOptions, secrets map[string]string, secretName, secretNamespace string) (string, []string, error) {
845845
var authAzcopyEnv []string
846846
useSasToken := false
847-
if len(secrets) == 0 && len(secretName) == 0 {
847+
if !d.useDataPlaneAPI("", accountName) && len(secrets) == 0 && len(secretName) == 0 {
848848
var err error
849849
authAzcopyEnv, err = d.authorizeAzcopyWithIdentity()
850850
if err != nil {

0 commit comments

Comments
 (0)