Merge pull request #160 from lpabon/b151

Pass portworx-api information to components
portworx · Jul 22, 2020 · f4082ce · f4082ce
2 parents 62cc68c + 41e61d7
commit f4082ce
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/cmd/plugin.go b/cmd/plugin.go
@@ -131,11 +131,9 @@ func HandlePluginCommand(pluginHandler PluginHandler, cmdArgs []string) error {
 		return nil
 	}
 
-	// Setup environment variables
-	authInfo := config.CM().GetCurrentAuthInfo()
-
 	// Get token
 	var err error
+	authInfo := config.CM().GetCurrentAuthInfo()
 	token := authInfo.Token
 	if len(authInfo.KubernetesAuthInfo.SecretName) != 0 &&
 		len(authInfo.KubernetesAuthInfo.SecretNamespace) != 0 {
@@ -145,8 +143,14 @@ func HandlePluginCommand(pluginHandler PluginHandler, cmdArgs []string) error {
 		}
 	}
 
-	envVars := append(os.Environ(), fmt.Sprintf("%s=%v", util.EvInKubectlPluginMode, util.InKubectlPluginMode()))
-	envVars = append(envVars, fmt.Sprintf("%s=%v", util.EvPxcToken, token))
+	// Setup environment variables
+	envVars := appendToEnv(os.Environ(), util.EvInKubectlPluginMode, util.InKubectlPluginMode())
+	envVars = appendToEnv(envVars, util.EvPxcToken, token)
+
+	currentCluster := config.CM().GetCurrentCluster()
+	envVars = appendToEnv(envVars, util.EvPortworxServiceName, currentCluster.TunnelServiceName)
+	envVars = appendToEnv(envVars, util.EvPortworxServiceNamespace, currentCluster.TunnelServiceNamespace)
+	envVars = appendToEnv(envVars, util.EvPortworxServicePort, currentCluster.TunnelServicePort)
 
 	// invoke cmd binary relaying the current environment and args given
 	if err := pluginHandler.Execute(foundBinaryPath, cmdArgs[len(remainingArgs):], envVars); err != nil {
@@ -155,3 +159,7 @@ func HandlePluginCommand(pluginHandler PluginHandler, cmdArgs []string) error {
 
 	return nil
 }
+
+func appendToEnv(env []string, key string, val interface{}) []string {
+	return append(env, fmt.Sprintf("%s=%v", key, val))
+}
diff --git a/component/pxctl/pxc-pxctl b/component/pxctl/pxc-pxctl
@@ -48,5 +48,5 @@ if [ -z "$NODE" ] ; then
 fi
 
 echo ">> Running pxctl on $NODE"
-pod=$(kubectl -n kube-system get pods -l name=portworx -o wide | grep "${NODE}" | awk -P '{print $1}')
-kubectl -n kube-system exec -ti $pod -c portworx -- /bin/sh -c "PXCTL_AUTH_TOKEN=${PXC_TOKEN} /opt/pwx/bin/pxctl $*"
+pod=$(kubectl -n ${PXC_PORTWORX_SERVICE_NAMESPACE} get pods -l name=portworx -o wide | grep "${NODE}" | awk -P '{print $1}')
+kubectl -n ${PXC_PORTWORX_SERVICE_NAMESPACE} exec -ti $pod -c portworx -- /bin/sh -c "PXCTL_AUTH_TOKEN=${PXC_TOKEN} /opt/pwx/bin/pxctl $*"
diff --git a/pkg/util/utils.go b/pkg/util/utils.go
@@ -29,8 +29,11 @@ import (
 )
 
 const (
-	EvInKubectlPluginMode = "PXC_KUBECTL_PLUGIN_MODE"
-	EvPxcToken            = "PXC_TOKEN"
+	EvInKubectlPluginMode      = "PXC_KUBECTL_PLUGIN_MODE"
+	EvPxcToken                 = "PXC_TOKEN"
+	EvPortworxServiceNamespace = "PXC_PORTWORX_SERVICE_NAMESPACE"
+	EvPortworxServiceName      = "PXC_PORTWORX_SERVICE_NAME"
+	EvPortworxServicePort      = "PXC_PORTWORX_SERVICE_PORT"
 )
 
 var (