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.

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

OCI support in Helm builtin #4614

Closed
wants to merge 10 commits into from
Closed

OCI support in Helm builtin #4614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
35ce291
wip: oci pull command
mikebz May 1, 2022
9e6bb98
updated to helm v3.8+
mikebz May 2, 2022
98ea818
added an OCI unit test
mikebz May 2, 2022
494196b
removing the HELM_CONFIG_HOME etc
mikebz May 2, 2022
1a029f1
linter feedback
mikebz May 2, 2022
0cf79b3
removing the creation of the temp dir
mikebz May 4, 2022
e0b4278
linter
mikebz May 4, 2022
a42e67e
another linter issue
mikebz May 4, 2022
91d38e8
another linter happy change
mikebz May 4, 2022
6dac723
resolving conflicts
mikebz Nov 23, 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
40 changes: 21 additions & 19 deletions api/internal/builtins/HelmChartInflationGenerator.go
View file
Open in desktop

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

12 changes: 9 additions & 3 deletions plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,15 @@ func (p *HelmChartInflationGeneratorPlugin) pullCommand() []string {
args := []string{
"pull",
"--untar",
"--untardir", p.absChartHome(),
"--repo", p.Repo,
p.Name}
"--untardir", p.absChartHome()}

// OCI pull combine the repo and the chart name into one URL
if strings.HasPrefix(p.Repo, "oci://") {
chartUrl := p.Repo + "/" + p.Name
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to clarify, it's saying Url should be URL in the variable name, I missed the distinction on first read-through.

args = append(args, chartUrl)
} else {
args = append(args, "--repo", p.Repo, p.Name)
}
if p.Version != "" {
args = append(args, "--version", p.Version)
}
Expand Down
22 changes: 22 additions & 0 deletions plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,3 +579,25 @@ valuesInline:
`)
th.AssertActualEqualsExpected(rm, "")
}

func TestHelmChartInflationGeneratorOciRegistry(t *testing.T) {
th := kusttest_test.MakeEnhancedHarnessWithTmpRoot(t).
PrepBuiltin("HelmChartInflationGenerator")
defer th.Reset()
if err := th.ErrIfNoHelm(); err != nil {
t.Skip("skipping: " + err.Error())
}

rm := th.LoadAndRunGenerator(`
apiVersion: builtin
kind: HelmChartInflationGenerator
metadata:
name: ocichart
name: chart1
version: 0.1.0
repo: oci://us-central1-docker.pkg.dev/mikebz-ex1/charts
valuesInline:
nameOverride: foobar
`)
th.AssertActualEqualsExpected(rm, "")
}