Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 17 additions & 2 deletions chartvalidator/checker/engine_chart_rendering.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,20 @@ func (engine *ChartRenderingEngine) renderSingleChart(chart ChartRenderParams, w
}

args := []string{
"template", chart.ChartName,
"template",
resolveChartReference(chart),
"--release-name", chart.ChartName,
"--repo", chart.RepoURL,
"-f", chart.BaseValuesFile,
"-f", chart.ValuesOverride,
"--version", chart.ChartVersion,
"--include-crds",
"--kube-version", kubernetesVersion,
}

if !isOCIRepo(chart.RepoURL) {
args = append(args, "--repo", chart.RepoURL)
}

// Add API versions if any
for _, apiVer := range engine.apiVersions {
if apiVer != "" {
Expand Down Expand Up @@ -144,6 +148,17 @@ func (engine *ChartRenderingEngine) renderSingleChart(chart ChartRenderParams, w
return &RenderResult{Chart: chart, ManifestPath: outputPath}, nil
}

func isOCIRepo(repoURL string) bool {
return strings.HasPrefix(repoURL, "oci://")
}

func resolveChartReference(chart ChartRenderParams) string {
if isOCIRepo(chart.RepoURL) {
return fmt.Sprintf("%s/%s", strings.TrimSuffix(chart.RepoURL, "/"), chart.ChartName)
}
return chart.ChartName
}

// Suffix the files just in case two charts end up having the same name
func generateRandomString(length int) string {
const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
Expand Down
20 changes: 19 additions & 1 deletion chartvalidator/checker/engine_chart_rendering_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,25 @@ func TestRenderBasics(t *testing.T) {
assertChartFieldsMatch(t, testChart, result.Chart)

// Verify the command that was executed
expectedCommand := "helm template test-chart --release-name test-chart --repo https://example.com/charts -f values.yaml -f override.yaml --version 1.0.0 --include-crds --kube-version 1.33.0 --api-versions something --api-versions something-else"
expectedCommand := "helm template test-chart --release-name test-chart -f values.yaml -f override.yaml --version 1.0.0 --include-crds --kube-version 1.33.0 --repo https://example.com/charts --api-versions something --api-versions something-else"
actualCommand := mockExecutor.GetFullCommand()
assert.Equal(t, expectedCommand, actualCommand)
}

func TestRenderOCIRepo(t *testing.T) {
mockExecutor := createMockExecutor()
engine := createEngine(mockExecutor, false)
defer cleanupEngine(engine)

testChart := createTestChart()
testChart.RepoURL = "oci://europe-west4-docker.pkg.dev/wallet-dev-462809/interledger-helm-charts"
engine.inputChan <- testChart

result := <-engine.resultChan
assertChartFieldsMatch(t, testChart, result.Chart)

// OCI charts should be templated using the full OCI chart reference, not --repo.
expectedCommand := "helm template oci://europe-west4-docker.pkg.dev/wallet-dev-462809/interledger-helm-charts/test-chart --release-name test-chart -f values.yaml -f override.yaml --version 1.0.0 --include-crds --kube-version 1.33.0 --api-versions something --api-versions something-else"
Comment on lines +58 to +65
actualCommand := mockExecutor.GetFullCommand()
assert.Equal(t, expectedCommand, actualCommand)
}
Expand Down
Loading