Hello community, here is the log from the commit of package helmfile for openSUSE:Factory checked in at 2020-09-21 17:46:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/helmfile (Old) and /work/SRC/openSUSE:Factory/.helmfile.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "helmfile" Mon Sep 21 17:46:04 2020 rev:7 rq:835799 version:0.129.4 Changes: -------- --- /work/SRC/openSUSE:Factory/helmfile/helmfile.changes 2020-09-15 16:34:32.846956230 +0200 +++ /work/SRC/openSUSE:Factory/.helmfile.new.4249/helmfile.changes 2020-09-21 17:48:33.589203199 +0200 @@ -1,0 +2,12 @@ +Mon Sep 21 10:57:27 UTC 2020 - Manfred Hollstein <[email protected]> + +- v0.129.4: Enable `helmfile test` testing only enabled and selected + releases (#1… + * b176408 (HEAD, tag: v0.129.4, origin/master, origin/HEAD, master) + Enable helmfile test testing only enabled and selected releases (#1486) + * ff81b2f Enable release hook template to access .Values (#1485) + * 8db03f9 Drop duplicated entry in extra functions list from readme (#1490) + * 988c218 Support the latest Helm (>=v3.3.2) and bump the Helm version + in Docker image. (#1488) + +------------------------------------------------------------------- Old: ---- helmfile-0.129.3.tar.gz New: ---- helmfile-0.129.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ helmfile.spec ++++++ --- /var/tmp/diff_new_pack.qoAOtg/_old 2020-09-21 17:48:39.825208787 +0200 +++ /var/tmp/diff_new_pack.qoAOtg/_new 2020-09-21 17:48:39.829208791 +0200 @@ -16,9 +16,9 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define git_commit 028bcc51dc48c517869287f2d821053939abacd5 +%define git_commit b176408eb2c351f5730c914a12a72b587aac23f9 Name: helmfile -Version: 0.129.3 +Version: 0.129.4 Release: 0 Summary: Deploy Kubernetes Helm Charts License: MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.qoAOtg/_old 2020-09-21 17:48:39.865208824 +0200 +++ /var/tmp/diff_new_pack.qoAOtg/_new 2020-09-21 17:48:39.869208827 +0200 @@ -5,7 +5,7 @@ <param name="exclude">.git</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> - <param name="revision">v0.129.3</param> + <param name="revision">v0.129.4</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.qoAOtg/_old 2020-09-21 17:48:39.889208845 +0200 +++ /var/tmp/diff_new_pack.qoAOtg/_new 2020-09-21 17:48:39.889208845 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/roboll/helmfile.git</param> - <param name="changesrevision">028bcc51dc48c517869287f2d821053939abacd5</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">b176408eb2c351f5730c914a12a72b587aac23f9</param></service></servicedata> ++++++ helmfile-0.129.3.tar.gz -> helmfile-0.129.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.129.3/.circleci/config.yml new/helmfile-0.129.4/.circleci/config.yml --- old/helmfile-0.129.3/.circleci/config.yml 2020-09-15 02:56:05.000000000 +0200 +++ new/helmfile-0.129.4/.circleci/config.yml 2020-09-21 02:44:05.000000000 +0200 @@ -95,7 +95,7 @@ - run: name: Install helm environment: - HELM_VERSION: v2.16.1 + HELM_VERSION: v2.16.12 command: | HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" curl -Lo ${HELM_FILENAME} "https://kubernetes-helm.storage.googleapis.com/${HELM_FILENAME}"; @@ -153,7 +153,7 @@ - run: name: Install helm environment: - HELM_VERSION: v3.1.0 + HELM_VERSION: v3.3.3 command: | HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" curl -Lo ${HELM_FILENAME} "https://get.helm.sh/${HELM_FILENAME}"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.129.3/Dockerfile new/helmfile-0.129.4/Dockerfile --- old/helmfile-0.129.3/Dockerfile 2020-09-15 02:56:05.000000000 +0200 +++ new/helmfile-0.129.4/Dockerfile 2020-09-21 02:44:05.000000000 +0200 @@ -11,10 +11,10 @@ RUN apk add --no-cache ca-certificates git bash curl jq -ARG HELM_VERSION=v2.16.1 +ARG HELM_VERSION=v2.16.12 ARG HELM_LOCATION="https://kubernetes-helm.storage.googleapis.com"; ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" -ARG HELM_SHA256="7eebaaa2da4734242bbcdced62cc32ba8c7164a18792c8acdf16c77abffce202" +ARG HELM_SHA256="756ab375314329b66b452c0f9d569f74b0760141670217c07b79890ad314c214" RUN wget ${HELM_LOCATION}/${HELM_FILENAME} && \ echo Verifying ${HELM_FILENAME}... && \ sha256sum ${HELM_FILENAME} | grep -q "${HELM_SHA256}" && \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.129.3/Dockerfile.helm3 new/helmfile-0.129.4/Dockerfile.helm3 --- old/helmfile-0.129.3/Dockerfile.helm3 2020-09-15 02:56:05.000000000 +0200 +++ new/helmfile-0.129.4/Dockerfile.helm3 2020-09-21 02:44:05.000000000 +0200 @@ -11,10 +11,10 @@ RUN apk add --no-cache ca-certificates git bash curl jq -ARG HELM_VERSION=v3.2.1 +ARG HELM_VERSION=v3.3.3 ARG HELM_LOCATION="https://get.helm.sh"; ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" -ARG HELM_SHA256="018f9908cb950701a5d59e757653a790c66d8eda288625dbb185354ca6f41f6b" +ARG HELM_SHA256="246d58b6b353e63ae8627415a7340089015e3eb542ff7b5ce124b0b1409369cc" RUN wget ${HELM_LOCATION}/${HELM_FILENAME} && \ echo Verifying ${HELM_FILENAME}... && \ sha256sum ${HELM_FILENAME} | grep -q "${HELM_SHA256}" && \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.129.3/README.md new/helmfile-0.129.4/README.md --- old/helmfile-0.129.3/README.md 2020-09-15 02:56:05.000000000 +0200 +++ new/helmfile-0.129.4/README.md 2020-09-21 02:44:05.000000000 +0200 @@ -309,7 +309,6 @@ - `toYaml` - `fromYaml` - `setValueAtPath` -- `requiredEnv` - `get` (Sprig's original `get` is available as `sprigGet`) - `tpl` - `required` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.129.3/pkg/app/app.go new/helmfile-0.129.4/pkg/app/app.go --- old/helmfile-0.129.3/pkg/app/app.go 2020-09-15 02:56:05.000000000 +0200 +++ new/helmfile-0.129.4/pkg/app/app.go 2020-09-21 02:44:05.000000000 +0200 @@ -390,7 +390,7 @@ err := run.withPreparedCharts("test", state.ChartPrepareOptions{ SkipRepos: true, }, func() { - errs = run.Test(c) + errs = a.test(run, c) }) if err != nil { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.129.3/pkg/app/app_test.go new/helmfile-0.129.4/pkg/app/app_test.go --- old/helmfile-0.129.3/pkg/app/app_test.go 2020-09-15 02:56:05.000000000 +0200 +++ new/helmfile-0.129.4/pkg/app/app_test.go 2020-09-21 02:44:05.000000000 +0200 @@ -2462,7 +2462,7 @@ return helmexec.Version{} } -func (helm *mockHelmExec) IsVersionAtLeast(major int, minor int) bool { +func (helm *mockHelmExec) IsVersionAtLeast(major int, minor int, patch int) bool { return false } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.129.3/pkg/app/mocks_test.go new/helmfile-0.129.4/pkg/app/mocks_test.go --- old/helmfile-0.129.3/pkg/app/mocks_test.go 2020-09-15 02:56:05.000000000 +0200 +++ new/helmfile-0.129.4/pkg/app/mocks_test.go 2020-09-21 02:44:05.000000000 +0200 @@ -97,7 +97,7 @@ return helmexec.Version{} } -func (helm *noCallHelmExec) IsVersionAtLeast(major int, minor int) bool { +func (helm *noCallHelmExec) IsVersionAtLeast(major int, minor int, patch int) bool { helm.doPanic() return false } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.129.3/pkg/app/run.go new/helmfile-0.129.4/pkg/app/run.go --- old/helmfile-0.129.3/pkg/app/run.go 2020-09-15 02:56:05.000000000 +0200 +++ new/helmfile-0.129.4/pkg/app/run.go 2020-09-21 02:44:05.000000000 +0200 @@ -161,14 +161,29 @@ return infoMsg, true, len(deleted) > 0 || len(updated) > 0, errs } -func (r *Run) Test(c TestConfigProvider) []error { +func (a *App) test(r *Run, c TestConfigProvider) []error { cleanup := c.Cleanup() timeout := c.Timeout() concurrency := c.Concurrency() + st := r.state + + toTest, err := a.getSelectedReleases(r) + if err != nil { + return []error{err} + } + + if len(toTest) == 0 { + return nil + } + + // Do test only on selected releases, because that's what the user intended + // with conditions and selectors + st.Releases = toTest + r.helm.SetExtraArgs(argparser.GetArgs(c.Args(), r.state)...) - return r.state.TestReleases(r.helm, cleanup, timeout, concurrency) + return st.TestReleases(r.helm, cleanup, timeout, concurrency) } func (r *Run) Lint(c LintConfigProvider) []error { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.129.3/pkg/exectest/helm.go new/helmfile-0.129.4/pkg/exectest/helm.go --- old/helmfile-0.129.3/pkg/exectest/helm.go 2020-09-15 02:56:05.000000000 +0200 +++ new/helmfile-0.129.4/pkg/exectest/helm.go 2020-09-21 02:44:05.000000000 +0200 @@ -170,12 +170,12 @@ return helmexec.Version{} } -func (helm *Helm) IsVersionAtLeast(major int, minor int) bool { +func (helm *Helm) IsVersionAtLeast(major int, minor int, patch int) bool { if helm.Version == nil { return false } - return helm.Version.Major >= major && minor >= helm.Version.Minor + return helm.Version.Major >= major && minor >= helm.Version.Minor && patch >= helm.Version.Patch } func (helm *Helm) sync(m *sync.Mutex, f func()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.129.3/pkg/helmexec/exec.go new/helmfile-0.129.4/pkg/helmexec/exec.go --- old/helmfile-0.129.3/pkg/helmexec/exec.go 2020-09-15 02:56:05.000000000 +0200 +++ new/helmfile-0.129.4/pkg/helmexec/exec.go 2020-09-21 02:44:05.000000000 +0200 @@ -130,6 +130,9 @@ return fmt.Errorf("empty field name") } args = append(args, "repo", "add", name, repository) + if helm.IsHelm3() && helm.IsVersionAtLeast(3, 3, 2) { + args = append(args, "--force-update") + } if certfile != "" && keyfile != "" { args = append(args, "--cert-file", certfile, "--key-file", keyfile) } @@ -398,6 +401,6 @@ return helm.version } -func (helm *execer) IsVersionAtLeast(major int, minor int) bool { - return helm.version.Major >= major && helm.version.Minor >= minor +func (helm *execer) IsVersionAtLeast(major int, minor int, patch int) bool { + return helm.version.Major >= major && helm.version.Minor >= minor && helm.version.Patch >= patch } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.129.3/pkg/helmexec/exec_test.go new/helmfile-0.129.4/pkg/helmexec/exec_test.go --- old/helmfile-0.129.3/pkg/helmexec/exec_test.go 2020-09-15 02:56:05.000000000 +0200 +++ new/helmfile-0.129.4/pkg/helmexec/exec_test.go 2020-09-21 02:44:05.000000000 +0200 @@ -557,15 +557,15 @@ func Test_IsVersionAtLeast(t *testing.T) { helm2Runner := mockRunner{output: []byte("Client: v2.16.1+ge13bc94\n")} helm := New("helm", NewLogger(os.Stdout, "info"), "dev", &helm2Runner) - if !helm.IsVersionAtLeast(2, 1) { + if !helm.IsVersionAtLeast(2, 1, 0) { t.Error("helmexec.IsVersionAtLeast - 2.16.1 not atleast 2.1") } - if helm.IsVersionAtLeast(2, 19) { + if helm.IsVersionAtLeast(2, 19, 0) { t.Error("helmexec.IsVersionAtLeast - 2.16.1 is atleast 2.19") } - if helm.IsVersionAtLeast(3, 2) { + if helm.IsVersionAtLeast(3, 2, 0) { t.Error("helmexec.IsVersionAtLeast - 2.16.1 is atleast 3.2") } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.129.3/pkg/helmexec/helmexec.go new/helmfile-0.129.4/pkg/helmexec/helmexec.go --- old/helmfile-0.129.3/pkg/helmexec/helmexec.go 2020-09-15 02:56:05.000000000 +0200 +++ new/helmfile-0.129.4/pkg/helmexec/helmexec.go 2020-09-21 02:44:05.000000000 +0200 @@ -28,7 +28,7 @@ DecryptSecret(context HelmContext, name string, flags ...string) (string, error) IsHelm3() bool GetVersion() Version - IsVersionAtLeast(major int, minor int) bool + IsVersionAtLeast(major int, minor int, patch int) bool } type DependencyUpdater interface { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.129.3/pkg/state/state.go new/helmfile-0.129.4/pkg/state/state.go --- old/helmfile-0.129.3/pkg/state/state.go 2020-09-15 02:56:05.000000000 +0200 +++ new/helmfile-0.129.4/pkg/state/state.go 2020-09-21 02:44:05.000000000 +0200 @@ -6,8 +6,6 @@ "encoding/hex" "errors" "fmt" - "github.com/imdario/mergo" - "golang.org/x/sync/errgroup" "io" "io/ioutil" "os" @@ -20,6 +18,9 @@ "sync" "text/template" + "github.com/imdario/mergo" + "golang.org/x/sync/errgroup" + "github.com/variantdev/chartify" "github.com/roboll/helmfile/pkg/environment" @@ -1884,7 +1885,12 @@ Logger: st.logger, ReadFile: st.readFile, } + vals, err := st.Values() + if err != nil { + return false, err + } data := map[string]interface{}{ + "Values": vals, "Release": r, "HelmfileCommand": helmfileCmd, } @@ -2063,7 +2069,7 @@ 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 ++++++ vendor.tar.gz ++++++
