diff --git a/example/oci-dependency/Chart.lock b/example/oci-dependency/Chart.lock new file mode 100644 index 0000000..81cb585 --- /dev/null +++ b/example/oci-dependency/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: karpenter + repository: oci://public.ecr.aws/karpenter + version: 0.35.0 +digest: sha256:c351689f0d2d254c02b7e8aac54c06fb66e8871dfae3479cfbf1af88e1fee268 +generated: "2024-04-11T01:47:48.41682948+02:00" diff --git a/example/oci-dependency/Chart.yaml b/example/oci-dependency/Chart.yaml new file mode 100644 index 0000000..c37ddf9 --- /dev/null +++ b/example/oci-dependency/Chart.yaml @@ -0,0 +1,8 @@ +apiVersion: v2 +description: example chart with OCI chart as dependency +name: oci-dependency +version: 0.0.0 +dependencies: +- name: karpenter + version: "0.35.0" + repository: "oci://public.ecr.aws/karpenter" diff --git a/example/oci-dependency/generator.yaml b/example/oci-dependency/generator.yaml new file mode 100644 index 0000000..160cf2c --- /dev/null +++ b/example/oci-dependency/generator.yaml @@ -0,0 +1,6 @@ +apiVersion: khelm.mgoltzsche.github.com/v2 +kind: ChartRenderer +metadata: + name: oci-dependency + namespace: kube-system +chart: . diff --git a/pkg/helm/load.go b/pkg/helm/load.go index 56fe1ae..d997850 100644 --- a/pkg/helm/load.go +++ b/pkg/helm/load.go @@ -230,12 +230,19 @@ func buildLocalCharts(ctx context.Context, localCharts []localChart, cfg *config } func buildChartDependencies(ctx context.Context, chartRequested *chart.Chart, chartPath string, cfg *config.LoaderConfig, repos repositoryConfig, settings *cli.EnvSettings, getters getter.Providers) error { + registryClient, err := registry.NewClient( + registry.ClientOptEnableCache(true), + ) + if err != nil { + return errors.WithStack(err) + } man := &downloader.Manager{ Out: log.Writer(), ChartPath: chartPath, Keyring: cfg.Keyring, SkipUpdate: true, Getters: getters, + RegistryClient: registryClient, RepositoryConfig: settings.RepositoryConfig, RepositoryCache: settings.RepositoryCache, Debug: settings.Debug, @@ -244,7 +251,7 @@ func buildChartDependencies(ctx context.Context, chartRequested *chart.Chart, ch man.Verify = downloader.VerifyAlways } // Workaround for leftover tmpcharts dir (which makes Build() fail) - err := os.RemoveAll(filepath.Join(chartPath, "tmpcharts")) + err = os.RemoveAll(filepath.Join(chartPath, "tmpcharts")) if err != nil { return errors.WithStack(err) } diff --git a/pkg/helm/render_test.go b/pkg/helm/render_test.go index f363261..b0813a2 100644 --- a/pkg/helm/render_test.go +++ b/pkg/helm/render_test.go @@ -55,6 +55,8 @@ func TestRender(t *testing.T) { {"include", "example/include/generator.yaml", []string{}, " key: b", nil}, {"local-chart-with-local-dependency-and-transitive-remote", "example/localrefref/generator.yaml", []string{}, "rook-ceph-v0.9.3", nil}, {"local-chart-with-remote-dependency", "example/localref/generator.yaml", []string{}, "rook-ceph-v0.9.3", nil}, + {"oci-chart", "example/oci-image/generator.yaml", []string{"kube-system", "kube-node-lease"}, "name: ec2nodeclasses.karpenter.k8s.aws", nil}, + {"oci-dependency", "example/oci-dependency/generator.yaml", []string{"kube-system", "kube-node-lease"}, "name: ec2nodeclasses.karpenter.k8s.aws", nil}, {"values-inheritance", "example/values-inheritance/generator.yaml", []string{}, " inherited: inherited value\n fileoverwrite: overwritten by file\n valueoverwrite: overwritten by generator config", nil}, {"cluster-scoped", "example/cluster-scoped/generator.yaml", []string{}, "myrolebinding", nil}, {"chart-hooks", "example/chart-hooks/generator.yaml", []string{"default"}, " key: myvalue", []string{