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

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

Merge pull request #45669 from danwinship/kubectl-plugin-dirs
fab3d23b · Kubernetes Submit Queue · GitHub · 1d4f0b4a · 415fe527 · fab3d23b
Commit fab3d23b authored May 12, 2017 by Kubernetes Submit Queue Committed by GitHub May 12, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

loader.go pkg/kubectl/plugins/loader.go +2 -2

No files found.
--- a/pkg/kubectl/plugins/loader.go
+++ b/pkg/kubectl/plugins/loader.go
@@ -145,10 +145,10 @@ func XDGDataPluginLoader() PluginLoader {
 	}
 	return TolerantMultiPluginLoader{
 		&DirectoryPluginLoader{
-			Directory: "/usr/local/share",
+			Directory: "/usr/local/share/kubectl/plugins",
 		},
 		&DirectoryPluginLoader{
-			Directory: "/usr/share",
+			Directory: "/usr/share/kubectl/plugins",
 		},
 	}
 }