Modified kubectl-applogs plugin file and crlogs.py file (#1374)

* Modified kubectl-applogs plusing file and crlogs.py file.

removed "connections" parameter from the command "python /$KUBEPLUS_HOME/plugins/crlogs.py $canonicalKind $instance $namespace $kubeconfig" in kubectl-applogs plugin file.

removed unnecessary code from crlogs.py file including the commented code and relation block for connections and composition.

* Removed two unused functions from clogs.py
1. get_resources_composition
2. get_pods1

Author: rahulkumar-choudhary

plugins/crlogs.py

@@ -25,7 +25,6 @@ def _get_container_logs(self, pod, namespace, containers, kubeconfig):
 
 	def get_logs(self, pod, namespace, kubeconfig):
 		cmd = 'kubectl get pods ' + pod + ' -n ' + namespace + ' -o json ' + kubeconfig
-		#print(cmd)
 		try:
 			out = subprocess.Popen(cmd, stdout=subprocess.PIPE,
 									stderr=subprocess.PIPE, shell=True).communicate()[0]
@@ -42,72 +41,17 @@ def get_logs(self, pod, namespace, kubeconfig):
 		except Exception as e:
 			print(e)
 
-	def get_resources_composition(self, kind, instance, namespace, kubeconfig):
-		platf = platform.system()
-		kubeplus_home = os.getenv('KUBEPLUS_HOME')
-		cmd = ''
-		json_output = {}
-		if platf == "Darwin":
-			cmd = kubeplus_home + '/plugins/kubediscovery-macos composition ' 
-		elif platf == "Linux":
-			cmd = kubeplus_home + '/plugins/kubediscovery-linux composition '
-		else:
-			print("OS not supported:" + platf)
-			return json_output
-		cmd = cmd + kind + ' ' + instance + ' ' + namespace + ' ' + kubeconfig
-		#print(cmd)
-		out = ''
-		try:
-			out = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-								   stderr=subprocess.PIPE, shell=True).communicate()[0]
-			out = out.decode('utf-8')
-		except Exception as e:
-			print(e)
-		if out:
-			print(out)
-			try:
-				json_output = json.loads(out)
-			except Exception as e:
-				print(e)
-		return json_output
-
-	def get_pods1(self, resources):
-		pod_list = []
-		for resource in resources:
-			#print(resource)
-			if resource['Kind'] == 'Pod':
-				present = False
-				for p in pod_list:
-					if p['Name'] == resource['Name']:
-						present = True
-						break
-				if not present:
-					pod_list.append(resource)
-		#print(pod_list)
-		return pod_list
-
 if __name__ == '__main__':
 	crLogs = CRLogs()
-	#crLogs.get_logs(sys.argv[1], sys.argv[2])
-	#resources = sys.argv[1]
-	relation = sys.argv[1]
-	kind = sys.argv[2]
-	instance = sys.argv[3]
-	namespace = sys.argv[4]
-	kubeconfig = sys.argv[5]
-	#print(kind + " " + instance + " " + namespace + " " + kubeconfig)
+	kind = sys.argv[1]
+	instance = sys.argv[2]
+	namespace = sys.argv[3]
+	kubeconfig = sys.argv[4]
 	resources = {}
-	#if relation == 'connections':
-	#	resources = crLogs.get_resources_connections(kind, instance, namespace, kubeconfig)
-	#	#print(resources)
-	#if relation == 'composition':
-	#	resources = crLogs.get_resources_composition(kind, instance, namespace, kubeconfig)
-	#	#print(resources)
-	#resource_json = json.loads(resources)
+
 	pods = crLogs.get_pods_in_ns(kind, instance, kubeconfig)
 	for pod in pods:
 		pod_name = pod['Name']
 		pod_namespace = pod['Namespace']
-		#print(pod_name)
 		crLogs.get_logs(pod_name, pod_namespace, kubeconfig)
 		print("---------------------------------------")

plugins/kubectl-applogs

@@ -21,8 +21,8 @@ fi
 kind=$1
 instance=$2
 namespace=$3
-# Only --kubeconfig specified
-kubeconfig1="$HOME/.kube/config" #default value
+
+kubeconfig1="$HOME/.kube/config" # Default value
 
 shift;
 shift;
@@ -51,8 +51,6 @@ fi
 
 check_namespace $namespace $kubeconfig
 
-#echo "$kind $instance $namespace"
-
 canonicalKind=$(get_canonical_kind $kind)
 
 if [[ $canonicalKind == *"Unknown"* ]]; then
@@ -62,16 +60,8 @@ fi
 
 resStatus=`kubectl $kubeconfig get $kind $instance -n $namespace -o json 2>&1`
 if [[ $resStatus =~ 'Error' ]]; then
-#  echo "Instance $instance of $kind not deployed properly."
   echo $resStatus
   exit 0
 fi
 
-
-
-python /$KUBEPLUS_HOME/plugins/crlogs.py connections $canonicalKind $instance $namespace $kubeconfig
-
-
-#echo "kubectl grouplogs cr connections"
-#echo "kubectl grouplogs service"
-#echo "kubectl grouplogs helmrelease"
+python /$KUBEPLUS_HOME/plugins/crlogs.py $canonicalKind $instance $namespace $kubeconfig