feat(plugins): allow consumer name argument in show consumer permissions

- Add optional ConsumerName parameter (defaults to kubeplus-saas-consumer)
- Supports custom consumers created via provider-kubeconfig.py -c (e.g. team1, team2)
- Update help text and kubectl-kubeplus-commands documentation
- Fixes #1091

Author: anniegracehu

plugins/kubeconfigretriever.py

@@ -11,9 +11,9 @@ 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 + r" -o jsonpath=\"{.data.kubeplus-saas-provider\.json}\""
+			cmd = "kubectl get configmaps kubeplus-saas-provider -n " + kubeplusNS + r" -o jsonpath='{.data.kubeplus-saas-provider\.json}'"
 		if kubeconfigFor == 'consumer':
-			cmd = "kubectl get configmaps kubeplus-saas-consumer-kubeconfig -n " + kubeplusNS + r" -o jsonpath=\"{.data.kubeplus-saas-consumer\.json}\""
+			cmd = "kubectl get configmaps kubeplus-saas-consumer-kubeconfig -n " + kubeplusNS + r" -o jsonpath='{.data.kubeplus-saas-consumer\.json}'"
 
 		cmd = cmd + " --kubeconfig=" + kubeconfig
 		out = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True).communicate()[0]

plugins/kubectl-kubeplus-commands

@@ -16,7 +16,7 @@ print_help () {
     echo "        kubectl grantpermission consumer"
     echo "        kubectl upload chart"
     echo "        kubectl show provider permissions"
-    echo "        kubectl show consumer permissions"
+    echo "        kubectl show consumer permissions <Namespace> [ConsumerName]"
     echo "        kubectl license create"
     echo "        kubectl license get"
     echo "        kubectl license delete"
@@ -57,7 +57,7 @@ print_help () {
     echo "        Upload Helm chart (tgz) to KubePlus Operator."
     echo ""
     echo "        - kubectl show provider permissions shows the permissions for kubeplus-saas-provider service account in the namespace where kubeplus is installed."
-    echo "        - kubectl show consumer permissions shows the permissions for kubeplus-saas-consumer service account in the namespace where kubeplus is installed."
+    echo "        - kubectl show consumer permissions shows the RBAC permissions for a consumer. Optional ConsumerName defaults to kubeplus-saas-consumer."
     echo "        License Management."
     echo "        - kubectl license create - creates license for a Kind"
     echo "        - kubectl license get    - gets license for a Kind"

plugins/kubectl-show-consumer-permissions

@@ -7,19 +7,27 @@ print_help () {
     echo "        kubectl show consumer permissions"
     echo ""
     echo "SYNOPSIS"
-    echo "        kubectl show consumer permissions <Namespace>"
+    echo "        kubectl show consumer permissions <Namespace> [ConsumerName]"
     echo ""
     echo "DESCRIPTION"
-    echo "        kubectl show consumer permissions shows the permissions for kubeplus-saas-consumer service account in the namespace where kubeplus is installed."
+    echo "        kubectl show consumer permissions shows the RBAC permissions for a consumer service account."
+    echo "        Namespace is the namespace where KubePlus is installed (where the consumer service account lives)."
+    echo "        ConsumerName is optional; if omitted, defaults to kubeplus-saas-consumer."
+    echo "        Use a custom ConsumerName when you have created consumers with provider-kubeconfig.py -c (e.g. team1, team2)."
+    echo ""
+    echo "EXAMPLES"
+    echo "        kubectl show consumer permissions default"
+    echo "        kubectl show consumer permissions default team1"
     exit 0
 }
 
-if (( $# < 1 || $# >= 2)); then
+if (( $# < 1 || $# > 2)); then
   print_help
 fi
 
 namespace="$1"
+consumer="${2:-kubeplus-saas-consumer}"
 
 check_namespace $namespace
 
-kubectl auth can-i --list --as=system:serviceaccount:$namespace:kubeplus-saas-consumer
+kubectl auth can-i --list --as=system:serviceaccount:$namespace:$consumer