github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100563 from msau42/revert-azure

Browse Source 
Revert #97417 "fix azure file secret not found issue"
This commit is contained in:
Kubernetes Prow Robot 2021-03-25 14:27:46 -07:00 committed by GitHub
commit 01f7495b65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/volume/azure_file/azure_file.go
View File

@ -56,7 +56,6 @@ var _ volume.ExpandableVolumePlugin = &azureFilePlugin{}
const ( const (
azureFilePluginName = "kubernetes.io/azure-file" azureFilePluginName = "kubernetes.io/azure-file"
defaultSecretNamespace = "default"
minimumPremiumShareSize = 100 // GB minimumPremiumShareSize = 100 // GB
) )
@ -117,7 +116,7 @@ func (plugin *azureFilePlugin) newMounterInternal(spec *volume.Spec, pod *v1.Pod
if err != nil { if err != nil {
return nil, err return nil, err
} }
secretName, secretNamespace, err := getSecretNameAndNamespace(spec, defaultSecretNamespace) secretName, secretNamespace, err := getSecretNameAndNamespace(spec, pod.Namespace)
if err != nil { if err != nil {
// Log-and-continue instead of returning an error for now // Log-and-continue instead of returning an error for now
// due to unspecified backwards compatibility concerns (a subject to revise) // due to unspecified backwards compatibility concerns (a subject to revise)
@ -175,7 +174,7 @@ func (plugin *azureFilePlugin) ExpandVolumeDevice(
resourceGroup = spec.PersistentVolume.ObjectMeta.Annotations[resourceGroupAnnotation] resourceGroup = spec.PersistentVolume.ObjectMeta.Annotations[resourceGroupAnnotation]
} }
secretName, secretNamespace, err := getSecretNameAndNamespace(spec, defaultSecretNamespace) secretName, secretNamespace, err := getSecretNameAndNamespace(spec, spec.PersistentVolume.Spec.ClaimRef.Namespace)
if err != nil { if err != nil {
return oldSize, err return oldSize, err
} }

2
pkg/volume/azure_file/azure_provision.go
View File

@ -79,7 +79,7 @@ func (plugin *azureFilePlugin) newDeleterInternal(spec *volume.Spec, util azureU
return nil, fmt.Errorf("invalid PV spec") return nil, fmt.Errorf("invalid PV spec")
} }
secretName, secretNamespace, err := getSecretNameAndNamespace(spec, defaultSecretNamespace) secretName, secretNamespace, err := getSecretNameAndNamespace(spec, spec.PersistentVolume.Spec.ClaimRef.Namespace)
if err != nil { if err != nil {
return nil, err return nil, err
} }