diff --git a/pkg/kubectl/cmd/util/factory_builder.go b/pkg/kubectl/cmd/util/factory_builder.go index c42df2699c4..d12a4afe52b 100644 --- a/pkg/kubectl/cmd/util/factory_builder.go +++ b/pkg/kubectl/cmd/util/factory_builder.go @@ -183,7 +183,7 @@ func (f *ring2Factory) PluginLoader() plugins.PluginLoader { return plugins.KubectlPluginsPathPluginLoader() } return plugins.TolerantMultiPluginLoader{ - plugins.XDGDataPluginLoader(), + plugins.XDGDataDirsPluginLoader(), plugins.UserDirPluginLoader(), } } diff --git a/pkg/kubectl/plugins/loader.go b/pkg/kubectl/plugins/loader.go index def8ae6e5ea..6cbaffc34de 100644 --- a/pkg/kubectl/plugins/loader.go +++ b/pkg/kubectl/plugins/loader.go @@ -143,11 +143,11 @@ func KubectlPluginsPathPluginLoader() PluginLoader { return PathFromEnvVarPluginLoader("KUBECTL_PLUGINS_PATH") } -// XDGDataPluginLoader returns a PluginLoader that loads plugins from one or more +// XDGDataDirsPluginLoader returns a PluginLoader that loads plugins from one or more // directories specified by the XDG system directory structure spec in the // XDG_DATA_DIRS env var, plus the "kubectl/plugins/" suffix. According to the // spec, if XDG_DATA_DIRS is not set it defaults to "/usr/local/share:/usr/share". -func XDGDataPluginLoader() PluginLoader { +func XDGDataDirsPluginLoader() PluginLoader { envVarName := "XDG_DATA_DIRS" if len(os.Getenv(envVarName)) > 0 { return PathFromEnvVarPluginLoader(envVarName, "kubectl", "plugins")