Skip to content

Commit 99ef962

Browse files
authored
fix: fixes helm deployment not passing values (#138)
1 parent f4c4871 commit 99ef962

File tree

5 files changed

+14
-17
lines changed

5 files changed

+14
-17
lines changed

cli/test.mod.cue

Lines changed: 0 additions & 13 deletions
This file was deleted.

lib/project/deployment/providers/helm/downloader/default.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func (d *DefaultChartDownloader) Download(repoUrl, chartName, version string) (*
3030
return nil, fmt.Errorf("failed to find chart in repo: %w", err)
3131
}
3232

33-
u, err := dl.ResolveChartVersion(url, "")
33+
u, err := dl.ResolveChartVersion(url, version)
3434
if err != nil {
3535
return nil, fmt.Errorf("failed to resolve chart version: %w", err)
3636
}

lib/project/deployment/providers/helm/generator.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,12 @@ func (h *HelmManifestGenerator) Generate(mod schema.DeploymentModule) ([]byte, e
3636
return nil, fmt.Errorf("failed to load chart archive: %w", err)
3737
}
3838

39-
rel, err := client.Run(chart, map[string]interface{}{"foo": "bar"})
39+
values, ok := mod.Values.(map[string]interface{})
40+
if !ok {
41+
return nil, fmt.Errorf("failed to assert mod.Values to map[string]interface{}")
42+
}
43+
44+
rel, err := client.Run(chart, values)
4045
if err != nil {
4146
return nil, fmt.Errorf("failed to run client: %w", err)
4247
}

lib/project/deployment/providers/helm/generator_test.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,12 @@ func TestHelmManifestGenerator(t *testing.T) {
3333
Name: utils.StringPtr("test"),
3434
Namespace: "default",
3535
Registry: utils.StringPtr("https://charts.test.com/repo"),
36-
Version: utils.StringPtr("1.0.0"),
36+
Values: map[string]interface{}{
37+
"image": map[string]interface{}{
38+
"tag": "1.27.0",
39+
},
40+
},
41+
Version: utils.StringPtr("1.0.0"),
3742
}
3843

3944
result, err := gen.Generate(mod)

lib/project/deployment/providers/helm/testdata/golden.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ spec:
1818
spec:
1919
containers:
2020
- name: nginx
21-
image: "nginx:latest"
21+
image: "nginx:1.27.0"
2222
imagePullPolicy: IfNotPresent

0 commit comments

Comments
 (0)