Support the latest Helm (>=v3.3.2) and bump the Helm version in Docker image. (#1488)

Changes:

* Bump Helm to v2.16.12 and v3.3.3.
* Add --force-update only when using Helm 3.
This commit is contained in:
Wi1dcard
2020-09-21 09:41:49 +09:00
committed by GitHub
parent 028bcc51dc
commit 988c218096
10 changed files with 23 additions and 19 deletions
+4 -3
View File
@@ -6,8 +6,6 @@ import (
"encoding/hex"
"errors"
"fmt"
"github.com/imdario/mergo"
"golang.org/x/sync/errgroup"
"io"
"io/ioutil"
"os"
@@ -20,6 +18,9 @@ import (
"sync"
"text/template"
"github.com/imdario/mergo"
"golang.org/x/sync/errgroup"
"github.com/variantdev/chartify"
"github.com/roboll/helmfile/pkg/environment"
@@ -2063,7 +2064,7 @@ func (st *HelmState) flagsForUpgrade(helm helmexec.Interface, release *ReleaseSp
if release.CreateNamespace != nil && *release.CreateNamespace ||
release.CreateNamespace == nil && (st.HelmDefaults.CreateNamespace == nil || *st.HelmDefaults.CreateNamespace) {
if helm.IsVersionAtLeast(3, 2) {
if helm.IsVersionAtLeast(3, 2, 0) {
flags = append(flags, "--create-namespace")
} else if release.CreateNamespace != nil || st.HelmDefaults.CreateNamespace != nil {
// createNamespace was set explicitly, but not running supported version of helm - error