Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into auto-updater
Browse files Browse the repository at this point in the history
  • Loading branch information
devcatalin committed Jul 24, 2023
2 parents e77d051 + 16ff2ae commit 82f29da
Show file tree
Hide file tree
Showing 57 changed files with 4,098 additions and 5,805 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/monokle-publish-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ name: monokle-sign-notarize-publish-test
on:
push:
branches:
# Add your branch name here
- erdikose/test/test
- build/test

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand All @@ -32,6 +31,8 @@ jobs:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it.
- name: Checkout Project
uses: actions/checkout@v2
with:
ref: build/test

# Check memory and cpu
- name: Verify Runner Resources
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

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.3.2](https://github.com/kubeshop/monokle/compare/v2.3.2-nightly-2023-07-24.0...v2.3.2) (2023-07-24)


### Bug Fixes

* helm details drawer in cluster mode ([52fa48a](https://github.com/kubeshop/monokle/commit/52fa48ab3117038a2514e1d99f15539c6d0fa339))
* set kubeconfig arg on all helm commands ([fbbcfeb](https://github.com/kubeshop/monokle/commit/fbbcfeb5e06eeb801db73c620033a2844f9fd3e9))

### [2.3.1](https://github.com/kubeshop/monokle/compare/v2.3.1-nightly-2023-07-07.0...v2.3.1) (2023-07-07)


Expand Down
144 changes: 72 additions & 72 deletions docs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions electron/app/services/cluster/handlers/debugProxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ export async function debugProxy({context, kubeconfig}: DebugProxyArgs): Promise
};
}
}

export const getProxyPort = (context: string) => PROXY_SERVICE.find(context)?.port;
5 changes: 4 additions & 1 deletion electron/app/services/cluster/ipc.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import {handleIpc} from '../../utils/ipc';
import {debugProxy, getKubeConfig, setup, stopWatchingKubeconfig, watchKubeconfig} from './handlers';
import {debugProxy, getKubeConfig, getProxyPort, setup, stopWatchingKubeconfig, watchKubeconfig} from './handlers';
import {getEnvKubeconfigs} from './utils/getDefaultKubeConfig';

// Cluster & Proxy management
handleIpc('cluster:setup', setup);
handleIpc('cluster:debug-proxy', debugProxy);
handleIpc('cluster:get-proxy-port', getProxyPort);

// Kubeconfig management
handleIpc('kubeconfig:get', getKubeConfig);
handleIpc('kubeconfig:get:env', getEnvKubeconfigs);
handleIpc('kubeconfig:watch', watchKubeconfig);
handleIpc('kubeconfig:watch:stop', stopWatchingKubeconfig);
5 changes: 5 additions & 0 deletions electron/app/services/cluster/utils/getDefaultKubeConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,8 @@ export function getDefaultKubeConfig() {
const kubeConfigPath = path.join(home, `${path.sep}.kube${path.sep}config`);
return kubeConfigPath;
}

export function getEnvKubeconfigs(): string[] {
const kubeconfig = getDefaultKubeConfig();
return kubeconfig.split(':');
}
4 changes: 4 additions & 0 deletions electron/kubernetes/ProxyService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ export class ProxyService {
return this.start(context, kubeconfig);
}

find(context: string) {
return this.proxies.find(p => p.context === context);
}

private async start(context: string, kubeconfig?: string): Promise<ProxyInstance> {
let attempt = 0;
// eslint-disable-next-line no-constant-condition
Expand Down
Loading

0 comments on commit 82f29da

Please sign in to comment.