Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package helmfile for openSUSE:Factory checked in at 2021-10-16 22:47:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/helmfile (Old) and /work/SRC/openSUSE:Factory/.helmfile.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "helmfile" Sat Oct 16 22:47:08 2021 rev:25 rq:925593 version:0.141.0 Changes: -------- --- /work/SRC/openSUSE:Factory/helmfile/helmfile.changes 2021-09-17 23:26:17.809254654 +0200 +++ /work/SRC/openSUSE:Factory/.helmfile.new.1890/helmfile.changes 2021-10-16 22:47:39.044692450 +0200 @@ -1,0 +2,7 @@ +Sat Oct 16 08:16:35 UTC 2021 - Manfred Hollstein <manfre...@gmx.net> + +- v0.141.0: + * 9a0ce53 (HEAD, tag: v0.141.0) Support Helm 3.7.0's reworked + OCI support (#1970) + +------------------------------------------------------------------- Old: ---- helmfile-0.140.1.tar.gz New: ---- helmfile-0.141.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ helmfile.spec ++++++ --- /var/tmp/diff_new_pack.ptQuqS/_old 2021-10-16 22:47:40.964694068 +0200 +++ /var/tmp/diff_new_pack.ptQuqS/_new 2021-10-16 22:47:40.968694071 +0200 @@ -17,9 +17,9 @@ # -%define git_commit 787e6c80d1d16c48912c5280a6a84a01b1a702c3 +%define git_commit 9a0ce53608603677a59a77e55d1c2f141a7a46fb Name: helmfile -Version: 0.140.1 +Version: 0.141.0 Release: 0 Summary: Deploy Kubernetes Helm Charts License: MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.ptQuqS/_old 2021-10-16 22:47:40.992694092 +0200 +++ /var/tmp/diff_new_pack.ptQuqS/_new 2021-10-16 22:47:40.992694092 +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.140.1</param> + <param name="revision">v0.141.0</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.ptQuqS/_old 2021-10-16 22:47:41.008694105 +0200 +++ /var/tmp/diff_new_pack.ptQuqS/_new 2021-10-16 22:47:41.008694105 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/roboll/helmfile.git</param> - <param name="changesrevision">787e6c80d1d16c48912c5280a6a84a01b1a702c3</param></service></servicedata> + <param name="changesrevision">9a0ce53608603677a59a77e55d1c2f141a7a46fb</param></service></servicedata> ++++++ helmfile-0.140.1.tar.gz -> helmfile-0.141.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.140.1/.circleci/Makefile new/helmfile-0.141.0/.circleci/Makefile --- old/helmfile-0.140.1/.circleci/Makefile 2021-09-14 09:01:34.000000000 +0200 +++ new/helmfile-0.141.0/.circleci/Makefile 2021-10-04 02:19:15.000000000 +0200 @@ -1,4 +1,4 @@ -HELM_VERSION ?= v3.5.3 +HELM_VERSION ?= v3.7.0 KUSTOMIZE_VERSION ?= v3.8.8 K8S_VERSION ?= v1.13.12 MINIKUBE_VERSION ?= v0.30.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.140.1/.circleci/config.yml new/helmfile-0.141.0/.circleci/config.yml --- old/helmfile-0.140.1/.circleci/config.yml 2021-09-14 09:01:34.000000000 +0200 +++ new/helmfile-0.141.0/.circleci/config.yml 2021-10-04 02:19:15.000000000 +0200 @@ -145,7 +145,7 @@ - build matrix: parameters: - helm-version: ["v3.4.2", "v3.5.4", "v3.6.3"] + helm-version: ["v3.4.2", "v3.5.4", "v3.6.3", "v3.7.0"] - release: filters: branches: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.140.1/.gitignore new/helmfile-0.141.0/.gitignore --- old/helmfile-0.140.1/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/helmfile-0.141.0/.gitignore 2021-10-04 02:19:15.000000000 +0200 @@ -0,0 +1,12 @@ +dist/ +.idea/ +helmfile +helmfile.lock +/diff-yamls +/yamldiff +test/integration/tmp +vendor/ +*.log +.vagrant/ +*.lock +test/integration/.gnupg/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.140.1/Dockerfile new/helmfile-0.141.0/Dockerfile --- old/helmfile-0.140.1/Dockerfile 2021-09-14 09:01:34.000000000 +0200 +++ new/helmfile-0.141.0/Dockerfile 2021-10-04 02:19:15.000000000 +0200 @@ -11,8 +11,8 @@ RUN apk add --no-cache ca-certificates git bash curl jq -ARG HELM_VERSION="v3.6.3" -ARG HELM_SHA256="07c100849925623dc1913209cd1a30f0a9b80a5b4d6ff2153c609d11b043e262" +ARG HELM_VERSION="v3.7.0" +ARG HELM_SHA256="096e30f54c3ccdabe30a8093f8e128dba76bb67af697b85db6ed0453a2701bf9" ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.140.1/Dockerfile.debian new/helmfile-0.141.0/Dockerfile.debian --- old/helmfile-0.140.1/Dockerfile.debian 2021-09-14 09:01:34.000000000 +0200 +++ new/helmfile-0.141.0/Dockerfile.debian 2021-10-04 02:19:15.000000000 +0200 @@ -25,8 +25,8 @@ wget \ && rm -rf /var/lib/apt/lists/* -ARG HELM_VERSION="v3.6.3" -ARG HELM_SHA256="07c100849925623dc1913209cd1a30f0a9b80a5b4d6ff2153c609d11b043e262" +ARG HELM_VERSION="v3.7.0" +ARG HELM_SHA256="096e30f54c3ccdabe30a8093f8e128dba76bb67af697b85db6ed0453a2701bf9" ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.140.1/Dockerfile.helm3 new/helmfile-0.141.0/Dockerfile.helm3 --- old/helmfile-0.140.1/Dockerfile.helm3 2021-09-14 09:01:34.000000000 +0200 +++ new/helmfile-0.141.0/Dockerfile.helm3 2021-10-04 02:19:15.000000000 +0200 @@ -11,10 +11,10 @@ RUN apk add --no-cache ca-certificates git bash curl jq -ARG HELM_VERSION="v3.5.3" +ARG HELM_VERSION="v3.7.0" ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" -ARG HELM_SHA256="2170a1a644a9e0b863f00c17b761ce33d4323da64fc74562a3a6df2abbf6cd70" +ARG HELM_SHA256="096e30f54c3ccdabe30a8093f8e128dba76bb67af697b85db6ed0453a2701bf9" RUN set -x && \ wget ${HELM_LOCATION}/${HELM_FILENAME} && \ echo Verifying ${HELM_FILENAME}... && \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.140.1/Dockerfile.helm3.ubuntu new/helmfile-0.141.0/Dockerfile.helm3.ubuntu --- old/helmfile-0.140.1/Dockerfile.helm3.ubuntu 2021-09-14 09:01:34.000000000 +0200 +++ new/helmfile-0.141.0/Dockerfile.helm3.ubuntu 2021-10-04 02:19:15.000000000 +0200 @@ -17,10 +17,10 @@ git bash curl jq pip wget && \ rm -rf /var/lib/apt/lists/* -ARG HELM_VERSION="v3.5.3" +ARG HELM_VERSION="v3.7.0" ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" -ARG HELM_SHA256="2170a1a644a9e0b863f00c17b761ce33d4323da64fc74562a3a6df2abbf6cd70" +ARG HELM_SHA256="096e30f54c3ccdabe30a8093f8e128dba76bb67af697b85db6ed0453a2701bf9" RUN set -x && \ wget ${HELM_LOCATION}/${HELM_FILENAME} && \ echo Verifying ${HELM_FILENAME}... && \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.140.1/pkg/helmexec/exec.go new/helmfile-0.141.0/pkg/helmexec/exec.go --- old/helmfile-0.140.1/pkg/helmexec/exec.go 2021-09-14 09:01:34.000000000 +0200 +++ new/helmfile-0.141.0/pkg/helmexec/exec.go 2021-10-04 02:19:15.000000000 +0200 @@ -432,14 +432,40 @@ func (helm *execer) ChartPull(chart string, flags ...string) error { helm.logger.Infof("Pulling %v", chart) - out, err := helm.exec(append([]string{"chart", "pull", chart}, flags...), map[string]string{"HELM_EXPERIMENTAL_OCI": "1"}) + helm.logger.Infof("Exporting %v", chart) + helmVersionConstraint, _ := semver.NewConstraint(">= 3.7.0") + var helmArgs []string + if helmVersionConstraint.Check(&helm.version) { + ociChartURLSplit := strings.Split(chart, ":") + ociChartURL := fmt.Sprintf("oci://%s", ociChartURLSplit[0]) + ociChartTag := ociChartURLSplit[1] + tempDir, err := ioutil.TempDir("", "chart*") + if err != nil { + return err + } + defer os.RemoveAll(tempDir) + helmArgs = []string{"fetch", ociChartURL, "--version", ociChartTag, "--destination", tempDir} + } else { + helmArgs = []string{"chart", "pull", chart} + } + out, err := helm.exec(append(helmArgs, flags...), map[string]string{"HELM_EXPERIMENTAL_OCI": "1"}) helm.info(out) return err } func (helm *execer) ChartExport(chart string, path string, flags ...string) error { helm.logger.Infof("Exporting %v", chart) - out, err := helm.exec(append([]string{"chart", "export", chart, "--destination", path}, flags...), map[string]string{"HELM_EXPERIMENTAL_OCI": "1"}) + helmVersionConstraint, _ := semver.NewConstraint(">= 3.7.0") + var helmArgs []string + if helmVersionConstraint.Check(&helm.version) { + ociChartURLSplit := strings.Split(chart, ":") + ociChartURL := fmt.Sprintf("oci://%s", ociChartURLSplit[0]) + ociChartTag := ociChartURLSplit[1] + helmArgs = []string{"pull", ociChartURL, "--version", ociChartTag, "--untar"} + } else { + helmArgs = []string{"chart", "export", chart} + } + out, err := helm.exec(append(append(helmArgs, "--destination", path), flags...), map[string]string{"HELM_EXPERIMENTAL_OCI": "1"}) helm.info(out) return err } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helmfile-0.140.1/pkg/state/state.go new/helmfile-0.141.0/pkg/state/state.go --- old/helmfile-0.140.1/pkg/state/state.go 2021-09-14 09:01:34.000000000 +0200 +++ new/helmfile-0.141.0/pkg/state/state.go 2021-10-04 02:19:15.000000000 +0200 @@ -3224,6 +3224,9 @@ chartPath := path.Join(pathElems...) err = helm.ChartExport(qualifiedChartName, chartPath) + if err != nil { + return nil, err + } fullChartPath, err := findChartDirectory(chartPath) if err != nil { ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/helmfile/vendor.tar.gz /work/SRC/openSUSE:Factory/.helmfile.new.1890/vendor.tar.gz differ: char 5, line 1