Fix kubeconfigretriever: raw string for jsonpath, handle double-encoded ConfigMap value

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 + " -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 + " -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}\""			
 
 		#kubeconfigParts = kubeconfig.split("=")
 		#kubeconfigPath = kubeconfigParts[1].strip()
@@ -24,19 +24,19 @@ def retrieve_kubeconfig(self, serverURL, kubeconfigFor, kubeconfig):
 		json_output = {}
 		try:
 			json_output = json.loads(out)
+			if isinstance(json_output, str):
+				json_output = json.loads(json_output)
 		except Exception as e:
 			print(e)
 			print("KubePlus might not be ready yet. Try again once the KubePlus Pod is running.")
-		if serverURL != '-1':
-			#parts = serverURL.split("=")
-			#sURL = parts[1].strip()
-			#if sURL != '':
-			json_output["clusters"][0]["cluster"]["server"] = serverURL
-		try:
-			pkubeconfig = json.dumps(json_output)
-			print(pkubeconfig)
-		except Exception as e:
-			print(e)
+		if isinstance(json_output, dict):
+			if serverURL != '-1':
+				json_output["clusters"][0]["cluster"]["server"] = serverURL
+			try:
+				pkubeconfig = json.dumps(json_output)
+				print(pkubeconfig)
+			except Exception as e:
+				print(e)
 
 if __name__ == '__main__':