Skip to content

Commit 03eb784

Browse files
authored
Merge pull request #528 from andyzhangx/pvc-namespace
fix: secret namespace searching issue
2 parents 2671372 + 6f3fc65 commit 03eb784

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

pkg/blob/blob.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,11 @@ func (d *Driver) GetAuthEnv(ctx context.Context, volumeID, protocol string, attr
303303
secretName = v
304304
case secretNamespaceField:
305305
secretNamespace = v
306+
case pvcNamespaceKey:
307+
if secretNamespace == "" {
308+
// respect `secretNamespace` field as first priority
309+
secretNamespace = v
310+
}
306311
case getAccountKeyFromSecretField:
307312
getAccountKeyFromSecret = strings.EqualFold(v, trueValue)
308313
case "azurestorageauthtype":

pkg/blobfuse-proxy/server/server.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package server
1818

1919
import (
2020
"context"
21+
"fmt"
2122
"net"
2223
"os/exec"
2324
"strings"
@@ -64,7 +65,7 @@ func (server *MountServer) MountAzureBlob(ctx context.Context,
6465
}
6566
result.Output = string(output)
6667
klog.V(2).Infof("blobfuse output: %s\n", result.Output)
67-
return &result, err
68+
return &result, fmt.Errorf("%v %s", err, result.Output)
6869
}
6970

7071
func RunGRPCServer(

0 commit comments

Comments
 (0)