Make sure to use microk8s-kubectl.wrapper (#3176) (#3209)

If we call kubectl simply, the system installed kubectl has precedence. That may lead to some weird issues like an error due to a discrepancy between kubectl cli and kubernetes API versions. Closes: #3175 Co-authored-by: Nobuto Murata <[email protected]>
canonical · Jun 8, 2022 · 53ee677 · 53ee677
1 parent e418eb0
commit 53ee677
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/scripts/wrappers/common/utils.py b/scripts/wrappers/common/utils.py
@@ -13,7 +13,7 @@
 
 LOG = logging.getLogger(__name__)
 
-kubeconfig = "--kubeconfig=" + os.path.expandvars("${SNAP_DATA}/credentials/client.config")
+KUBECTL = os.path.expandvars("$SNAP/microk8s-kubectl.wrapper")
 
 
 def get_current_arch():
@@ -188,14 +188,19 @@ def ensure_started():
 
 def kubectl_get(cmd, namespace="--all-namespaces"):
     if namespace == "--all-namespaces":
-        return run("kubectl", kubeconfig, "get", cmd, "--all-namespaces", die=False)
+        return run(KUBECTL, "get", cmd, "--all-namespaces", die=False)
     else:
-        return run("kubectl", kubeconfig, "get", cmd, "-n", namespace, die=False)
+        return run(KUBECTL, "get", cmd, "-n", namespace, die=False)
 
 
 def kubectl_get_clusterroles():
     return run(
-        "kubectl", kubeconfig, "get", "clusterroles", "--show-kind", "--no-headers", die=False
+        KUBECTL,
+        "get",
+        "clusterroles",
+        "--show-kind",
+        "--no-headers",
+        die=False,
     )