kubectl appurl plugins update (#1420)

devdattakulkarni · web-flow · commit 60836b638128 · 2025-03-12T09:19:19.000-05:00
diff --git a/examples/multitenancy/application-hosting/odoo/steps.txt b/examples/multitenancy/application-hosting/odoo/steps.txt
@@ -72,7 +72,7 @@ This example shows delivering Bitnami Odoo Helm chart as-a-service using KubePlu
     $ 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`
+    $ appurl=`kubectl appurl OdooService sample-odooservice -k kubeplus-saas-provider.json`
     $ curl $appurl/web/login
       - if the installation is successful, the curl call should return 200 OK.
 
diff --git a/examples/multitenancy/application-hosting/wordpress/steps.txt b/examples/multitenancy/application-hosting/wordpress/steps.txt
@@ -63,7 +63,7 @@ $ kubectl kubeplus commands
 
 11. Wait till all the wp-tenant1 instance pods are in 'Running' state, then perform following actions:
     - Get Wordpress URL
-      $ kubectl appurl WordpressService wp-tenant1 $KUBEPLUS_NS -k kubeplus-saas-provider.json
+      $ kubectl appurl WordpressService wp-tenant1 -k kubeplus-saas-provider.json
       $ curl -v <the app url output from above command>
         - Note that this IP:Port combination will be reachable through your browser only
           if you have opened up your Kubernetes cluster to traffic from outside world.
diff --git a/examples/multitenancy/hello-world/saas-and-managed-app-testing.md b/examples/multitenancy/hello-world/saas-and-managed-app-testing.md
@@ -59,7 +59,7 @@ Multi-namespace setup
     - Hello World Pod in hs1 namespace
 18. kubectl get ns
     - hs1 namespace has been created
-19. kubectl appurl HelloWorldService hs1 default -k consumer.conf
+19. kubectl appurl HelloWorldService hs1 -k consumer.conf
     - curl the IP address received. Should see "Hello hello hello"
 20. kubectl applogs HelloWorldService hs1 -k consumer.conf
     - Should see app logs
@@ -104,7 +104,7 @@ Single namespace setup
 16. kubectl create -f hs1.yaml --kubeconfig=provider.conf
 17. kubectl get pods -A
     - Hello World Pod in kubeplus namespace
-18. kubectl appurl HelloWorldService hs1 kubeplus -k provider.conf
+18. kubectl appurl HelloWorldService hs1 -k provider.conf
     - curl the IP address received. Should see "Hello hello hello"
 19. kubectl applogs HelloWorldService hs1 -k provider.conf
     - Should see app logs
diff --git a/examples/multitenancy/hello-world/steps.txt b/examples/multitenancy/hello-world/steps.txt
@@ -82,7 +82,7 @@ You can use either the provider.conf or consumer.conf in below commands.
 
 
 5. Retrievel application url
-   - kubectl appurl HelloWorldService hs1 default -k consumer.conf
+   - kubectl appurl HelloWorldService hs1 -k consumer.conf
    - curl <app-url> from above output
      - should see "Hello hello hello" displayed
 
diff --git a/examples/multitenancy/managed-service/appmigration/steps.txt b/examples/multitenancy/managed-service/appmigration/steps.txt
@@ -5,12 +5,12 @@
 5. kubectl create -f helloappv1.yaml
 6. kubectl get helloappv1s -o json
 7. kubectl get pods -n hs1
-8. APP1_URL=`kubectl appurl HelloAppV1 hs1 default -k kubeplus-saas-provider.json`
+8. APP1_URL=`kubectl appurl HelloAppV1 hs1 -k kubeplus-saas-provider.json`
 9. curl $APP1_URL
 10. kubectl create -f helloappv1-1.yaml
 11. kubectl get helloappv2s -o json
 12. kubectl get pods -n hs1
-13. APP2_URL=`kubectl appurl HelloAppV2 hs1 default -k kubeplus-saas-provider.json`
+13. APP2_URL=`kubectl appurl HelloAppV2 hs1 -k kubeplus-saas-provider.json`
 14. curl $APP2_URL
 15. kubectl describe helloappv1s
 16. kubectl delete -f helloappv1.yaml 
diff --git a/plugins/appurl.py b/plugins/appurl.py
@@ -8,155 +8,103 @@
 
 class AppURLFinder(CRBase):
 
-	def get_ingresses(self, resources):
-		ingress_list = []
-		for resource in resources:
-			#print(resource)
-			if resource['Kind'] == 'Ingress':
-				present = False
-				for s in ingress_list:
-					if s['Name'] == resource['Name']:
-						present = True
-						break
-				if not present:
-					ingress_list.append(resource)
-		#print(ingress_list)
-		return ingress_list
+    def _get_node_ips(self, kubeconfig):
+        node_ip_types = []
+        node_ips = []
+        node_list = []
 
-	def get_svc(self, resources):
-		svc_list = []
-		for resource in resources:
-			#print(resource)
-			if resource['Kind'] == 'Service':
-				present = False
-				for s in svc_list:
-					if s['Name'] == resource['Name']:
-						present = True
-						break
-				if not present:
-					svc_list.append(resource)
-		#print(svc_list)
-		return svc_list
+        # get all the nodes
+        get_nodes = "kubectl get nodes " + kubeconfig
+        out, err = self.run_command(get_nodes)
+        for line in out.split("\n"):
+            line1 = ' '.join(line.split())
+            if 'NAME' not in line1 and line1 != '':
+                parts = line1.split(" ")
+                nodename = parts[0].strip()
+                node_list.append(nodename)
 
-	def get_host_from_ingress(self, ingresses, namespace, kubeconfig):
-		appURL = ""
-		for ingress in ingresses:
-			cmd = 'kubectl get ingress ' + ingress['Name'] + ' -n ' + ingress['Namespace'] + ' -o json ' + kubeconfig
-			#print(cmd)
-			try:
-				out = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-										stderr=subprocess.PIPE, shell=True).communicate()[0]
+        # for each node, build list of external and internal ips
+        for node in node_list:
+            describe_node = "kubectl describe node " + node + " " + kubeconfig
+            out1, err1 = self.run_command(describe_node)
+            ip_types = {}
+            for line in out1.split("\n"):
+                line1 = ' '.join(line.split())
+                if 'ExternalIP' in line1:
+                    parts = line1.split(":")
+                    nodeIP = parts[1].strip()
+                    ip_types["external"] = nodeIP
+                if 'InternalIP' in line1:
+                    parts = line1.split(":")
+                    nodeIP = parts[1].strip()
+                    ip_types["internal"] = nodeIP
+            node_ip_types.append(ip_types)
 
-				if out:
-					json_output = json.loads(out)
-					#print(json_output)
-					if 'tls' in json_output['spec']:
-						host = json_output['spec']['tls'][0]['hosts'][0]
-						appURL = "https://" + host.strip()
-					else:
-						host = json_output['spec']['rules'][0]['host']
-						appURL = "http://" + host.strip()
-					break
-			except Exception as e:
-				print(e)
-		return appURL
+        # prefer external ip; otherwise return internal ip
+        for item in node_ip_types:
+            if "external" in item:
+                node_ips.append(item["external"])
+            elif "internal" in item:
+                node_ips.append(item["internal"])
 
-	def get_svc_port(self, svcs, namespace, kubeconfig):
-		nodePort = -1
-		for svc in svcs:
-			cmd = 'kubectl get service ' + svc['Name'] + ' -n ' + svc['Namespace'] + ' -o json ' + kubeconfig
-			#print(cmd)
-			try:
-				out = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-										stderr=subprocess.PIPE, shell=True).communicate()[0]
+        return node_ips
 
-				if out:
-					json_output = json.loads(out)
-					#print(json_output)
-					service_type = json_output['spec']['type']
-					if service_type == 'NodePort':
-						nodePort = json_output['spec']['ports'][0]['nodePort']
-						#print("NodePort:" + str(nodePort))
-						break
-			except Exception as e:
-				print(e)
-		return nodePort
 
-	def get_node_ip(self, kubeconfig):
-		cmd = 'kubectl describe node ' + kubeconfig
-		out = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True).communicate()[0]
-		out = out.decode('utf-8')
-		#print("Node o/p:" + out)
-		for line in out.split("\n"):
-			if 'ExternalIP' in line:
-				parts = line.split(":")
-				nodeIP = parts[1].strip()
-				#print("Node IP:" + nodeIP)
-				return nodeIP
-		return ""
+    def get_service_endpoints(self, kind, service_instance_name, kubeconfig):
+        endpoints = []
+        service_name_in_annotation = self.get_service_name_from_ns(service_instance_name, kubeconfig)
 
-	def get_server_ip(self, kubeconfig):
-		server_ip = ''
-		parts = kubeconfig.split("=")
-		kcfg = parts[1].strip()
-		#print(parts)
-		fp = open(kcfg, "r")
-		#fp = open("/root/.kube/config", "r")
-		contents = fp.read()
-		content = ''
-		try:
-			content = json.loads(contents)
-		except:
-			content = yaml.safe_load(contents)
+        if service_name_in_annotation.lower() != kind.lower():
+            print("Instance does not belong to the Service:" + kind)
+            sys.exit(1)
+
+        ingress_cmd = "kubectl get ingress -n " + service_instance_name + " " + kubeconfig
+
+        out, err = self.run_command(ingress_cmd)
+        if "No resources found" not in err:
+            for line in out.split("\n"):
+                line1 = ' '.join(line.split())
+                if 'NAME' not in line1 and line1 != '':
+                    parts = line1.split(" ")
+                    hostname = parts[2].strip()
+                    protocol = "https://"
+                    endpoint = protocol + hostname
+                    endpoints.append(endpoint)
+        else:
+            service_cmd = "kubectl get service -n " + service_instance_name + " " + kubeconfig
+            out1, err1 = self.run_command(service_cmd)
+            for line in out1.split("\n"):
+                line1 = ' '.join(line.split())
+                endpoint = ''
+                if 'NAME' not in line1 and line1 != '':
+                    parts = line1.split(" ")
+                    port_parts = parts[4].split(",")
+                    for protocol in port_parts:
+                        proto_ports = protocol.split(":")
+                        if len(proto_ports) == 2:
+                            proto_port = proto_ports[0].strip()
+                            app_port = (proto_ports[1].strip()).split("/")[0].strip()
+                            if parts[1] == 'LoadBalancer':
+                                if proto_port == '80':
+                                    endpoint = "http://" + parts[2].strip() + ":" + app_port
+                                if proto_port == '443':
+                                    endpoint = "https://" + parts[2].strip() + ":" + app_port
+                            if parts[1] == 'NodePort':
+                                ip_address_list = self._get_node_ips(kubeconfig)
+                                for ipaddr in ip_address_list:
+                                    if proto_port == '80':
+                                        endpoint = "http://" + ipaddr.strip() + ":" + app_port
+                                    if proto_port == '443':
+                                        endpoint = "https://" + ipaddr.strip() + ":" + app_port
+                                    endpoints.append(endpoint)
+
+        return endpoints
 
-		cluster_list = content['clusters']
-		for cluster in cluster_list:
-			cluster_name = cluster['name']
-			#print("Cluster name:" + cluster_name)
-			if cluster_name == 'kubeplus-saas-consumer' or cluster_name == 'kubeplus-saas-provider':
-				server_url = cluster['cluster']['server']
-				#print(server_url)
-				server_url = server_url.strip()
-				parts = server_url.split(":")
-				server_ip = parts[1].strip()
-				#print(server_ip)
-		return server_ip
 
 if __name__ == '__main__':
-	appURLFinder = AppURLFinder()
-	#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)
-	resources = {}
-	if relation == 'connections':
-		resources = appURLFinder.get_resources_connections(kind, instance, namespace, kubeconfig)
-		#print(resources)
-	try:
-		ingresses = appURLFinder.get_ingresses(resources)
-		if len(ingresses) > 0:
-			appURL = appURLFinder.get_host_from_ingress(ingresses, namespace, kubeconfig)
-			print(appURL)
-		else:
-			svcs = appURLFinder.get_svc(resources)
-			svcPort = appURLFinder.get_svc_port(svcs, namespace, kubeconfig)
-			appIP = appURLFinder.get_node_ip(kubeconfig)
-			if appIP == "":
-				appIP = appURLFinder.get_server_ip(kubeconfig)
-			if appIP == '':
-				print("KubePlus SaaS Consumer context not found in the kubeconfig.")
-				print("Cannot form app url.")
-				exit()
-			else:
-				if "//" not in appIP:
-					appIP = "//" + appIP
-				appURL = "http:" + appIP + ":" + str(svcPort)
-				appURL = appURL.strip()
-				#print("App port:" + str(svcPort))
-				print(appURL)
-	except Exception as e:
-		print(e)
+    appURLFinder = AppURLFinder()
+    kind = sys.argv[1]
+    instance = sys.argv[2]
+    kubeconfig = sys.argv[3]
+    endpoints = appURLFinder.get_service_endpoints(kind, instance, kubeconfig)
+    print(str(endpoints))
diff --git a/plugins/kubectl-appurl b/plugins/kubectl-appurl
@@ -7,24 +7,21 @@ print_help () {
     echo "        kubectl appurl"
     echo ""
     echo "SYNOPSIS"
-    echo "        kubectl appurl <Kind> <Instance> <Namespace> -k <Absolute path to kubeconfig>"
+    echo "        kubectl appurl <Kind> <Instance> -k <Absolute path to kubeconfig>"
     echo ""
     echo "DESCRIPTION"
-    echo "        kubectl appurl shows application url. For this it searches for Service object with type NodePort or LoadBalancer in "
-    echo "        the connectivity graph of the input <Kind> <Instance> pair and builds the application url. "
+    echo "        kubectl appurl parses the application url. It first looks for Ingress objects; if no Ingress is defined then it looks for Service objects."
     exit 0
 }
 
-if (( $# < 5 )); then
+if (( $# < 4 )); then
   print_help
 fi
 
 kind=$1
 instance=$2
-namespace=$3
 kubeconfig1=""
 
-shift;
 shift;
 shift;
 
@@ -41,36 +38,19 @@ done
 
 kubeconfig="--kubeconfig="$kubeconfig1
 
-#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 "Instance $instance of $kind not deployed properly."
   echo $resStatus
   exit 0
 fi
 
 
-python3 /$KUBEPLUS_HOME/plugins/appurl.py connections $canonicalKind $instance $namespace $kubeconfig
-
-#appPort=`python /$KUBEPLUS_HOME/plugins/appurl.py connections $kind $instance $namespace $kubeconfig`
-
-#context=`kubectl config current-context $kubeconfig`
-#if [[ $context == 'minikube' ]]; then
-#  appIP=`minikube ip`
-#  appURL="http://$appIP:$appPort"
-#  echo "$appURL"
-#fi
-
-
+python3 /$KUBEPLUS_HOME/plugins/appurl.py $canonicalKind $instance $kubeconfig
