1
0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00

review comments

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

View File

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

View File

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