Merge pull request #113 from lpabon/component-env

Pass env var to compoments when in kubectl mode

Author: lpabon

cmd/plugin.go

@@ -28,6 +28,7 @@ import (
 	"syscall"
 
 	"github.com/portworx/pxc/pkg/config"
+	"github.com/portworx/pxc/pkg/util"
 )
 
 // PluginHandler is capable of parsing command line arguments
@@ -129,8 +130,11 @@ func HandlePluginCommand(pluginHandler PluginHandler, cmdArgs []string) error {
 		return nil
 	}
 
+	// Setup environment variables
+	envVars := append(os.Environ(), fmt.Sprintf("%s=%v", util.EvInKubectlPluginMode, util.InKubectlPluginMode()))
+
 	// invoke cmd binary relaying the current environment and args given
-	if err := pluginHandler.Execute(foundBinaryPath, cmdArgs[len(remainingArgs):], os.Environ()); err != nil {
+	if err := pluginHandler.Execute(foundBinaryPath, cmdArgs[len(remainingArgs):], envVars); err != nil {
 		return err
 	}
 

pkg/util/utils.go

@@ -20,13 +20,18 @@ import (
 	"fmt"
 	"net"
 	"os"
+	"strconv"
 	"strings"
 	"time"
 
 	"github.com/asaskevich/govalidator"
 	api "github.com/libopenstorage/openstorage-sdk-clients/sdk/golang"
 )
 
+const (
+	EvInKubectlPluginMode = "PXC_KUBECTL_PLUGIN_MODE"
+)
+
 var (
 	ErrInvalidEndpoint = errors.New("Invalid Endpoint")
 )
@@ -204,5 +209,9 @@ func GetAclFromString(s string) (string, api.Ownership_AccessType, error) {
 
 // InKubectlPluginMode returns true if running as a plugin to kubectl
 func InKubectlPluginMode() bool {
-	return strings.Contains(os.Args[0], "kubectl-pxc")
+	envInKubectlMode := false
+	if v, err := strconv.ParseBool(os.Getenv(EvInKubectlPluginMode)); err == nil {
+		envInKubectlMode = v
+	}
+	return envInKubectlMode || strings.Contains(os.Args[0], "kubectl-pxc")
 }