github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #45669 from danwinship/kubectl-plugin-dirs

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 45684, 45266, 45669, 44787, 44984)

Fix XDG-based kubectl plugin dirs

XDGDataPluginLoader messed up its default-value handling for `XDG_DATA_DIRS` and ends up scanning *all of /usr/share* looking for plugins if you don't have that set :-O

/release-note-none
/assign @fabianofranz
This commit is contained in:
Kubernetes Submit Queue 2017-05-12 03:20:40 -07:00 committed by GitHub
commit fab3d23bcf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubectl/plugins/loader.go
View File

@ -145,10 +145,10 @@ func XDGDataPluginLoader() PluginLoader {
} }
return TolerantMultiPluginLoader{ return TolerantMultiPluginLoader{
&DirectoryPluginLoader{ &DirectoryPluginLoader{
Directory: "/usr/local/share", Directory: "/usr/local/share/kubectl/plugins",
}, },
&DirectoryPluginLoader{ &DirectoryPluginLoader{
Directory: "/usr/share", Directory: "/usr/share/kubectl/plugins",
}, },
} }
} }