From ce93547df7b633d965fe4b0fd6235a70879f74ed Mon Sep 17 00:00:00 2001
From: Jonathan Ervine <57888439+jervine-gogo@users.noreply.github.com>
Date: Mon, 28 Dec 2020 15:48:07 +0800
Subject: [PATCH] 'pklk

---
 main.py | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/main.py b/main.py
index ab09c7e..f205039 100644
--- a/main.py
+++ b/main.py
@@ -23,33 +23,6 @@ def get_namespaces():
     ns = v1.list_namespace()
     return ns
 
-<<<<<<< HEAD
-def get_tiller_namespaces():
-    command = "/usr/local/bin/kubectl get deploy --all-namespaces -l name=tiller -ojson"
-    info(f"Running command: {command}")
-    try:
-        output = check_output(command.split(" "), stderr=STDOUT).decode("utf-8")
-    except CalledProcessError as err:
-        error(err.output.decode("utf-8"))
-        raise err
-    info(f"Output from command:\n{output}")
-    data = json.loads(output)
-    return data
-
-def get_deployments(namespace):
-    command = "/usr/local/bin/kubectl -n " + namespace + " get deploy -ojson"
-    info(f"Running command: {command}")
-    try:
-        output = check_output(command.split(" "), stderr=STDOUT).decode("utf-8")
-    except CalledProcessError as err:
-        error(err.output.decode("utf-8"))
-        raise err
-    info(f"Output from command:\n{output}")
-    data = json.loads(output)
-    return data
-
-=======
->>>>>>> a7df40eb7710553f5d0185c3fa04ea6991c06f89
 def get_charts(ns):
     command = "/usr/local/bin/helm -n " + ns + " list -ojson" #helm3
     info(f"Running command: {command}")