kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-07-17 17:52:12 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #3292 from Shell32-Natsu/helm-extra-args

Browse Source 
Add field extraArgs to helm generator
This commit is contained in:
Kubernetes Prow Robot
2020-11-30 19:50:49 -08:00
committed by GitHub
parent a053ff6907 2bf73c60c3
commit a6c2e982f9
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/builtins/HelmChartInflationGenerator.go
View File

@@ -1,6 +1,8 @@
// Code generated by pluginator on HelmChartInflationGenerator; DO NOT EDIT. // Code generated by pluginator on HelmChartInflationGenerator; DO NOT EDIT.
// pluginator {unknown 1970-01-01T00:00:00Z } // pluginator {unknown 1970-01-01T00:00:00Z }
package builtins package builtins
import ( import (
@@ -125,6 +127,7 @@ func (p *HelmChartInflationGeneratorPlugin) getTemplateCommandArgs() []string {
if p.Values != "" { if p.Values != "" {
args = append(args, "--values", p.Values) args = append(args, "--values", p.Values)
} }
args = append(args, p.ExtraArgs...)
return args return args
} }
@@ -174,5 +177,5 @@ func (p *HelmChartInflationGeneratorPlugin) checkHelmVersion() error {
} }
func NewHelmChartInflationGeneratorPlugin() resmap.GeneratorPlugin { func NewHelmChartInflationGeneratorPlugin() resmap.GeneratorPlugin {
return &HelmChartInflationGeneratorPlugin{} return &HelmChartInflationGeneratorPlugin{}
} }

13
api/types/helmchartargs.go
View File

@@ -10,10 +10,11 @@ type HelmChartArgs struct {
ChartRepoURL string `json:"chartRepoUrl,omitempty" yaml:"chartRepoUrl,omitempty"` ChartRepoURL string `json:"chartRepoUrl,omitempty" yaml:"chartRepoUrl,omitempty"`
ChartHome string `json:"chartHome,omitempty" yaml:"chartHome,omitempty"` ChartHome string `json:"chartHome,omitempty" yaml:"chartHome,omitempty"`
// Use chartRelease to keep compatible with old exec plugin // Use chartRelease to keep compatible with old exec plugin
ChartRepoName string `json:"chartRelease,omitempty" yaml:"chartRelease,omitempty"` ChartRepoName string `json:"chartRelease,omitempty" yaml:"chartRelease,omitempty"`
HelmBin string `json:"helmBin,omitempty" yaml:"helmBin,omitempty"` HelmBin string `json:"helmBin,omitempty" yaml:"helmBin,omitempty"`
HelmHome string `json:"helmHome,omitempty" yaml:"helmHome,omitempty"` HelmHome string `json:"helmHome,omitempty" yaml:"helmHome,omitempty"`
Values string `json:"values,omitempty" yaml:"values,omitempty"` Values string `json:"values,omitempty" yaml:"values,omitempty"`
ReleaseName string `json:"releaseName,omitempty" yaml:"releaseName,omitempty"` ReleaseName string `json:"releaseName,omitempty" yaml:"releaseName,omitempty"`
ReleaseNamespace string `json:"releaseNamespace,omitempty" yaml:"releaseNamespace,omitempty"` ReleaseNamespace string `json:"releaseNamespace,omitempty" yaml:"releaseNamespace,omitempty"`
ExtraArgs []string `json:"extraArgs,omitempty" yaml:"extraArgs,omitempty"`
} }

1
plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go
View File

@@ -133,6 +133,7 @@ func (p *HelmChartInflationGeneratorPlugin) getTemplateCommandArgs() []string {
if p.Values != "" { if p.Values != "" {
args = append(args, "--values", p.Values) args = append(args, "--values", p.Values)
} }
args = append(args, p.ExtraArgs...)
return args return args
} }