hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

review comments

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2021-12-08 15:53:04 -05:00
parent e9f6330830
commit 844b7be954
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/helm/helm-release-manager.ts
View File

@ -69,15 +69,19 @@ export async function installChart(chart: string, values: any, name: string | un
await fse.writeFile(valuesFilePath, yaml.dump(values)); await fse.writeFile(valuesFilePath, yaml.dump(values));
const args = [ const args = ["install"];
"install",
name, if (name) {
args.push(name);
}
args.push(
chart, chart,
"--version", version, "--version", version,
"--values", valuesFilePath, "--values", valuesFilePath,
"--namespace", namespace, "--namespace", namespace,
"--kubeconfig", kubeconfigPath, "--kubeconfig", kubeconfigPath,
]; );
if (!name) { if (!name) {
args.push("--generate-name"); args.push("--generate-name");
@ -193,7 +197,6 @@ export async function rollback(name: string, namespace: string, revision: number
return JSON.parse(await execHelm([ return JSON.parse(await execHelm([
"rollback", "rollback",
name, name,
"--output", "json",
"--namespace", namespace, "--namespace", namespace,
"--kubeconfig", kubeconfigPath, "--kubeconfig", kubeconfigPath,
])); ]));
@ -222,10 +225,6 @@ async function getResources(name: string, namespace: string, kubeconfigPath: str
let stdout = ""; let stdout = "";
const kubectl = execFile(kubectlPath, kubectlArgs); const kubectl = execFile(kubectlPath, kubectlArgs);
kubectl.stdout.on("data", output => stdout += output);
kubectl.stdin.write(helmOutput);
kubectl.stdin.end();
kubectl kubectl
.on("exit", (code, signal) => { .on("exit", (code, signal) => {
if (typeof code === "number") { if (typeof code === "number") {
@ -239,6 +238,10 @@ async function getResources(name: string, namespace: string, kubeconfigPath: str
} }
}) })
.on("error", reject); .on("error", reject);
kubectl.stdout.on("data", output => stdout += output);
kubectl.stdin.write(helmOutput);
kubectl.stdin.end();
}); });
} catch { } catch {
return []; return [];

20
src/main/helm/helm-repo-manager.ts
View File

@ -91,20 +91,18 @@ export class HelmRepoManager extends Singleton {
protected static async parseHelmEnv() { protected static async parseHelmEnv() {
const output = await execHelm(["env"]); const output = await execHelm(["env"]);
const env = output const lines = output.split(/\r?\n/); // split by new line feed
.split("\n") const env: HelmEnv = {};
.map(line => {
const match = line.match(/^(?<key>[^=]*)=(?<value>.*)$/);
if (match) { lines.forEach((line: string) => {
return [match.groups.key, match.groups.value]; const [key, value] = line.split("=");
}
return null; if (key && value) {
}) env[key] = value.replace(/"/g, ""); // strip quotas
.filter(Boolean); }
});
return Object.fromEntries(env); return env;
} }
public async repo(name: string): Promise<HelmRepo> { public async repo(name: string): Promise<HelmRepo> {