Merge pull request #23 from partcyborg/ns-and-ctx

Support providing namespace and context

Author: yokawasa

README.md

@@ -125,16 +125,18 @@ Options:
                                   dest_node must start from the following letters:
                                   ASCII letters 'a' through 'z' or 'A' through 'Z',
                                   the digits '0' through '9', or hyphen ('-').
-                                  NOTE: Setting dest_node as 'jumphost' allows to 
-                                  ssh into SSH jump Pod as 'root' user 
+                                  NOTE: Setting dest_node as 'jumphost' allows to
+                                  ssh into SSH jump Pod as 'root' user
   -u, --user <sshuser>            SSH User name
   -i, --identity <identity_file>  Identity key file, or PEM(Privacy Enhanced Mail)
   -p, --pubkey <pub_key_file>     Public key file
   -P, --port <port>               SSH port for target node SSH server
                                   Defaults to 22
   -a, --args <args>               Args to exec in ssh session
+  -n, --namespace <ns>            Namespace for jump pod
+  --context <context>             Kubernetes context
   --pod-template <file>           Path to custom sshjump pod definition
-  --skip-agent                    Skip automatically starting SSH agent and adding 
+  --skip-agent                    Skip automatically starting SSH agent and adding
                                   SSH Identity key into the agent before SSH login
                                   (=> You need to manage SSH agent by yourself)
   --cleanup-agent                 Clearning up SSH agent at the end
@@ -174,10 +176,11 @@ In addtion, add `--skip-agent` option if you want to skip automatic starting `ss
 
 ### Customize SSH jump pod
 
-You can customize the sshjump pod created by `kubectl ssh-jump` by setting the `$SSH_JUMP_POD_TEMPLATE` environment variable to the path to a pod template on disk.
-
+You can customize the sshjump pod created by `kubectl ssh-jump` by setting the `--pod-template` flag to the path to a pod template on disk.
 However, customized sshjump pods must be named `sshjump` and run in the current namespace or `kubectl ssh-jump` won't be able to find them.
 
+You can also specify the namespace and context used by `kubectl ssh-jump` by setting the `--namespace` and `--context` flags respectively.
+
 ### Examples
 
 Show all node list. Simply executing `kubectl ssh-jump` gives you the list of destination nodes as well as command usage

kubectl-ssh-jump

@@ -33,6 +33,8 @@ Options:
   -P, --port <port>               SSH port for target node SSH server
                                   Defaults to 22
   -a, --args <args>               Args to exec in ssh session
+  -n, --namespace <ns>            Namespace for jump pod
+  --context <context>             Kubernetes context
   --pod-template <file>           Path to custom sshjump pod definition
   --skip-agent                    Skip automatically starting SSH agent and adding 
                                   SSH Identity key into the agent before SSH login
@@ -78,7 +80,7 @@ EOF
 
 get_node_list(){
   echo "List of destination node..."
-  kubectl get no -o custom-columns=Hostname:.metadata.name,Internal-IP:'{.status.addresses[?(@.type=="InternalIP")].address}'
+  kubectl "${k_args[@]}" get no -o custom-columns=Hostname:.metadata.name,Internal-IP:'{.status.addresses[?(@.type=="InternalIP")].address}'
   echo ""
 }
 
@@ -88,7 +90,7 @@ get_openssh_verion_number() {
 
 cleanup_sshjump_pod(){
   echo "Clearning up SSH Jump host (Pod)..."
-  kubectl delete pod sshjump
+  kubectl "${k_args[@]}" delete pod sshjump
 }
 
 check_and_start_agent(){
@@ -150,7 +152,7 @@ EOF
 )
   fi
   echo "Creating SSH jump host (Pod)..."
-  echo "${pod_template}" | kubectl apply -f -
+  echo "${pod_template}" | kubectl "${k_args[@]}" apply -f -
 }
 
 run_ssh_node(){
@@ -162,15 +164,15 @@ run_ssh_node(){
   local sshargs="$6"
 
   # Install an SSH Server if not yet installed
-  r=$(kubectl get pod sshjump 2>/dev/null | tail -1 | awk '{print $1}') # 
+  r=$(kubectl "${k_args[@]}" get pod sshjump 2>/dev/null | tail -1 | awk '{print $1}') # 
   if [ "${r}" != "sshjump" ];then
     create_jump_pod
 
     # Wait until sshjump gets ready
     c=1
     while [[ ${c} -le ${MAX_POD_CREATION_TIME} ]];
     do
-      pod_status=$(kubectl get pod sshjump 2>/dev/null | tail -1 | awk '{print $3}')
+      pod_status=$(kubectl "${k_args[@]}" get pod sshjump 2>/dev/null | tail -1 | awk '{print $3}')
       if [ "${pod_status}" = "Running" ]; then
         break
       fi
@@ -192,15 +194,15 @@ run_ssh_node(){
   fi
 
   # Setup portforward
-  kubectl port-forward sshjump 2222:22 2>/dev/null &
+  kubectl "${k_args[@]}" port-forward sshjump 2222:22 2>/dev/null &
   pid_port_forward=$!
 
   # Wait a bit for the port forwarding to get ready for connection handling for 2222
   sleep 2
 
   # Inject public SSH key to sshjump
   cat ${pubkey_sshjump} | \
-    kubectl exec -i sshjump -- /bin/bash -c "cat > /root/.ssh/authorized_keys"
+    kubectl "${k_args[@]}" exec -i sshjump -- /bin/bash -c "cat > /root/.ssh/authorized_keys"
 
   # Add default ssh option
   sshargs="${sshargs} -o StrictHostKeyChecking=no"
@@ -227,6 +229,7 @@ plugin_main() {
   cleanup_jump=no
   cleanup_agent=no
   sshargs=""
+  k_args=()
   while [ $# -gt 0 ] ; do
     nSkip=1
     case $1 in
@@ -266,6 +269,10 @@ plugin_main() {
         sshargs="${sshargs} $2"
         nSkip=2
         ;;
+      "-n" | "--namespace" | "--context")
+         k_args+=("$1" "$2")
+         nSkip=2
+         ;;
       "--pod-template")
          jump_pod_template="$2"
          nSkip=2