feat: set local chart version using --version flag

mgoltzsche · Oct 30, 2022 · 32f6afc · 32f6afc
1 parent d574993
commit 32f6afc
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 0 deletions.
diff --git a/e2e/cli-tests.bats b/e2e/cli-tests.bats
@@ -32,6 +32,15 @@ teardown() {
 		--debug
 }
 
+@test "CLI should build local chart" {
+	docker run --rm -u $(id -u):$(id -g) -v "$OUT_DIR:/out" -v "$EXAMPLE_DIR/release-name:/chart" "$IMAGE" template /chart \
+		--version 1.2.3 \
+		--output /out/manifest.yaml \
+		--debug
+	ls -la "$OUT_DIR" "$OUT_DIR/manifest.yaml" >&2
+	cat "$OUT_DIR/manifest.yaml" | tee /dev/stdout /dev/stderr | grep -q 'chartVersion: 1.2.3'
+}
+
 @test "CLI should output kustomization" {
 	docker run --rm -u $(id -u):$(id -g) -v "$OUT_DIR:/out" -v "$EXAMPLE_DIR/namespace:/chart" "$IMAGE" template /chart \
 		--output /out/kdir/ \

diff --git a/example/release-name/generator.yaml b/example/release-name/generator.yaml
@@ -4,3 +4,4 @@ metadata:
   name: my-release-name
 chart: .
 kubeVersion: 1.17
+version: 1.9.3
diff --git a/example/release-name/templates/example.yaml b/example/release-name/templates/example.yaml
@@ -5,3 +5,4 @@ metadata:
 data:
   key: b
   k8sVersion: {{ .Capabilities.KubeVersion }}
+  chartVersion: {{ .Chart.Version }}
diff --git a/pkg/helm/load.go b/pkg/helm/load.go
@@ -122,6 +122,9 @@ func buildAndLoadLocalChart(ctx context.Context, cfg *config.ChartConfig, repos
 			return nil, errors.Wrapf(err, "failed reloading chart %s after dependency download", cfg.Chart)
 		}
 	}
+	if cfg.Version != "" {
+		chartRequested.Metadata.Version = cfg.Version
+	}
 	return chartRequested, nil
 }
 

diff --git a/pkg/helm/render_test.go b/pkg/helm/render_test.go
@@ -53,6 +53,7 @@ func TestRender(t *testing.T) {
 		{"force-namespace", "example/force-namespace/generator.yaml", []string{"forced-namespace"}, "  key: b", nil},
 		{"kubeVersion", "example/release-name/generator.yaml", []string{}, "  k8sVersion: v1.17.0", nil},
 		{"release-name", "example/release-name/generator.yaml", []string{}, "  name: my-release-name-config", nil},
+		{"chart-version", "example/release-name/generator.yaml", []string{}, "  chartVersion: 1.9.3", nil},
 		{"exclude", "example/exclude/generator.yaml", []string{"cluster-role-binding-ns"}, "  key: b", nil},
 		{"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},