Merge remote-tracking branch 'origin/main' into auto-updater

kubeshop · Oct 24, 2023 · cd10c2f · cd10c2f
2 parents 0492696 + 95f254b
commit cd10c2f
Show file tree

Hide file tree

Showing 22 changed files with 10,401 additions and 4,690 deletions.
diff --git a/.npmrc b/.npmrc
@@ -3,8 +3,8 @@ audit = false
 fund = false
 update-notifier = true
 # Lock versions of node and npm, when looking up engines.
-node-version = 18.16.0
-npm-version = 9.5.1
+node-version = 18.17.0
+npm-version = 9.6.7
 # Default options for package-lock - package-lock=true package-lock-only=false
 # If set to false, then ignore package-lock.json files when installing. This will also prevent writing package-lock.json if save is true.
 # When package package-locks are disabled, automatic pruning of extraneous modules will also be disabled.

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-18.16.0
+18.17.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.4.2](https://github.com/kubeshop/monokle/compare/v2.4.2-nightly-2023-10-23.0...v2.4.2) (2023-10-23)
+
+
+### Bug Fixes
+
+* remove old monokle cli ([140b428](https://github.com/kubeshop/monokle/commit/140b4280fd7d502a976357a903797a4d7553bb4c))
+* typo ([c0bd910](https://github.com/kubeshop/monokle/commit/c0bd9107ea0485b58049e5185cca1432b3f9039c))
+* values and dry run config selections ([c903c38](https://github.com/kubeshop/monokle/commit/c903c385c3032e70317b807750ed9d5754be56d2))
+
 ### [2.4.1](https://github.com/kubeshop/monokle/compare/v2.4.1-nightly-2023-10-11.0...v2.4.1) (2023-10-11)
 
 

diff --git a/cli/terminal.ts b/cli/terminal.ts
diff --git a/docs/docs/cluster-issues.md b/docs/docs/cluster-issues.md
@@ -1,24 +1,20 @@
-<<<<<<< HEAD:docs/docs/cluster-issues.md
 # Troubleshooting Connections
 
-Welcome to the Monokle troubleshooting guide for cluster connections. 
-=======
-# Welcome to the Monokle Troubleshooting Guide for Cluster Connections. 
->>>>>>> main:docs/cluster-issues.md
+Welcome to the Monokle troubleshooting guide for cluster connections.
 
-This page will provide you with two methods to help resolve any issues you may be experiencing when attempting to connect to your Kubernetes clusters through the Monokle app.  
-The first method involves using the in-app proxy setting, while the second method involves manually configuring a proxy using the kubectl command.  
+This page will provide you with two methods to help resolve any issues you may be experiencing when attempting to connect to your Kubernetes clusters through the Monokle app.
+The first method involves using the in-app proxy setting, while the second method involves manually configuring a proxy using the kubectl command.
 
-1. Using the Proxy setting in Monokle 
-    - Within the Monokle application, navigate to the Settings panel and go to the "Global Settings" section. 
-    - Click on the checkbox for "Enable Proxy". 
+1. Using the Proxy setting in Monokle
+    - Within the Monokle application, navigate to the Settings panel and go to the "Global Settings" section.
+    - Click on the checkbox for "Enable Proxy".
     - This setting will start a proxy to the Kubernetes API server before connecting to the cluster, which can be helpful for advanced authentication setups.
 
-or 
+or
 
 2. Starting a Proxy server manually
-    - If the proxy setting does not resolve the issue, you can try using a proxy manually. 
-    - To do this, run the command "kubectl proxy --port=**PROXY_PORT**" in a terminal, replacing **PROXY_PORT** with the port you would like to open the proxy on. 
+    - If the proxy setting does not resolve the issue, you can try using a proxy manually.
+    - To do this, run the command "kubectl proxy --port=**PROXY_PORT**" in a terminal, replacing **PROXY_PORT** with the port you would like to open the proxy on.
     - Next, create a kubeconfig file in any location on your local system, using the following format:
       ```yaml
       apiVersion: v1
@@ -37,7 +33,7 @@ or
       ```
     - Remember to replace **PROXY_PORT** with the same port you've used to open the proxy.
     - In the Monokle application, open the Settings panel and navigate to the KUBECONFIG setting under Project Settings.
-    - Browse for the file you've created and select it to be used by Monokle. The Cluster Selector in the header should be updated with the new "proxy" context. 
+    - Browse for the file you've created and select it to be used by Monokle. The Cluster Selector in the header should be updated with the new "proxy" context.
     - Try connecting to the cluster again to see if the problem persists.
 
 

diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js
@@ -46,7 +46,7 @@ const config = {
           sidebarPath: require.resolve('./sidebars.js'),
           // Please change this to your repo.
           // Remove this to remove the "edit this page" links.
-          editUrl: `https://github.com/${organizationName}/${projectName}/tree/main/`,
+          editUrl: `https://github.com/${organizationName}/${projectName}/edit/main/docs/`,
         },
         blog: false,
         theme: {

diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/electron/app/index.ts b/electron/app/index.ts
@@ -1,11 +1,9 @@
 import {app} from 'electron';
-import log from 'electron-log';
 
 import {machineIdSync} from 'node-machine-id';
 import yargs from 'yargs';
 import {hideBin} from 'yargs/helpers';
 
-import terminal from '@root/cli/terminal';
 import {init as sentryInit} from '@sentry/electron/main';
 import electronStore from '@shared/utils/electronStore';
 import '@shared/utils/segment';
@@ -55,5 +53,3 @@ if (process.env.MONOKLE_RUN_AS_NODE) {
 } else {
   openApplication();
 }
-
-terminal().catch(e => log.error(e));