Removing Namespace parameter from kubectl plugins (#1422)

Author: devdattakulkarni

docs/sample-example.rst

@@ -66,7 +66,7 @@ Retrieve KubePlus consumer kubeconfig as follows:
 
 .. code-block:: bash
 
-	$ kubectl retrieve kubeconfig consumer $KUBEPLUS_NS > consumer.conf
+	$ kubectl retrieve kubeconfig consumer > consumer.conf
 
 In the steps below, use the appropriate kubeconfig in the provider and consumer actions by passing the ``--kubeconfig=<provider/consumer kubeconfig file>`` flag.
 

examples/multitenancy/application-hosting/odoo/steps.txt

@@ -39,7 +39,7 @@ This example shows delivering Bitnami Odoo Helm chart as-a-service using KubePlu
    - Direct
      $ kubectl get configmaps kubeplus-saas-consumer-kubeconfig -n $KUBEPLUS_NS -o jsonpath="{.data.kubeplus-saas-consumer\.json}" > consumer.conf
    - Using kubeplus plugin 
-     $ kubectl retrieve kubeconfig consumer default -s $server -k kubeplus-saas-provider.json > consumer.conf
+     $ kubectl retrieve kubeconfig consumer -s $server -k kubeplus-saas-provider.json > consumer.conf
 
 5. Check permissions for provider and consumer service accounts, which are created by KubePlus:
    $ kubectl auth can-i --list --as=system:serviceaccount:default:kubeplus-saas-provider

examples/multitenancy/application-hosting/wordpress/steps.txt

@@ -32,7 +32,7 @@ $ kubectl kubeplus commands
    $ helm install kubeplus "https://github.com/cloud-ark/operatorcharts/blob/master/kubeplus-chart-4.1.3.tgz?raw=true" -n $KUBEPLUS_NS --kubeconfig=kubeplus-saas-provider.json
 
 5. Extract consumer kubeconfig:
-   $ kubectl retrieve kubeconfig consumer $KUBEPLUS_NS -s $apiserver > consumer.conf
+   $ kubectl retrieve kubeconfig consumer -s $apiserver > consumer.conf
    OR
    $ kubectl get configmaps kubeplus-saas-consumer-kubeconfig -n $KUBEPLUS_NS -o jsonpath="{.data.kubeplus-saas-consumer\.json}" > consumer.conf
 

examples/multitenancy/hello-world/steps.txt

@@ -36,7 +36,7 @@ $ kubectl get pods (wait till kubeplus pod is Running)
 Get Consumer kubeconfig:
 ---------------------------------------
 Extract consumer kubeconfig:
-$ kubectl retrieve kubeconfig consumer $KUBEPLUS_NS -s $apiserver > consumer.conf
+$ kubectl retrieve kubeconfig consumer -s $apiserver > consumer.conf
 OR
 $ kubectl get configmaps kubeplus-saas-consumer-kubeconfig -n $KUBEPLUS_NS -o jsonpath="{.data.kubeplus-saas-consumer\.json}" > consumer.conf
 

examples/multitenancy/platform-engineering/steps.txt

@@ -45,7 +45,7 @@ Platform Engineering team
      - check that OpenAPISchema has been defined on the CRD corresponding to the attributes in the values.yaml of the CustomMysql Helm chart. 
 
 5. Download the consumer kubeconfig file:
-     $ kubectl retrieve kubeconfig consumer default -s $server -k kubeplus-saas-provider.json > consumer.conf
+     $ kubectl retrieve kubeconfig consumer -s $server -k kubeplus-saas-provider.json > consumer.conf
 
    You can share consumer.conf with your product teams.
 

plugins/consumerkubeconfigretriever.py

@@ -3,10 +3,11 @@
 import subprocess
 import sys
 import os
-#import yaml
+import re
+from crmetrics import CRBase
 
 
-class ConsumerKubeconfigRetriever(object):
+class ConsumerKubeconfigRetriever(CRBase):
 
 	def _get_kubeplus_ns(self):
 		cmd = " kubectl get deployments -A "
@@ -23,12 +24,12 @@ def _get_kubeplus_ns(self):
 				break
 		return kubeplusNamespace
 
-	def _apply_consumer_rbac(self, kubeplusNS, kindplural, providerkubeconfig):
+	def _apply_consumer_rbac(self, kindplural, providerkubeconfig):
 
 		group = "platformapi.kubeplus"
 		version = "v1alpha1"
 		sa = 'kubeplus-saas-consumer'
-		#ksnamespace = self._get_kubeplus_ns()
+		kubeplusNS = self.get_kubeplus_namespace(providerkubeconfig)
 
 		role = {}
 		role["apiVersion"] = "rbac.authorization.k8s.io/v1"
@@ -133,9 +134,8 @@ def _apply_consumer_rbac(self, kubeplusNS, kindplural, providerkubeconfig):
 
 if __name__ == '__main__':
 
-	kubeplusNS = sys.argv[1]
-	kindplural = sys.argv[2]
-	providerkubeconfig = sys.argv[3]
+	kindplural = sys.argv[1]
+	providerkubeconfig = sys.argv[2]
 	consumerKfgRetriever = ConsumerKubeconfigRetriever()
-	consumerKfgRetriever._apply_consumer_rbac(kubeplusNS, kindplural, providerkubeconfig)
+	consumerKfgRetriever._apply_consumer_rbac(kindplural, providerkubeconfig)
 

plugins/providerkubeconfigretriever.py plugins/kubeconfigretriever.pyplugins/providerkubeconfigretriever.py renamed to plugins/kubeconfigretriever.py

@@ -2,12 +2,14 @@
 import json
 import subprocess
 import os
+from crmetrics import CRBase
 
 
-class ProviderKubeconfigRetriever(object):
+class KubeconfigRetriever(CRBase):
 
-	def retrieve_kubeconfig(self, kubeplusNS, serverURL, kubeconfigFor, kubeconfig):
+	def retrieve_kubeconfig(self, serverURL, kubeconfigFor, kubeconfig):
 
+		kubeplusNS = self.get_kubeplus_namespace(kubeconfig)
 		if kubeconfigFor == 'provider':
 			cmd = "kubectl get configmaps kubeplus-saas-provider -n " + kubeplusNS + " -o jsonpath=\"{.data.kubeplus-saas-provider\.json}\""
 		if kubeconfigFor == 'consumer':
@@ -38,9 +40,8 @@ def retrieve_kubeconfig(self, kubeplusNS, serverURL, kubeconfigFor, kubeconfig):
 
 if __name__ == '__main__':
 
-	kubeplusNS = sys.argv[1]
-	serverURL = sys.argv[2] # <api server url>
-	kubeconfigFor = sys.argv[3]
-	kubeconfigPath = sys.argv[4] # <complete kubeconfig path>
-	providerKfgRetriever = ProviderKubeconfigRetriever()
-	providerKfgRetriever.retrieve_kubeconfig(kubeplusNS, serverURL, kubeconfigFor, kubeconfigPath)
+	serverURL = sys.argv[1] # <api server url>
+	kubeconfigFor = sys.argv[2]
+	kubeconfigPath = sys.argv[3] # <complete kubeconfig path>
+	kfgRetriever = KubeconfigRetriever()
+	kfgRetriever.retrieve_kubeconfig(serverURL, kubeconfigFor, kubeconfigPath)

plugins/kubectl-grantpermission-consumer

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if (( $# < 3 )); then
-    echo "kubectl grantpermission consumer <resourceplural>  <providerKubeconfig> <Namespace in which KubePlus is deployed>"
+if (( $# < 2 )); then
+    echo "kubectl grantpermission consumer <resourceplural>  <providerKubeconfig>"
     exit 0
 fi
 
@@ -11,7 +11,7 @@ providerKubeconfig=$2
 
 pythonPath=`which python3`
 if [[ $? == 0 ]]; then
-	`$pythonPath /$KUBEPLUS_HOME/plugins/consumerkubeconfigretriever.py $kubeplusNS $resPlural $providerKubeconfig`
+	`$pythonPath /$KUBEPLUS_HOME/plugins/consumerkubeconfigretriever.py $resPlural $providerKubeconfig`
 	echo "Consumer granted permission on $resPlural."
 else
 	echo "Encountered error in granting permission to consumer on $resPlural"

plugins/kubectl-retrieve-kubeconfig-consumer

@@ -7,7 +7,7 @@ print_help () {
     echo "        kubectl retrieve kubeconfig consumer"
     echo ""
     echo "SYNOPSIS"
-    echo "        kubectl retrieve kubeconfig consumer <Namespace in which KubePlus is deployed> [-s <api server url>] [-k <kubeconfig path>]"
+    echo "        kubectl retrieve kubeconfig consumer [-s <api server url>] [-k <kubeconfig path>]"
     echo ""
     echo "DESCRIPTION"
     echo "        This command is used to retrieve consumer kubeconfig file."
@@ -17,17 +17,9 @@ print_help () {
     exit 0
 }
 
-if (( $# < 1 )); then
-	print_help
-    exit 0
-fi
-
-kubeplusNS=$1
 kubeconfig="$HOME/.kube/config" #default value
 serverURL='-1'
 
-shift;
-
 #echo $@
 while getopts ":k:s:" opt; do
   case ${opt} in
@@ -46,33 +38,5 @@ while getopts ":k:s:" opt; do
   esac
 done
 
-python /$KUBEPLUS_HOME/plugins/providerkubeconfigretriever.py $kubeplusNS $serverURL "consumer" $kubeconfig
-
-
-# if (( $# < 1 )); then
-#     echo "kubectl retrieve kubeconfig consumer <Namespace in which KubePlus is deployed> [--server=<api server url>]"
-#     echo " --server=<api server url> is an optional argument to pass the URL of the API server. Generated kubeconfig"
-#     echo " will embed this URL instead of the IP based URL that is generated by KubePlus."
-#     exit 0
-# #    echo "kubectl retrieve kubeconfig consumer <Namespace in which KubePlus is deployed>" #<resourceplural> <providerKubeconfig>"
-# #    exit 0
-# fi
-
-# kubeplusNS=$1
-# serverURL='-1'
-# kubeconfig=~/.kube/config
-# if (( $# == 2 )); then
-# 	serverURL=$2
-# 	#echo "Server URL:$serverURL"
-# fi
-
-# if (( $# == 3 )); then
-# 	serverURL=$2
-# 	#echo "Server URL:$serverURL"
-# 	kubeconfig=$3
-# fi
-
-
-# #kubectl get configmaps kubeplus-saas-consumer-kubeconfig -n $kubeplusNS -o jsonpath="{.data.kubeplus-saas-consumer\.json}"
+python /$KUBEPLUS_HOME/plugins/kubeconfigretriever.py $serverURL "consumer" $kubeconfig
 
-# python /$KUBEPLUS_HOME/plugins/providerkubeconfigretriever.py $kubeplusNS $serverURL "consumer" $kubeconfig

plugins/kubectl-retrieve-kubeconfig-provider

@@ -7,7 +7,7 @@ print_help () {
     echo "        kubectl retrieve kubeconfig provider"
     echo ""
     echo "SYNOPSIS"
-    echo "        kubectl retrieve kubeconfig provider <Namespace in which KubePlus is deployed> [-s <api server url>] [-k <kubeconfig path>]"
+    echo "        kubectl retrieve kubeconfig provider [-s <api server url>] [-k <kubeconfig path>]"
     echo ""
     echo "DESCRIPTION"
     echo "        This command is used to retrieve provider kubeconfig file."
@@ -17,17 +17,9 @@ print_help () {
     exit 0
 }
 
-if (( $# < 1 )); then
-	print_help
-    exit 0
-fi
-
-kubeplusNS=$1
 kubeconfig="$HOME/.kube/config" #default value
 serverURL='-1'
 
-shift;
-
 #echo $@
 while getopts ":k:s:" opt; do
   case ${opt} in
@@ -46,18 +38,5 @@ while getopts ":k:s:" opt; do
   esac
 done
 
-python /$KUBEPLUS_HOME/plugins/providerkubeconfigretriever.py $kubeplusNS $serverURL "provider" $kubeconfig
-
-#if (( $# == 2 )); then
-#	serverURL=$2
-	#echo "Server URL:$serverURL"
-#fi
-
-#if (( $# == 3 )); then
-#	serverURL=$2
-	#echo "Server URL:$serverURL"
-#	kubeconfig=$3
-#fi
-
-#kubeconfig="--kubeconfig="$kubeconfig1
+python /$KUBEPLUS_HOME/plugins/kubeconfigretriever.py $serverURL "provider" $kubeconfig