From 08b3407d32d17eb2874aebc5e348be3e02fb5fdd Mon Sep 17 00:00:00 2001
From: Victor Rubezhny <vrubezhny@redhat.com>
Date: Thu, 31 Aug 2023 19:11:23 +0200
Subject: [PATCH] Why is the dependency on vscode-kubernetes added during
 release? #3091

Fixes: #3091

Signed-off-by: Victor Rubezhny <vrubezhny@redhat.com>
---
 .vscode/launch.json         | 3 ++-
 Jenkinsfile                 | 2 --
 build/install-vscode.ts     | 3 ++-
 package.json                | 3 ++-
 test/unit/extension.test.ts | 1 +
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 7f70119d4..b2f934a8d 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -74,7 +74,8 @@
             "sourceMaps": true,
             "preLaunchTask": "instrument",
             "env": {
-                "VSCODE_REDHAT_TELEMETRY_DEBUG":"true"
+                "VSCODE_REDHAT_TELEMETRY_DEBUG":"true",
+                "IS_OPENSHIFT": "true",
             }
         },
         {
diff --git a/Jenkinsfile b/Jenkinsfile
index 6074dd49f..e7f632d89 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,8 +29,6 @@ node('rhel8'){
 
   withEnv(['TARGET=all']) {
     stage('Package sources and ovsx package') {
-        packageJson.extensionDependencies << "ms-kubernetes-tools.vscode-kubernetes-tools"
-        writeJSON file: 'package.json', json: packageJson, pretty: 4
         sh 'node ./out/build/update-readme.js'
         sh "vsce package -o openshift-toolkit-${packageJson.version}-${env.BUILD_NUMBER}-ovsx.vsix"
         sh "sha256sum *-ovsx.vsix > openshift-toolkit-${packageJson.version}-${env.BUILD_NUMBER}-ovsx.vsix.sha256"
diff --git a/build/install-vscode.ts b/build/install-vscode.ts
index 4f46e75fc..e95dcc391 100644
--- a/build/install-vscode.ts
+++ b/build/install-vscode.ts
@@ -28,7 +28,8 @@ void testElectron.downloadAndUnzipVSCode().then((executable: string) => {
 
     // Install extensions that openshift-toolkit depends on
     const extensionsToInstall = [
-        'redhat.vscode-redhat-account'
+        'redhat.vscode-redhat-account',
+        'ms-kubernetes-tools.vscode-kubernetes-tools'
     ];
 
     const extensionRootPath = path.resolve(__dirname, '..', '..');
diff --git a/package.json b/package.json
index c50875887..743bb145a 100644
--- a/package.json
+++ b/package.json
@@ -1895,7 +1895,8 @@
 		]
 	},
 	"extensionDependencies": [
-		"redhat.vscode-redhat-account"
+		"redhat.vscode-redhat-account",
+		"ms-kubernetes-tools.vscode-kubernetes-tools"
 	],
 	"__metadata": {
 		"id": "8fea1f1f-b45c-4eea-b479-3a92c6e697d3",
diff --git a/test/unit/extension.test.ts b/test/unit/extension.test.ts
index 7acf78877..378aee5d3 100644
--- a/test/unit/extension.test.ts
+++ b/test/unit/extension.test.ts
@@ -105,6 +105,7 @@ suite('openshift toolkit Extension', () => {
 
     test('Extension should be present', () => {
 		assert.ok(vscode.extensions.getExtension('redhat.vscode-openshift-connector'));
+		assert.ok(vscode.extensions.getExtension('ms-kubernetes-tools.vscode-kubernetes-tools'));
 	});
 
     test('should register all extension commands declared commands in package descriptor', async function() {