v1.4.8 add a fix to kubectl path managment

lefebsy · Jun 16, 2022 · 0a1f7f9 · 0a1f7f9
1 parent a809e6a
commit 0a1f7f9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/.sonarcloud.properties b/.sonarcloud.properties
@@ -1 +1 @@
-sonar.projectVersion=1.4.7
+sonar.projectVersion=1.4.8
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 All notable changes to the "vskubi-lite" extension will be documented in this file.
 
+## 1.4.8
+- Fix kubectl path for latest kubernetes exenstion versions
+
 ## 1.4.7
 - Fix security
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vskubi-lite",
-	"version": "1.4.7",
+	"version": "1.4.8",
 	"displayName": "Kubi-lite",
 	"description": "Kubernetes CA-GIP/Kubi CLI, Lite wrapper version compatible with VSCode and Theia IDE",
 	"engines": {
@@ -172,7 +172,7 @@
 		"eslint": "^7.10.0",
 		"glob": "^7.1.6",
 		"js-yaml": "3.14.0",
-		"minimist": ">=1.2.5",
+		"minimist": ">=1.2.6",
 		"mocha": "^8.1.3",
 		"node-forge": ">=0.10.0",
 		"ts-loader": "^8.0.4",

diff --git a/src/helpers.ts b/src/helpers.ts
@@ -91,12 +91,13 @@ export function refreshStatusBar(kubiStatusChannel: vscode.StatusBarItem, endpoi
  * Get Kubectl path from vsKubernetes settings
  */
 export function kctl(): string {
-    const kubectlPath = vscode.workspace.getConfiguration('vs-kubernetes')['vs-kubernetes.kubectl-path'];
-    const kubectlPathLinux = vscode.workspace.getConfiguration('vs-kubernetes')['vs-kubernetes.kubectl-path.linux'];
-    const kubectlPathWindows = vscode.workspace.getConfiguration('vs-kubernetes')['vs-kubernetes.kubectl-path.windows'];
-    return kubectlPath || kubectlPathLinux || kubectlPathWindows;
-}
+    let kubectlPath = vscode.workspace.getConfiguration('vscode-kubernetes')['kubectl-path'];
+
+    // old way kubernetes extension storing settings
+    let legacy_kubectlPath = vscode.workspace.getConfiguration('vs-kubernetes')['vs-kubernetes.kubectl-path'];
 
+    return kubectlPath || legacy_kubectlPath || 'kubectl path not found, set it in kubernetes extension please';
+}
 
 /**
  * Write directly in the KubeConfig file a new default context namespace