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

Merge pull request #3720 from Shell32-Natsu/helm-version

Browse Source 
support new version string in helm
This commit is contained in:
Kubernetes Prow Robot
2021-03-12 15:33:03 -08:00
committed by GitHub
parent c636ee616b 5fc6cab49f
commit b3cec39c25
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/builtins/HelmChartInflationGenerator.go
View File

@@ -270,11 +270,17 @@ func (p *HelmChartInflationGeneratorPlugin) checkHelmVersion() error {
if err != nil { if err != nil {
return err return err
} }
r, err := regexp.Compile(`v\d+(\.\d+)+`) r, err := regexp.Compile(`v?\d+(\.\d+)+`)
if err != nil { if err != nil {
return err return err
} }
v := string(r.Find(stdout))[1:] v := r.FindString(string(stdout))
if v == "" {
return fmt.Errorf("cannot find version string in %s", string(stdout))
}
if v[0] == 'v' {
v = v[1:]
}
majorVersion := strings.Split(v, ".")[0] majorVersion := strings.Split(v, ".")[0]
if majorVersion != "3" { if majorVersion != "3" {
return fmt.Errorf("this plugin requires helm V3 but got v%s", v) return fmt.Errorf("this plugin requires helm V3 but got v%s", v)

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

@@ -278,11 +278,17 @@ func (p *HelmChartInflationGeneratorPlugin) checkHelmVersion() error {
if err != nil { if err != nil {
return err return err
} }
r, err := regexp.Compile(`v\d+(\.\d+)+`) r, err := regexp.Compile(`v?\d+(\.\d+)+`)
if err != nil { if err != nil {
return err return err
} }
v := string(r.Find(stdout))[1:] v := r.FindString(string(stdout))
if v == "" {
return fmt.Errorf("cannot find version string in %s", string(stdout))
}
if v[0] == 'v' {
v = v[1:]
}
majorVersion := strings.Split(v, ".")[0] majorVersion := strings.Split(v, ".")[0]
if majorVersion != "3" { if majorVersion != "3" {
return fmt.Errorf("this plugin requires helm V3 but got v%s", v) return fmt.Errorf("this plugin requires helm V3 but got v%s", v)