Skip to content
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.

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

feat: helm import #1202

Merged
merged 40 commits into from
Oct 5, 2023
Merged
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
dca862e
feat: helm import
vinayak-kukreja Jul 31, 2023
b0ac49a
Merge branch 'cdk8s-team:2.x' into vkukreja/helm-import
vinayak-kukreja Aug 1, 2023
63be194
Merge branch '2.x' into vkukreja/helm-import
vinayak-kukreja Aug 8, 2023
eee2666
update pr
vinayak-kukreja Aug 8, 2023
75d1648
update regex
vinayak-kukreja Aug 8, 2023
f6cf8c9
add support for subchart and global
vinayak-kukreja Aug 9, 2023
3516843
update PR
vinayak-kukreja Aug 9, 2023
f7ebbbe
update with correct interfaces
vinayak-kukreja Aug 9, 2023
79218e6
Merge branch '2.x' into vkukreja/helm-import
iliapolo Aug 24, 2023
4ca1861
address feedback
vinayak-kukreja Sep 26, 2023
4fb10d1
update PR
vinayak-kukreja Sep 26, 2023
7171f97
update PR
vinayak-kukreja Sep 27, 2023
bf2e5a5
update PR
vinayak-kukreja Sep 27, 2023
3b21416
remove comments
vinayak-kukreja Sep 27, 2023
1d332bb
Merge branch '2.x' into vkukreja/helm-import
vinayak-kukreja Sep 27, 2023
94020bb
update PR
vinayak-kukreja Sep 27, 2023
17feb41
investigate build failure
vinayak-kukreja Sep 27, 2023
0ade12e
investigate build failure
vinayak-kukreja Sep 27, 2023
af24dc7
investigate build failure
vinayak-kukreja Sep 27, 2023
8bd5102
investigate build failure
vinayak-kukreja Sep 27, 2023
372e87b
fixing build
vinayak-kukreja Sep 27, 2023
c457d9b
fixing build
vinayak-kukreja Sep 27, 2023
292df3b
update PR
vinayak-kukreja Sep 27, 2023
c2558df
update PR
vinayak-kukreja Sep 28, 2023
be67d5d
update PR
vinayak-kukreja Sep 28, 2023
814cbac
Merge branch '2.x' into vkukreja/helm-import
iliapolo Sep 28, 2023
9e6f60f
update PR
vinayak-kukreja Sep 28, 2023
343d1b1
update PR
vinayak-kukreja Sep 28, 2023
dcd019d
update PR
vinayak-kukreja Sep 29, 2023
6787b6b
update PR
vinayak-kukreja Sep 29, 2023
eee43e7
Merge branch '2.x' into vkukreja/helm-import
vinayak-kukreja Sep 29, 2023
2e28390
Merge branch '2.x' into vkukreja/helm-import
iliapolo Oct 2, 2023
c2e7513
update PR
vinayak-kukreja Oct 3, 2023
ef82b6f
Merge branch '2.x' into vkukreja/helm-import
vinayak-kukreja Oct 3, 2023
50d14bd
update PR
vinayak-kukreja Oct 3, 2023
ef166f2
update PR
vinayak-kukreja Oct 3, 2023
e4ee20a
Merge branch '2.x' into vkukreja/helm-import
iliapolo Oct 3, 2023
2995e26
update PR
vinayak-kukreja Oct 3, 2023
7016ab4
update PR
vinayak-kukreja Oct 4, 2023
a28a3f6
Merge branch '2.x' into vkukreja/helm-import
iliapolo Oct 5, 2023
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
Prev Previous commit
Next Next commit
investigate build failure
Signed-off-by: Vinayak Kukreja <vinakuk@amazon.com>
vinayak-kukreja committed Sep 27, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 8bd51028905a8520ff6722cce0fef596d1c6d75b
5 changes: 3 additions & 2 deletions src/import/helm.ts
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@ import { spawnSync } from 'child_process';
import * as fs from 'fs';
import * as os from 'os';
import * as path from 'path';
import { Yaml } from 'cdk8s';
import { CodeMaker } from 'codemaker';
// we just need the types from json-schema
// eslint-disable-next-line import/no-extraneous-dependencies
import { JSONSchema4 } from 'json-schema';
iliapolo marked this conversation as resolved.
Show resolved Hide resolved
import { TypeGenerator } from 'json2jsii';
import * as semver from 'semver';
import * as yaml from 'yaml';
import { ImportBase } from './base';
import { emitHelmHeader, generateHelmConstruct } from './codegen';
import { ImportSpec } from '../config';
@@ -51,7 +51,8 @@ export class ImportHelm extends ImportBase {
}

const chartYamlFilePath = path.join(this.tmpDir, this.chartName, CHART_YAML);
const contents = Yaml.load(chartYamlFilePath);
// const contents = Yaml.load(chartYamlFilePath);
const contents = yaml.parse(fs.readFileSync(chartYamlFilePath, 'utf-8'));
if (contents && contents.length === 1) {
for (const dependency of contents[0].dependencies) {
this.chartDependencies.push(dependency.name);
Loading