public_git/helmfile
1
0
Fork 0
mirror of https://github.com/helmfile/helmfile.git synced 2026-09-30 14:47:44 +02:00
Code Issues Projects Releases Wiki Activity

feat: use new helm version parse function (#760)

Browse Source 
* feat: use new helm version parse function

Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
yxxhero
2023-03-23 08:46:11 +08:00
committed by GitHub
parent bfb94314be
commit 5e8a502b41
2 changed files with 78 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/helmexec/exec.go
+17 -13
View File
@@ -12,6 +12,7 @@ import (
"sync"
"github.com/Masterminds/semver/v3"
"github.com/helmfile/chartify"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"helm.sh/helm/v3/pkg/chart"
@@ -30,7 +31,7 @@ type decryptedSecret struct {
type execer struct {
helmBinary string
enableLiveOutput bool
version semver.Version
version *semver.Version
runner Runner
logger *zap.SugaredLogger
kubeContext string
@@ -57,27 +58,30 @@ func NewLogger(writer io.Writer, logLevel string) *zap.SugaredLogger {
return zap.New(core).Sugar()
}
func parseHelmVersion(versionStr string) (semver.Version, error) {
func parseHelmVersion(versionStr string) (*semver.Version, error) {
if len(versionStr) == 0 {
return semver.Version{}, nil
return nil, fmt.Errorf("empty helm version")
}
versionStr = strings.TrimLeft(versionStr, "Client: ")
versionStr = strings.TrimRight(versionStr, "\n")
v, err := chartify.FindSemVerInfo(versionStr)
ver, err := semver.NewVersion(versionStr)
if err != nil {
return semver.Version{}, fmt.Errorf("error parsing helm version '%s'", versionStr)
return nil, fmt.Errorf("error find helm srmver version '%s': %w", versionStr, err)
}
return *ver, nil
ver, err := semver.NewVersion(v)
if err != nil {
return nil, fmt.Errorf("error parsing helm version '%s'", versionStr)
}
return ver, nil
}
func GetHelmVersion(helmBinary string, runner Runner) (semver.Version, error) {
func GetHelmVersion(helmBinary string, runner Runner) (*semver.Version, error) {
// Autodetect from `helm version`
outBytes, err := runner.Execute(helmBinary, []string{"version", "--client", "--short"}, nil, false)
if err != nil {
return semver.Version{}, fmt.Errorf("error determining helm version: %w", err)
return nil, fmt.Errorf("error determining helm version: %w", err)
}
return parseHelmVersion(string(outBytes))
@@ -152,7 +156,7 @@ func (helm *execer) AddRepo(name, repository, cafile, certfile, keyfile, usernam
// See https://github.com/helm/helm/pull/8777
if cons, err := semver.NewConstraint(">= 3.3.2"); err == nil {
if cons.Check(&helm.version) {
if cons.Check(helm.version) {
args = append(args, "--force-update")
}
} else {
@@ -450,7 +454,7 @@ func (helm *execer) ChartPull(chart string, path string, flags ...string) error
var helmArgs []string
helm.logger.Infof("Pulling %v", chart)
helmVersionConstraint, _ := semver.NewConstraint(">= 3.7.0")
if helmVersionConstraint.Check(&helm.version) {
if helmVersionConstraint.Check(helm.version) {
// in the 3.7.0 version, the chart pull has been replaced with helm pull
// https://github.com/helm/helm/releases/tag/v3.7.0
ociChartURL, ociChartTag := resolveOciChart(chart)
@@ -465,7 +469,7 @@ func (helm *execer) ChartPull(chart string, path string, flags ...string) error
func (helm *execer) ChartExport(chart string, path string, flags ...string) error {
helmVersionConstraint, _ := semver.NewConstraint(">= 3.7.0")
if helmVersionConstraint.Check(&helm.version) {
if helmVersionConstraint.Check(helm.version) {
// in the 3.7.0 version, the chart export has been removed
// https://github.com/helm/helm/releases/tag/v3.7.0
return nil