Skip to content

Fix up docs for exec #792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 4, 2022
Merged

Fix up docs for exec #792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9821099
fix problems with WSL + Windows
brendandburns Apr 1, 2022
da9dfd3
Update docs for the exec command.
brendanburns Apr 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,25 +311,25 @@ export class KubeConfig {
}
if (process.platform === 'win32' && shelljs.which('wsl.exe')) {
try {
const envKubeconfigPathResult = execa.sync('wsl.exe', ['bash', '-ic', 'printenv KUBECONFIG']);
const envKubeconfigPathResult = execa.sync('wsl.exe', ['bash', '-c', 'printenv KUBECONFIG']);
if (envKubeconfigPathResult.exitCode === 0 && envKubeconfigPathResult.stdout.length > 0) {
const result = execa.sync('wsl.exe', ['cat', envKubeconfigPathResult.stdout]);
if (result.exitCode === 0) {
this.loadFromString(result.stdout, opts);
return;
}
if (result.exitCode === 0) {
this.loadFromString(result.stdout, opts);
return;
}
}
} catch (err) {
// Falling back to default kubeconfig
}
try {
const result = execa.sync('wsl.exe', ['cat', '~/.kube/config']);
if (result.exitCode === 0) {
this.loadFromString(result.stdout, opts);
const configResult = execa.sync('wsl.exe', ['cat', '~/.kube/config']);
if (configResult.exitCode === 0) {
this.loadFromString(configResult.stdout, opts);
const result = execa.sync('wsl.exe', ['wslpath', '-w', '~/.kube']);
if (result.exitCode === 0) {
this.makePathsAbsolute(result.stdout);
}
return;
}
} catch (err) {
Expand Down
2 changes: 1 addition & 1 deletion src/exec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export class Exec {
* @param {boolean} tty - Should the command execute in a TTY enabled session.
* @param {(V1Status) => void} statusCallback -
* A callback to received the status (e.g. exit code) from the command, optional.
* @return {string} This is the result
* @return {Promise<WebSocket>} A promise that will return the web socket created for this command.
*/
public async exec(
namespace: string,
Expand Down