From 2bf73c60c30d31ecbebab559a594f5ec9e7662aa Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Mon, 30 Nov 2020 14:22:25 -0800 Subject: [PATCH] Add field extraArgs to helm generator --- api/builtins/HelmChartInflationGenerator.go | 5 ++++- api/types/helmchartargs.go | 13 +++++++------ .../HelmChartInflationGenerator.go | 1 + 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/api/builtins/HelmChartInflationGenerator.go b/api/builtins/HelmChartInflationGenerator.go index 730fe824b..8aa8340e5 100644 --- a/api/builtins/HelmChartInflationGenerator.go +++ b/api/builtins/HelmChartInflationGenerator.go @@ -1,6 +1,8 @@ // Code generated by pluginator on HelmChartInflationGenerator; DO NOT EDIT. // pluginator {unknown 1970-01-01T00:00:00Z } + + package builtins import ( @@ -125,6 +127,7 @@ func (p *HelmChartInflationGeneratorPlugin) getTemplateCommandArgs() []string { if p.Values != "" { args = append(args, "--values", p.Values) } + args = append(args, p.ExtraArgs...) return args } @@ -174,5 +177,5 @@ func (p *HelmChartInflationGeneratorPlugin) checkHelmVersion() error { } func NewHelmChartInflationGeneratorPlugin() resmap.GeneratorPlugin { - return &HelmChartInflationGeneratorPlugin{} + return &HelmChartInflationGeneratorPlugin{} } diff --git a/api/types/helmchartargs.go b/api/types/helmchartargs.go index 96ebdb949..881a3ae54 100644 --- a/api/types/helmchartargs.go +++ b/api/types/helmchartargs.go @@ -10,10 +10,11 @@ type HelmChartArgs struct { ChartRepoURL string `json:"chartRepoUrl,omitempty" yaml:"chartRepoUrl,omitempty"` ChartHome string `json:"chartHome,omitempty" yaml:"chartHome,omitempty"` // Use chartRelease to keep compatible with old exec plugin - ChartRepoName string `json:"chartRelease,omitempty" yaml:"chartRelease,omitempty"` - HelmBin string `json:"helmBin,omitempty" yaml:"helmBin,omitempty"` - HelmHome string `json:"helmHome,omitempty" yaml:"helmHome,omitempty"` - Values string `json:"values,omitempty" yaml:"values,omitempty"` - ReleaseName string `json:"releaseName,omitempty" yaml:"releaseName,omitempty"` - ReleaseNamespace string `json:"releaseNamespace,omitempty" yaml:"releaseNamespace,omitempty"` + ChartRepoName string `json:"chartRelease,omitempty" yaml:"chartRelease,omitempty"` + HelmBin string `json:"helmBin,omitempty" yaml:"helmBin,omitempty"` + HelmHome string `json:"helmHome,omitempty" yaml:"helmHome,omitempty"` + Values string `json:"values,omitempty" yaml:"values,omitempty"` + ReleaseName string `json:"releaseName,omitempty" yaml:"releaseName,omitempty"` + ReleaseNamespace string `json:"releaseNamespace,omitempty" yaml:"releaseNamespace,omitempty"` + ExtraArgs []string `json:"extraArgs,omitempty" yaml:"extraArgs,omitempty"` } diff --git a/plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go b/plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go index 53fe9c092..004bc23b8 100644 --- a/plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go +++ b/plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go @@ -133,6 +133,7 @@ func (p *HelmChartInflationGeneratorPlugin) getTemplateCommandArgs() []string { if p.Values != "" { args = append(args, "--values", p.Values) } + args = append(args, p.ExtraArgs...) return args }