Skip to content

Commit 20f3aae

Browse files
authored
Merge pull request #643 from andyzhangx/default-namespace-fix
fix: default namespace issue
2 parents 275f05f + 1a9ac52 commit 20f3aae

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

pkg/blob/blob.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ const (
101101

102102
subnetTemplate = "/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Network/virtualNetworks/%s/subnets/%s"
103103

104+
defaultNamespace = "default"
105+
104106
pvcNameKey = "csi.storage.k8s.io/pvc/name"
105107
pvcNamespaceKey = "csi.storage.k8s.io/pvc/namespace"
106108
pvNameKey = "csi.storage.k8s.io/pv/name"
@@ -368,7 +370,11 @@ func (d *Driver) GetAuthEnv(ctx context.Context, volumeID, protocol string, attr
368370
}
369371

370372
if secretNamespace == "" {
371-
secretNamespace = pvcNamespace
373+
if pvcNamespace == "" {
374+
secretNamespace = defaultNamespace
375+
} else {
376+
secretNamespace = pvcNamespace
377+
}
372378
}
373379

374380
if rgName == "" {

pkg/blob/controllerserver.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,11 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
145145
}
146146

147147
if secretNamespace == "" {
148-
secretNamespace = pvcNamespace
148+
if pvcNamespace == "" {
149+
secretNamespace = defaultNamespace
150+
} else {
151+
secretNamespace = pvcNamespace
152+
}
149153
}
150154

151155
if protocol == "" {

0 commit comments

Comments
 (0)