Updated kubectl applogs plugin to remove Namespace parameter

Author: devdattakulkarni

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

@@ -69,7 +69,7 @@ This example shows delivering Bitnami Odoo Helm chart as-a-service using KubePlu
      - this will show all the resources that KubePlus has created for the odoo instance
 
 10. Check logs:
-    $ kubectl applogs OdooService sample-odooservice default -k kubeplus-saas-provider.json 
+    $ kubectl applogs OdooService sample-odooservice -k kubeplus-saas-provider.json 
 
 11. Get application URL:
     $ appurl=`kubectl appurl OdooService sample-odooservice default -k kubeplus-saas-provider.json`

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

@@ -75,7 +75,7 @@ $ kubectl kubeplus commands
       - should see all the created Kubernetes objects for this application instance
 
 13. Get logs:
-    $ kubectl applogs WordpressService wp-tenant1 $KUBEPLUS_NS -k kubeplus-saas-provider.json
+    $ kubectl applogs WordpressService wp-tenant1 -k kubeplus-saas-provider.json
       - should see logs for all the containers in both the Pods
 
 14. Get metrics:

examples/multitenancy/hello-world/saas-and-managed-app-testing.md

@@ -61,7 +61,7 @@ Multi-namespace setup
     - hs1 namespace has been created
 19. kubectl appurl HelloWorldService hs1 default -k consumer.conf
     - curl the IP address received. Should see "Hello hello hello"
-20. kubectl applogs HelloWorldService hs1 default -k consumer.conf
+20. kubectl applogs HelloWorldService hs1 -k consumer.conf
     - Should see app logs
 21. kubectl connections HelloWorldService hs1 default -i Namespace:$KUBEPLUS_NS -k consumer.conf
     - Should see created resources' listing
@@ -106,7 +106,7 @@ Single namespace setup
     - Hello World Pod in kubeplus namespace
 18. kubectl appurl HelloWorldService hs1 kubeplus -k provider.conf
     - curl the IP address received. Should see "Hello hello hello"
-19. kubectl applogs HelloWorldService hs1 kubeplus -k provider.conf
+19. kubectl applogs HelloWorldService hs1 -k provider.conf
     - Should see app logs
 20. kubectl connections HelloWorldService hs1 kubeplus -i Namespace:$KUBEPLUS_NS -k provider.conf
     - Should see created resources' listing

examples/multitenancy/hello-world/steps.txt

@@ -87,7 +87,7 @@ You can use either the provider.conf or consumer.conf in below commands.
      - should see "Hello hello hello" displayed
 
 6. Retrievel application logs
-   - kubectl applogs HelloWorldService hs1 default -k consumer.conf
+   - kubectl applogs HelloWorldService hs1 -k consumer.conf
 
 7. Retrievel application metrics
    - kubectl metrics HelloWorldService hs1 -k consumer.conf

examples/multitenancy/platform-engineering/steps.txt

@@ -82,7 +82,7 @@ Product team
      - this will show all the resources that KubePlus has created for the custom mysql instance
 
 6. Check logs:
-    $ kubectl applogs CustomMysqlService prod-mysql default -k consumer.conf 
+    $ kubectl applogs CustomMysqlService prod-mysql -k consumer.conf 
 
 7. Check metrics:
     $ kubectl metrics CustomMysqlService prod-mysql -k consumer.conf

plugins/crlogs.py

@@ -45,8 +45,7 @@ def get_logs(self, pod, namespace, kubeconfig):
 	crLogs = CRLogs()
 	kind = sys.argv[1]
 	instance = sys.argv[2]
-	namespace = sys.argv[3]
-	kubeconfig = sys.argv[4]
+	kubeconfig = sys.argv[3]
 	resources = {}
 
 	pods = crLogs.get_pods_in_ns(kind, instance, kubeconfig)

plugins/kubectl-applogs

@@ -7,24 +7,22 @@ print_help () {
     echo "        kubectl applogs"
     echo ""
     echo "SYNOPSIS"
-    echo "        kubectl applogs <Kind> <Instance> <Namespace> -k <Absolute path to kubeconfig>"
+    echo "        kubectl applogs <Kind> <Instance> -k <Absolute path to kubeconfig>"
     echo ""
     echo "DESCRIPTION"
-    echo "        kubectl applogs shows container logs for all the containers of all the Pods that are related to the input Kubernetes resource."
+    echo "        kubectl applogs shows container logs for all the containers of all the Pods that are related to the app instance."
     exit 0
 }
 
-if (( $# < 5 )); then
+if (( $# < 4 )); then
   print_help
 fi
 
 kind=$1
 instance=$2
-namespace=$3
 
 kubeconfig1="$HOME/.kube/config" # Default value
 
-shift;
 shift;
 shift;
 
@@ -49,19 +47,18 @@ if [ $# = 4 ] && [[ $4 == *"kubeconfig="* ]]; then
     kubeconfig=$4
 fi
 
-check_namespace $namespace $kubeconfig
-
 canonicalKind=$(get_canonical_kind $kind)
 
 if [[ $canonicalKind == *"Unknown"* ]]; then
 	echo "$canonicalKind"
 	exit 0
 fi
 
-resStatus=`kubectl $kubeconfig get $kind $instance -n $namespace -o json 2>&1`
+kubeplusNamespace=`kubectl get pods -A $kubeconfig | grep kubeplus-deployment | awk '{print $1}'`
+resStatus=`kubectl $kubeconfig get $kind $instance -n $kubeplusNamespace -o json 2>&1`
 if [[ $resStatus =~ 'Error' ]]; then
   echo $resStatus
   exit 0
 fi
 
-python /$KUBEPLUS_HOME/plugins/crlogs.py $canonicalKind $instance $namespace $kubeconfig
+python /$KUBEPLUS_HOME/plugins/crlogs.py $canonicalKind $instance $kubeconfig