Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package helmfile for openSUSE:Factory
checked in at 2024-08-05 17:21:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/helmfile (Old)
and /work/SRC/openSUSE:Factory/.helmfile.new.7232 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "helmfile"
Mon Aug 5 17:21:29 2024 rev:58 rq:1191500 version:0.167.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/helmfile/helmfile.changes 2024-07-31
13:31:21.708898992 +0200
+++ /work/SRC/openSUSE:Factory/.helmfile.new.7232/helmfile.changes
2024-08-05 17:21:57.372798087 +0200
@@ -1,0 +2,12 @@
+Sun Aug 4 06:42:45 UTC 2024 - Manfred Hollstein <manfre...@gmx.net>
+
+- Update to version 0.167.1:
+ * build(deps): bump github.com/aws/aws-sdk-go from 1.55.3 to
+ 1.55.4 by @dependabot in #1649
+ * fix(oci): use output-dir-template in path if specified by
+ @henkka in #1648
+ * build(deps): bump github.com/aws/aws-sdk-go from 1.55.4 to
+ 1.55.5 by @dependabot in #1651
+ * build(deps): helm-s3: v0.16.0 -> v0.16.2 by @yxxhero in #1652
+
+-------------------------------------------------------------------
Old:
----
helmfile-0.167.0.tar.gz
New:
----
helmfile-0.167.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ helmfile.spec ++++++
--- /var/tmp/diff_new_pack.FYgMoY/_old 2024-08-05 17:21:58.204832177 +0200
+++ /var/tmp/diff_new_pack.FYgMoY/_new 2024-08-05 17:21:58.208832341 +0200
@@ -17,9 +17,9 @@
#
-%define git_commit e640e0cb36b3390d81f7410afc6651412ed8f1dd
+%define git_commit 86664f57f65c6e6484b6dd1d80aeb0cf84694d55
Name: helmfile
-Version: 0.167.0
+Version: 0.167.1
Release: 0
Summary: Deploy Kubernetes Helm Charts
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.FYgMoY/_old 2024-08-05 17:21:58.244833816 +0200
+++ /var/tmp/diff_new_pack.FYgMoY/_new 2024-08-05 17:21:58.248833980 +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.167.0</param>
+ <param name="revision">v0.167.1</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="manual">
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.FYgMoY/_old 2024-08-05 17:21:58.268834799 +0200
+++ /var/tmp/diff_new_pack.FYgMoY/_new 2024-08-05 17:21:58.272834963 +0200
@@ -1,5 +1,5 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/helmfile/helmfile.git</param>
- <param
name="changesrevision">e640e0cb36b3390d81f7410afc6651412ed8f1dd</param></service></servicedata>
+ <param
name="changesrevision">86664f57f65c6e6484b6dd1d80aeb0cf84694d55</param></service></servicedata>
++++++ helmfile-0.167.0.tar.gz -> helmfile-0.167.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/helmfile-0.167.0/Dockerfile
new/helmfile-0.167.1/Dockerfile
--- old/helmfile-0.167.0/Dockerfile 2024-07-30 13:17:44.000000000 +0200
+++ new/helmfile-0.167.1/Dockerfile 2024-08-03 01:53:06.000000000 +0200
@@ -96,7 +96,7 @@
RUN helm plugin install https://github.com/databus23/helm-diff --version
v3.9.8 && \
helm plugin install https://github.com/jkroepke/helm-secrets --version
v4.6.0 && \
- helm plugin install https://github.com/hypnoglow/helm-s3.git --version
v0.16.0 && \
+ helm plugin install https://github.com/hypnoglow/helm-s3.git --version
v0.16.2 && \
helm plugin install https://github.com/aslafy-z/helm-git.git --version
v0.16.0 && \
rm -rf ${HELM_CACHE_HOME}/plugins
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/helmfile-0.167.0/Dockerfile.debian-stable-slim
new/helmfile-0.167.1/Dockerfile.debian-stable-slim
--- old/helmfile-0.167.0/Dockerfile.debian-stable-slim 2024-07-30
13:17:44.000000000 +0200
+++ new/helmfile-0.167.1/Dockerfile.debian-stable-slim 2024-08-03
01:53:06.000000000 +0200
@@ -101,7 +101,7 @@
RUN helm plugin install https://github.com/databus23/helm-diff --version
v3.9.8 && \
helm plugin install https://github.com/jkroepke/helm-secrets --version
v4.6.0 && \
- helm plugin install https://github.com/hypnoglow/helm-s3.git --version
v0.16.0 && \
+ helm plugin install https://github.com/hypnoglow/helm-s3.git --version
v0.16.2 && \
helm plugin install https://github.com/aslafy-z/helm-git.git --version
v0.16.0 && \
rm -rf ${HELM_CACHE_HOME}/plugins
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/helmfile-0.167.0/Dockerfile.ubuntu
new/helmfile-0.167.1/Dockerfile.ubuntu
--- old/helmfile-0.167.0/Dockerfile.ubuntu 2024-07-30 13:17:44.000000000
+0200
+++ new/helmfile-0.167.1/Dockerfile.ubuntu 2024-08-03 01:53:06.000000000
+0200
@@ -101,7 +101,7 @@
RUN helm plugin install https://github.com/databus23/helm-diff --version
v3.9.8 && \
helm plugin install https://github.com/jkroepke/helm-secrets --version
v4.6.0 && \
- helm plugin install https://github.com/hypnoglow/helm-s3.git --version
v0.16.0 && \
+ helm plugin install https://github.com/hypnoglow/helm-s3.git --version
v0.16.2 && \
helm plugin install https://github.com/aslafy-z/helm-git.git --version
v0.16.0 && \
rm -rf ${HELM_CACHE_HOME}/plugins
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/helmfile-0.167.0/go.mod new/helmfile-0.167.1/go.mod
--- old/helmfile-0.167.0/go.mod 2024-07-30 13:17:44.000000000 +0200
+++ new/helmfile-0.167.1/go.mod 2024-08-03 01:53:06.000000000 +0200
@@ -47,7 +47,7 @@
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/a8m/envsubst v1.4.2 // indirect
- github.com/aws/aws-sdk-go v1.55.3
+ github.com/aws/aws-sdk-go v1.55.5
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d //
indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/helmfile-0.167.0/go.sum new/helmfile-0.167.1/go.sum
--- old/helmfile-0.167.0/go.sum 2024-07-30 13:17:44.000000000 +0200
+++ new/helmfile-0.167.1/go.sum 2024-08-03 01:53:06.000000000 +0200
@@ -296,8 +296,8 @@
github.com/atotto/clipboard v0.1.4
h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
github.com/atotto/clipboard v0.1.4/go.mod
h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
github.com/aws/aws-sdk-go v1.44.122/go.mod
h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
-github.com/aws/aws-sdk-go v1.55.3
h1:0B5hOX+mIx7I5XPOrjrHlKSDQV/+ypFZpIHOx5LOk3E=
-github.com/aws/aws-sdk-go v1.55.3/go.mod
h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
+github.com/aws/aws-sdk-go v1.55.5
h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU=
+github.com/aws/aws-sdk-go v1.55.5/go.mod
h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
github.com/aws/aws-sdk-go-v2 v1.30.0
h1:6qAwtzlfcTtcL8NHtbDQAqgM5s6NDipQTkPxyH/6kAA=
github.com/aws/aws-sdk-go-v2 v1.30.0/go.mod
h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2
h1:x6xsQXGSmW6frevwDA+vi/wqhp1ct18mVXYN08/93to=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/helmfile-0.167.0/pkg/state/state.go
new/helmfile-0.167.1/pkg/state/state.go
--- old/helmfile-0.167.0/pkg/state/state.go 2024-07-30 13:17:44.000000000
+0200
+++ new/helmfile-0.167.1/pkg/state/state.go 2024-08-03 01:53:06.000000000
+0200
@@ -1215,7 +1215,7 @@
chartFetchedByGoGetter := chartPath != chartName
if !chartFetchedByGoGetter {
- ociChartPath, err :=
st.getOCIChart(release, dir, helm)
+ ociChartPath, err :=
st.getOCIChart(release, dir, helm, opts.OutputDirTemplate)
if err != nil {
results <-
&chartPrepareResult{err: fmt.Errorf("release %q: %w", release.Name, err)}
@@ -3646,7 +3646,7 @@
}
}
-func (st *HelmState) getOCIChart(release *ReleaseSpec, tempDir string, helm
helmexec.Interface) (*string, error) {
+func (st *HelmState) getOCIChart(release *ReleaseSpec, tempDir string, helm
helmexec.Interface, outputDirTemplate string) (*string, error) {
qualifiedChartName, chartName, chartVersion, err :=
st.getOCIQualifiedChartName(release, helm)
if err != nil {
return nil, err
@@ -3656,21 +3656,7 @@
return nil, nil
}
- pathElems := []string{
- tempDir,
- }
-
- if release.Namespace != "" {
- pathElems = append(pathElems, release.Namespace)
- }
-
- if release.KubeContext != "" {
- pathElems = append(pathElems, release.KubeContext)
- }
-
- pathElems = append(pathElems, release.Name, chartName,
safeVersionPath(chartVersion))
-
- chartPath := filepath.Join(pathElems...)
+ chartPath, _ := st.getOCIChartPath(tempDir, release, chartName,
chartVersion, outputDirTemplate)
if st.fs.DirectoryExistsAt(chartPath) {
st.logger.Debugf("chart already exists at %s", chartPath)
@@ -3754,3 +3740,23 @@
}
return filepath.Join(wd, st.basePath, st.FilePath), err
}
+
+func (st *HelmState) getOCIChartPath(tempDir string, release *ReleaseSpec,
chartName, chartVersion, outputDirTemplate string) (string, error) {
+ if outputDirTemplate != "" {
+ return generateChartPath(chartName, tempDir, release,
outputDirTemplate)
+ }
+
+ pathElems := []string{tempDir}
+
+ if release.Namespace != "" {
+ pathElems = append(pathElems, release.Namespace)
+ }
+
+ if release.KubeContext != "" {
+ pathElems = append(pathElems, release.KubeContext)
+ }
+
+ pathElems = append(pathElems, release.Name, chartName,
safeVersionPath(chartVersion))
+
+ return filepath.Join(pathElems...), nil
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/helmfile-0.167.0/pkg/state/state_test.go
new/helmfile-0.167.1/pkg/state/state_test.go
--- old/helmfile-0.167.0/pkg/state/state_test.go 2024-07-30
13:17:44.000000000 +0200
+++ new/helmfile-0.167.1/pkg/state/state_test.go 2024-08-03
01:53:06.000000000 +0200
@@ -3724,3 +3724,69 @@
})
}
}
+
+func TestGetOCIChartPath(t *testing.T) {
+ tests := []struct {
+ name string
+ tempDir string
+ release *ReleaseSpec
+ chartName string
+ chartVersion string
+ outputDirTemplate string
+ expectedPath string
+ expectedErr bool
+ }{
+ {
+ name: "OCI chart with template",
+ tempDir: "charts",
+ release: &ReleaseSpec{
+ Name: "karpenter",
+ Chart: "karpenter/karpenter",
+ },
+ chartName: "karpenter",
+ chartVersion: "0.37.0",
+ outputDirTemplate: "{{ .OutputDir }}/",
+ expectedPath: "charts/",
+ expectedErr: false,
+ },
+ {
+ name: "OCI chart with template containing unknown
values",
+ tempDir: "charts",
+ release: &ReleaseSpec{
+ Name: "karpenter",
+ Chart: "karpenter/karpenter",
+ },
+ chartName: "karpenter",
+ chartVersion: "0.37.0",
+ outputDirTemplate: "{{ .SomethingThatDoesNotExist }}/",
+ expectedPath: "",
+ expectedErr: true,
+ },
+ {
+ name: "OCI chart without template",
+ tempDir: "charts",
+ release: &ReleaseSpec{
+ Name: "karpenter",
+ Chart: "karpenter/karpenter",
+ },
+ chartName: "karpenter",
+ chartVersion: "0.37.0",
+ expectedPath: "charts/karpenter/karpenter/0.37.0",
+ expectedErr: false,
+ },
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ st := &HelmState{}
+ path, err := st.getOCIChartPath(tt.tempDir, tt.release,
tt.chartName, tt.chartVersion, tt.outputDirTemplate)
+
+ if tt.expectedErr {
+ require.Error(t, err)
+ } else {
+ require.NoError(t, err)
+ require.Equal(t, tt.expectedPath, path)
+ }
+ })
+ }
+}
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/helmfile/vendor.tar.gz
/work/SRC/openSUSE:Factory/.helmfile.new.7232/vendor.tar.gz differ: char 5,
line 1
