diff options
| -rw-r--r-- | src/k8splugin/api/api.go | 7 | ||||
| -rwxr-xr-x | vagrant/setup.sh | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/k8splugin/api/api.go b/src/k8splugin/api/api.go index 651d9311..53db3fb5 100644 --- a/src/k8splugin/api/api.go +++ b/src/k8splugin/api/api.go @@ -28,7 +28,7 @@ import ( // CheckEnvVariables checks for required Environment variables func CheckEnvVariables() error { - envList := []string{"CSAR_DIR", "KUBE_CONFIG_DIR", "DATABASE_TYPE", "DATABASE_IP"} + envList := []string{"CSAR_DIR", "KUBE_CONFIG_DIR", "PLUGINS_DIR", "DATABASE_TYPE", "DATABASE_IP"} for _, env := range envList { if _, ok := os.LookupEnv(env); !ok { return pkgerrors.New("environment variable " + env + " not set") @@ -60,10 +60,7 @@ func CheckDatabaseConnection() error { // LoadPlugins loads all the compiled .so plugins func LoadPlugins() error { - pluginsDir, ok := os.LookupEnv("PLUGINS_DIR") - if !ok { - pluginsDir, _ = filepath.Abs(filepath.Dir(os.Args[0])) - } + pluginsDir := os.Getenv("PLUGINS_DIR") err := filepath.Walk(pluginsDir, func(path string, info os.FileInfo, err error) error { if strings.Contains(path, ".so") { diff --git a/vagrant/setup.sh b/vagrant/setup.sh index d4927dad..55c4a487 100755 --- a/vagrant/setup.sh +++ b/vagrant/setup.sh @@ -11,7 +11,7 @@ set -o nounset set -o pipefail -vagrant_version=2.1.2 +vagrant_version=2.1.4 if ! $(vagrant version &>/dev/null); then enable_vagrant_install=true else |