Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package werf for openSUSE:Factory checked in
at 2025-05-05 22:29:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/werf (Old)
and /work/SRC/openSUSE:Factory/.werf.new.30101 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "werf"
Mon May 5 22:29:01 2025 rev:48 rq:1274515 version:2.35.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/werf/werf.changes 2025-05-01
15:23:22.334897744 +0200
+++ /work/SRC/openSUSE:Factory/.werf.new.30101/werf.changes 2025-05-05
23:00:44.303423457 +0200
@@ -1,0 +2,9 @@
+Mon May 05 10:50:58 UTC 2025 - Johannes Kastl
<opensuse_buildserv...@ojkastl.de>
+
+- Update to version 2.35.8:
+ * Bug Fixes
+ - don't parse WERF_ADD_*_SEPARATOR as label or annotation value
+ (#6835) (a9289b1)
+ - host-cleanup: disable git data cleaning temporary (7d38726)
+
+-------------------------------------------------------------------
Old:
----
werf-2.35.7.obscpio
New:
----
werf-2.35.8.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ werf.spec ++++++
--- /var/tmp/diff_new_pack.dO0u5x/_old 2025-05-05 23:00:44.895448327 +0200
+++ /var/tmp/diff_new_pack.dO0u5x/_new 2025-05-05 23:00:44.895448327 +0200
@@ -17,7 +17,7 @@
Name: werf
-Version: 2.35.7
+Version: 2.35.8
Release: 0
Summary: CLI for the Werf CI/CD system
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.dO0u5x/_old 2025-05-05 23:00:44.923449503 +0200
+++ /var/tmp/diff_new_pack.dO0u5x/_new 2025-05-05 23:00:44.923449503 +0200
@@ -3,7 +3,7 @@
<param name="url">https://github.com/werf/werf</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v2.35.7</param>
+ <param name="revision">v2.35.8</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="changesgenerate">enable</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.dO0u5x/_old 2025-05-05 23:00:44.943450344 +0200
+++ /var/tmp/diff_new_pack.dO0u5x/_new 2025-05-05 23:00:44.947450512 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/werf/werf</param>
- <param
name="changesrevision">346c06575907254603ada1598ea117cbfb1514d9</param></service></servicedata>
+ <param
name="changesrevision">85651808ccf5872b68674914e4aee971e6ddbb21</param></service></servicedata>
(No newline at EOF)
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/werf/vendor.tar.gz
/work/SRC/openSUSE:Factory/.werf.new.30101/vendor.tar.gz differ: char 13, line 1
++++++ werf-2.35.7.obscpio -> werf-2.35.8.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/werf-2.35.7/CHANGELOG.md new/werf-2.35.8/CHANGELOG.md
--- old/werf-2.35.7/CHANGELOG.md 2025-04-30 16:31:11.000000000 +0200
+++ new/werf-2.35.8/CHANGELOG.md 2025-05-05 10:20:12.000000000 +0200
@@ -1,5 +1,13 @@
# Changelog
+### [2.35.8](https://www.github.com/werf/werf/compare/v2.35.7...v2.35.8)
(2025-05-05)
+
+
+### Bug Fixes
+
+* don't parse WERF_ADD_*_SEPARATOR as label or annotation value
([#6835](https://www.github.com/werf/werf/issues/6835))
([a9289b1](https://www.github.com/werf/werf/commit/a9289b12e5a7c3e0080e86619368e71de45f7dde))
+* **host-cleanup:** disable git data cleaning temporary
([7d38726](https://www.github.com/werf/werf/commit/7d38726ed2df0d23a3725246cd59648be119071b))
+
### [2.35.7](https://www.github.com/werf/werf/compare/v2.35.6...v2.35.7)
(2025-04-30)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/werf-2.35.7/cmd/werf/bundle/apply/apply.go
new/werf-2.35.8/cmd/werf/bundle/apply/apply.go
--- old/werf-2.35.7/cmd/werf/bundle/apply/apply.go 2025-04-30
16:31:11.000000000 +0200
+++ new/werf-2.35.8/cmd/werf/bundle/apply/apply.go 2025-05-05
10:20:12.000000000 +0200
@@ -1,6 +1,7 @@
package apply
import (
+ "cmp"
"context"
"encoding/json"
"fmt"
@@ -210,7 +211,9 @@
chart.CurrentChartType = chart.ChartTypeBundle
- ctx = action.SetupLogging(ctx, common.GetNelmLogLevel(&commonCmdData),
action.DefaultReleaseInstallLogLevel, *commonCmdData.LogColorMode, false)
+ ctx = action.SetupLogging(ctx,
cmp.Or(common.GetNelmLogLevel(&commonCmdData),
action.DefaultReleaseInstallLogLevel), action.SetupLoggingOptions{
+ ColorMode: *commonCmdData.LogColorMode,
+ })
if err := action.ReleaseInstall(ctx, releaseName, releaseNamespace,
action.ReleaseInstallOptions{
AutoRollback: cmdData.AutoRollback,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/werf-2.35.7/cmd/werf/bundle/render/render.go
new/werf-2.35.8/cmd/werf/bundle/render/render.go
--- old/werf-2.35.7/cmd/werf/bundle/render/render.go 2025-04-30
16:31:11.000000000 +0200
+++ new/werf-2.35.8/cmd/werf/bundle/render/render.go 2025-05-05
10:20:12.000000000 +0200
@@ -1,6 +1,7 @@
package render
import (
+ "cmp"
"context"
"encoding/json"
"fmt"
@@ -216,7 +217,10 @@
// TODO(v3): get rid of forcing color mode via ci-env and use color
mode detection logic from
// Nelm instead. Until then, color will be always off here.
- ctx = action.SetupLogging(ctx, common.GetNelmLogLevel(&commonCmdData),
action.DefaultChartRenderLogLevel, action.LogColorModeOff, true)
+ ctx = action.SetupLogging(ctx,
cmp.Or(common.GetNelmLogLevel(&commonCmdData),
action.DefaultChartRenderLogLevel), action.SetupLoggingOptions{
+ ColorMode: action.LogColorModeOff,
+ LogIsParseable: true,
+ })
if err := action.ChartRender(ctx, action.ChartRenderOptions{
ChartDirPath: bundlePath,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/werf-2.35.7/cmd/werf/common/common.go
new/werf-2.35.8/cmd/werf/common/common.go
--- old/werf-2.35.7/cmd/werf/common/common.go 2025-04-30 16:31:11.000000000
+0200
+++ new/werf-2.35.8/cmd/werf/common/common.go 2025-05-05 10:20:12.000000000
+0200
@@ -1342,11 +1342,11 @@
}
func GetAddLabels(cmdData *CmdData) []string {
- return append(util.PredefinedValuesByEnvNamePrefix("WERF_ADD_LABEL_"),
*cmdData.AddLabels...)
+ return append(util.PredefinedValuesByEnvNamePrefix("WERF_ADD_LABEL_",
"WERF_ADD_LABEL_SEPARATOR"), *cmdData.AddLabels...)
}
func GetAddAnnotations(cmdData *CmdData) []string {
- return
append(util.PredefinedValuesByEnvNamePrefix("WERF_ADD_ANNOTATION_"),
*cmdData.AddAnnotations...)
+ return
append(util.PredefinedValuesByEnvNamePrefix("WERF_ADD_ANNOTATION_",
"WERF_ADD_ANNOTATION_SEPARATOR"), *cmdData.AddAnnotations...)
}
func GetCacheStagesStorage(cmdData *CmdData) []string {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/werf-2.35.7/cmd/werf/converge/converge.go
new/werf-2.35.8/cmd/werf/converge/converge.go
--- old/werf-2.35.7/cmd/werf/converge/converge.go 2025-04-30
16:31:11.000000000 +0200
+++ new/werf-2.35.8/cmd/werf/converge/converge.go 2025-05-05
10:20:12.000000000 +0200
@@ -1,6 +1,7 @@
package converge
import (
+ "cmp"
"context"
"fmt"
"os"
@@ -433,7 +434,9 @@
loader.ChartFileReader = giterminismManager.FileReader()
- ctx = action.SetupLogging(ctx, common.GetNelmLogLevel(&commonCmdData),
action.DefaultReleaseInstallLogLevel, *commonCmdData.LogColorMode, false)
+ ctx = action.SetupLogging(ctx,
cmp.Or(common.GetNelmLogLevel(&commonCmdData),
action.DefaultReleaseInstallLogLevel), action.SetupLoggingOptions{
+ ColorMode: *commonCmdData.LogColorMode,
+ })
if err := action.ReleaseInstall(ctx, releaseName, releaseNamespace,
action.ReleaseInstallOptions{
AutoRollback: cmdData.AutoRollback,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/werf-2.35.7/cmd/werf/dismiss/dismiss.go
new/werf-2.35.8/cmd/werf/dismiss/dismiss.go
--- old/werf-2.35.7/cmd/werf/dismiss/dismiss.go 2025-04-30 16:31:11.000000000
+0200
+++ new/werf-2.35.8/cmd/werf/dismiss/dismiss.go 2025-05-05 10:20:12.000000000
+0200
@@ -1,6 +1,7 @@
package dismiss
import (
+ "cmp"
"context"
"encoding/json"
"errors"
@@ -170,7 +171,9 @@
return fmt.Errorf("get release name and namespace: %w", err)
}
- ctx = action.SetupLogging(ctx, common.GetNelmLogLevel(&commonCmdData),
action.DefaultReleaseUninstallLogLevel, *commonCmdData.LogColorMode, false)
+ ctx = action.SetupLogging(ctx,
cmp.Or(common.GetNelmLogLevel(&commonCmdData),
action.DefaultReleaseUninstallLogLevel), action.SetupLoggingOptions{
+ ColorMode: *commonCmdData.LogColorMode,
+ })
if err := action.ReleaseUninstall(ctx, releaseName, releaseNamespace,
action.ReleaseUninstallOptions{
NoDeleteHooks: !cmdData.WithHooks,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/werf-2.35.7/cmd/werf/export/export.go
new/werf-2.35.8/cmd/werf/export/export.go
--- old/werf-2.35.7/cmd/werf/export/export.go 2025-04-30 16:31:11.000000000
+0200
+++ new/werf-2.35.8/cmd/werf/export/export.go 2025-05-05 10:20:12.000000000
+0200
@@ -69,7 +69,7 @@
}
result, err := common.InputArrayToKeyValueMap(
-
append(util.PredefinedValuesByEnvNamePrefix("WERF_EXPORT_ADD_LABEL_"),
addLabelArray...),
+
append(util.PredefinedValuesByEnvNamePrefix("WERF_EXPORT_ADD_LABEL_",
"WERF_EXPORT_ADD_LABEL_SEPARATOR"), addLabelArray...),
addLabelSeparator,
common.DefaultKeyValueSeparator,
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/werf-2.35.7/cmd/werf/helm/secret/file/decrypt/decrypt.go
new/werf-2.35.8/cmd/werf/helm/secret/file/decrypt/decrypt.go
--- old/werf-2.35.7/cmd/werf/helm/secret/file/decrypt/decrypt.go
2025-04-30 16:31:11.000000000 +0200
+++ new/werf-2.35.8/cmd/werf/helm/secret/file/decrypt/decrypt.go
2025-05-05 10:20:12.000000000 +0200
@@ -1,6 +1,7 @@
package secret
import (
+ "cmp"
"context"
"fmt"
"strings"
@@ -94,7 +95,10 @@
workingDir := common.GetWorkingDir(&commonCmdData)
- ctx = action.SetupLogging(ctx, common.GetNelmLogLevel(&commonCmdData),
action.DefaultSecretFileDecryptLogLevel, *commonCmdData.LogColorMode, true)
+ ctx = action.SetupLogging(ctx,
cmp.Or(common.GetNelmLogLevel(&commonCmdData),
action.DefaultSecretFileDecryptLogLevel), action.SetupLoggingOptions{
+ ColorMode: *commonCmdData.LogColorMode,
+ LogIsParseable: true,
+ })
if err := action.SecretFileDecrypt(ctx, filePath,
action.SecretFileDecryptOptions{
OutputFilePath: CmdData.OutputFilePath,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/werf-2.35.7/cmd/werf/helm/secret/file/edit/edit.go
new/werf-2.35.8/cmd/werf/helm/secret/file/edit/edit.go
--- old/werf-2.35.7/cmd/werf/helm/secret/file/edit/edit.go 2025-04-30
16:31:11.000000000 +0200
+++ new/werf-2.35.8/cmd/werf/helm/secret/file/edit/edit.go 2025-05-05
10:20:12.000000000 +0200
@@ -1,6 +1,7 @@
package secret
import (
+ "cmp"
"context"
"fmt"
@@ -72,7 +73,9 @@
workingDir := common.GetWorkingDir(&commonCmdData)
- ctx = action.SetupLogging(ctx, common.GetNelmLogLevel(&commonCmdData),
action.DefaultSecretFileEditLogLevel, *commonCmdData.LogColorMode, false)
+ ctx = action.SetupLogging(ctx,
cmp.Or(common.GetNelmLogLevel(&commonCmdData),
action.DefaultSecretFileEditLogLevel), action.SetupLoggingOptions{
+ ColorMode: *commonCmdData.LogColorMode,
+ })
if err := action.SecretFileEdit(ctx, filePath,
action.SecretFileEditOptions{
SecretWorkDir: workingDir,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/werf-2.35.7/cmd/werf/helm/secret/file/encrypt/encrypt.go
new/werf-2.35.8/cmd/werf/helm/secret/file/encrypt/encrypt.go
--- old/werf-2.35.7/cmd/werf/helm/secret/file/encrypt/encrypt.go
2025-04-30 16:31:11.000000000 +0200
+++ new/werf-2.35.8/cmd/werf/helm/secret/file/encrypt/encrypt.go
2025-05-05 10:20:12.000000000 +0200
@@ -1,6 +1,7 @@
package secret
import (
+ "cmp"
"context"
"fmt"
"strings"
@@ -90,7 +91,10 @@
workingDir := common.GetWorkingDir(&commonCmdData)
- ctx = action.SetupLogging(ctx, common.GetNelmLogLevel(&commonCmdData),
action.DefaultSecretFileEncryptLogLevel, *commonCmdData.LogColorMode, true)
+ ctx = action.SetupLogging(ctx,
cmp.Or(common.GetNelmLogLevel(&commonCmdData),
action.DefaultSecretFileEncryptLogLevel), action.SetupLoggingOptions{
+ ColorMode: *commonCmdData.LogColorMode,
+ LogIsParseable: true,
+ })
if err := action.SecretFileEncrypt(ctx, filePath,
action.SecretFileEncryptOptions{
OutputFilePath: cmdData.OutputFilePath,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/werf-2.35.7/cmd/werf/helm/secret/generate_secret_key/generate_secret_key.go
new/werf-2.35.8/cmd/werf/helm/secret/generate_secret_key/generate_secret_key.go
---
old/werf-2.35.7/cmd/werf/helm/secret/generate_secret_key/generate_secret_key.go
2025-04-30 16:31:11.000000000 +0200
+++
new/werf-2.35.8/cmd/werf/helm/secret/generate_secret_key/generate_secret_key.go
2025-05-05 10:20:12.000000000 +0200
@@ -1,6 +1,7 @@
package secret
import (
+ "cmp"
"context"
"fmt"
@@ -34,7 +35,10 @@
return err
}
- ctx = action.SetupLogging(ctx,
common.GetNelmLogLevel(&commonCmdData), action.DefaultSecretKeyCreateLogLevel,
*commonCmdData.LogColorMode, true)
+ ctx = action.SetupLogging(ctx,
cmp.Or(common.GetNelmLogLevel(&commonCmdData),
action.DefaultSecretKeyCreateLogLevel), action.SetupLoggingOptions{
+ ColorMode: *commonCmdData.LogColorMode,
+ LogIsParseable: true,
+ })
if _, err := action.SecretKeyCreate(ctx,
action.SecretKeyCreateOptions{}); err != nil {
return fmt.Errorf("create secret key: %w", err)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/werf-2.35.7/cmd/werf/helm/secret/rotate_secret_key/rotate_secret_key.go
new/werf-2.35.8/cmd/werf/helm/secret/rotate_secret_key/rotate_secret_key.go
--- old/werf-2.35.7/cmd/werf/helm/secret/rotate_secret_key/rotate_secret_key.go
2025-04-30 16:31:11.000000000 +0200
+++ new/werf-2.35.8/cmd/werf/helm/secret/rotate_secret_key/rotate_secret_key.go
2025-05-05 10:20:12.000000000 +0200
@@ -1,6 +1,7 @@
package secret
import (
+ "cmp"
"context"
"fmt"
"path/filepath"
@@ -89,7 +90,9 @@
chartPath := filepath.Join(giterminismManager.ProjectDir(),
relChartPath)
- ctx = action.SetupLogging(ctx, common.GetNelmLogLevel(&commonCmdData),
action.DefaultSecretKeyRotateLogLevel, *commonCmdData.LogColorMode, false)
+ ctx = action.SetupLogging(ctx,
cmp.Or(common.GetNelmLogLevel(&commonCmdData),
action.DefaultSecretKeyRotateLogLevel), action.SetupLoggingOptions{
+ ColorMode: *commonCmdData.LogColorMode,
+ })
if err := action.SecretKeyRotate(ctx, action.SecretKeyRotateOptions{
ChartDirPath: chartPath,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/werf-2.35.7/cmd/werf/helm/secret/values/decrypt/decrypt.go
new/werf-2.35.8/cmd/werf/helm/secret/values/decrypt/decrypt.go
--- old/werf-2.35.7/cmd/werf/helm/secret/values/decrypt/decrypt.go
2025-04-30 16:31:11.000000000 +0200
+++ new/werf-2.35.8/cmd/werf/helm/secret/values/decrypt/decrypt.go
2025-05-05 10:20:12.000000000 +0200
@@ -1,6 +1,7 @@
package secret
import (
+ "cmp"
"context"
"fmt"
"strings"
@@ -99,7 +100,10 @@
workingDir := common.GetWorkingDir(&commonCmdData)
- ctx = action.SetupLogging(ctx, common.GetNelmLogLevel(&commonCmdData),
action.DefaultSecretValuesFileDecryptLogLevel, *commonCmdData.LogColorMode,
true)
+ ctx = action.SetupLogging(ctx,
cmp.Or(common.GetNelmLogLevel(&commonCmdData),
action.DefaultSecretValuesFileDecryptLogLevel), action.SetupLoggingOptions{
+ ColorMode: *commonCmdData.LogColorMode,
+ LogIsParseable: true,
+ })
if err := action.SecretValuesFileDecrypt(ctx, filePath,
action.SecretValuesFileDecryptOptions{
OutputFilePath: cmdData.OutputFilePath,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/werf-2.35.7/cmd/werf/helm/secret/values/edit/edit.go
new/werf-2.35.8/cmd/werf/helm/secret/values/edit/edit.go
--- old/werf-2.35.7/cmd/werf/helm/secret/values/edit/edit.go 2025-04-30
16:31:11.000000000 +0200
+++ new/werf-2.35.8/cmd/werf/helm/secret/values/edit/edit.go 2025-05-05
10:20:12.000000000 +0200
@@ -1,6 +1,7 @@
package secret
import (
+ "cmp"
"context"
"fmt"
@@ -72,7 +73,9 @@
workingDir := common.GetWorkingDir(&commonCmdData)
- ctx = action.SetupLogging(ctx, common.GetNelmLogLevel(&commonCmdData),
action.DefaultSecretValuesFileEditLogLevel, *commonCmdData.LogColorMode, false)
+ ctx = action.SetupLogging(ctx,
cmp.Or(common.GetNelmLogLevel(&commonCmdData),
action.DefaultSecretValuesFileEditLogLevel), action.SetupLoggingOptions{
+ ColorMode: *commonCmdData.LogColorMode,
+ })
if err := action.SecretValuesFileEdit(ctx, filepPath,
action.SecretValuesFileEditOptions{
TempDirPath: werf.GetTmpDir(),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/werf-2.35.7/cmd/werf/helm/secret/values/encrypt/encrypt.go
new/werf-2.35.8/cmd/werf/helm/secret/values/encrypt/encrypt.go
--- old/werf-2.35.7/cmd/werf/helm/secret/values/encrypt/encrypt.go
2025-04-30 16:31:11.000000000 +0200
+++ new/werf-2.35.8/cmd/werf/helm/secret/values/encrypt/encrypt.go
2025-05-05 10:20:12.000000000 +0200
@@ -1,6 +1,7 @@
package secret
import (
+ "cmp"
"context"
"fmt"
"strings"
@@ -90,7 +91,10 @@
workingDir := common.GetWorkingDir(&commonCmdData)
- ctx = action.SetupLogging(ctx, common.GetNelmLogLevel(&commonCmdData),
action.DefaultSecretValuesFileEncryptLogLevel, *commonCmdData.LogColorMode,
true)
+ ctx = action.SetupLogging(ctx,
cmp.Or(common.GetNelmLogLevel(&commonCmdData),
action.DefaultSecretValuesFileEncryptLogLevel), action.SetupLoggingOptions{
+ ColorMode: *commonCmdData.LogColorMode,
+ LogIsParseable: true,
+ })
if err := action.SecretValuesFileEncrypt(ctx, filePath,
action.SecretValuesFileEncryptOptions{
OutputFilePath: cmdData.OutputFilePath,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/werf-2.35.7/cmd/werf/plan/plan.go
new/werf-2.35.8/cmd/werf/plan/plan.go
--- old/werf-2.35.7/cmd/werf/plan/plan.go 2025-04-30 16:31:11.000000000
+0200
+++ new/werf-2.35.8/cmd/werf/plan/plan.go 2025-05-05 10:20:12.000000000
+0200
@@ -1,6 +1,7 @@
package plan
import (
+ "cmp"
"context"
"fmt"
"os"
@@ -434,7 +435,9 @@
loader.ChartFileReader = giterminismManager.FileReader()
- ctx = action.SetupLogging(ctx, common.GetNelmLogLevel(&commonCmdData),
action.DefaultReleasePlanInstallLogLevel, *commonCmdData.LogColorMode, false)
+ ctx = action.SetupLogging(ctx,
cmp.Or(common.GetNelmLogLevel(&commonCmdData),
action.DefaultReleasePlanInstallLogLevel), action.SetupLoggingOptions{
+ ColorMode: *commonCmdData.LogColorMode,
+ })
if err := action.ReleasePlanInstall(ctx, releaseName, releaseNamespace,
action.ReleasePlanInstallOptions{
ChartAppVersion:
common.GetHelmChartConfigAppVersion(werfConfig),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/werf-2.35.7/cmd/werf/render/render.go
new/werf-2.35.8/cmd/werf/render/render.go
--- old/werf-2.35.7/cmd/werf/render/render.go 2025-04-30 16:31:11.000000000
+0200
+++ new/werf-2.35.8/cmd/werf/render/render.go 2025-05-05 10:20:12.000000000
+0200
@@ -1,6 +1,7 @@
package render
import (
+ "cmp"
"context"
"fmt"
"os"
@@ -395,7 +396,10 @@
// TODO(v3): get rid of forcing color mode via ci-env and use color
mode detection logic from
// Nelm instead. Until then, color will be always off here.
- ctx = action.SetupLogging(ctx, common.GetNelmLogLevel(&commonCmdData),
action.DefaultChartRenderLogLevel, action.LogColorModeOff, true)
+ ctx = action.SetupLogging(ctx,
cmp.Or(common.GetNelmLogLevel(&commonCmdData),
action.DefaultChartRenderLogLevel), action.SetupLoggingOptions{
+ ColorMode: action.LogColorModeOff,
+ LogIsParseable: true,
+ })
if err := action.ChartRender(ctx, action.ChartRenderOptions{
ChartAppVersion:
common.GetHelmChartConfigAppVersion(werfConfig),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/werf-2.35.7/go.mod new/werf-2.35.8/go.mod
--- old/werf-2.35.7/go.mod 2025-04-30 16:31:11.000000000 +0200
+++ new/werf-2.35.8/go.mod 2025-05-05 10:20:12.000000000 +0200
@@ -66,7 +66,7 @@
github.com/werf/kubedog-for-werf-helm v0.0.0-20241217155728-9d45c48b82b6
github.com/werf/lockgate v0.1.1
github.com/werf/logboek v0.6.1
- github.com/werf/nelm v1.2.3-0.20250430122641-a03bd9de934a
+ github.com/werf/nelm v1.2.3-0.20250430144753-b81646bac089
github.com/werf/nelm-for-werf-helm v0.0.0-20241217155925-b0e6734d1dbf
go.opentelemetry.io/otel v1.24.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/werf-2.35.7/go.sum new/werf-2.35.8/go.sum
--- old/werf-2.35.7/go.sum 2025-04-30 16:31:11.000000000 +0200
+++ new/werf-2.35.8/go.sum 2025-05-05 10:20:12.000000000 +0200
@@ -1406,8 +1406,8 @@
github.com/werf/lockgate v0.1.1/go.mod
h1:0yIFSLq9ausy6ejNxF5uUBf/Ib6daMAfXuCaTMZJzIE=
github.com/werf/logboek v0.6.1 h1:oEe6FkmlKg0z0n80oZjLplj6sXcBeLleCkjfOOZEL2g=
github.com/werf/logboek v0.6.1/go.mod
h1:Gez5J4bxekyr6MxTmIJyId1F61rpO+0/V4vjCIEIZmk=
-github.com/werf/nelm v1.2.3-0.20250430122641-a03bd9de934a
h1:iufvbMmsTGYtV4F0DV5WLVE7gi7xCRp5qFPBvqwSXJQ=
-github.com/werf/nelm v1.2.3-0.20250430122641-a03bd9de934a/go.mod
h1:9SR2Rfi0uE06z5bbnFRqfZTePNGnbyw9RLOVyYuV+cg=
+github.com/werf/nelm v1.2.3-0.20250430144753-b81646bac089
h1:qTNuFn/4h9XImxo34MbBXLPUBtXhCuwc69qQzzK4bGA=
+github.com/werf/nelm v1.2.3-0.20250430144753-b81646bac089/go.mod
h1:9SR2Rfi0uE06z5bbnFRqfZTePNGnbyw9RLOVyYuV+cg=
github.com/werf/nelm-for-werf-helm v0.0.0-20241217155925-b0e6734d1dbf
h1:K51qz209c1yJgKzPw8AeS72T21F/ACp0VI3RJvT4THA=
github.com/werf/nelm-for-werf-helm v0.0.0-20241217155925-b0e6734d1dbf/go.mod
h1:7RJXSGPKKPEvfPqrTwNA8jT7y52O0ebwhSbSn29ESMA=
github.com/xanzy/go-gitlab v0.31.0/go.mod
h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/werf-2.35.7/pkg/host_cleaning/host_cleanup.go
new/werf-2.35.8/pkg/host_cleaning/host_cleanup.go
--- old/werf-2.35.7/pkg/host_cleaning/host_cleanup.go 2025-04-30
16:31:11.000000000 +0200
+++ new/werf-2.35.8/pkg/host_cleaning/host_cleanup.go 2025-05-05
10:20:12.000000000 +0200
@@ -106,17 +106,19 @@
return err
}
- allowedLocalCacheVolumeUsagePercentage :=
getOptionValueOrDefault(options.AllowedLocalCacheVolumeUsagePercentage,
DefaultAllowedLocalCacheVolumeUsagePercentage)
- allowedLocalCacheVolumeUsageMarginPercentage :=
getOptionValueOrDefault(options.AllowedLocalCacheVolumeUsageMarginPercentage,
DefaultAllowedLocalCacheVolumeUsageMarginPercentage)
+ /*
+ allowedLocalCacheVolumeUsagePercentage :=
getOptionValueOrDefault(options.AllowedLocalCacheVolumeUsagePercentage,
DefaultAllowedLocalCacheVolumeUsagePercentage)
+ allowedLocalCacheVolumeUsageMarginPercentage :=
getOptionValueOrDefault(options.AllowedLocalCacheVolumeUsageMarginPercentage,
DefaultAllowedLocalCacheVolumeUsageMarginPercentage)
- if err := logboek.Context(ctx).Default().LogProcess("Running GC for git
data").DoError(func() error {
- if err := gitdata.RunGC(ctx,
allowedLocalCacheVolumeUsagePercentage,
allowedLocalCacheVolumeUsageMarginPercentage); err != nil {
- return fmt.Errorf("git repo GC failed: %w", err)
+ if err := logboek.Context(ctx).Default().LogProcess("Running GC
for git data").DoError(func() error {
+ if err := gitdata.RunGC(ctx,
allowedLocalCacheVolumeUsagePercentage,
allowedLocalCacheVolumeUsageMarginPercentage); err != nil {
+ return fmt.Errorf("git repo GC failed: %w", err)
+ }
+ return nil
+ }); err != nil {
+ return err
}
- return nil
- }); err != nil {
- return err
- }
+ */
allowedBackendStorageVolumeUsagePercentage :=
getOptionValueOrDefault(options.AllowedBackendStorageVolumeUsagePercentage,
DefaultAllowedBackendStorageVolumeUsagePercentage)
allowedBackendStorageVolumeUsageMarginPercentage :=
getOptionValueOrDefault(options.AllowedBackendStorageVolumeUsageMarginPercentage,
DefaultAllowedBackendStorageVolumeUsageMarginPercentage)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/werf-2.35.7/scripts/werf-in-image/build-and-publish.sh
new/werf-2.35.8/scripts/werf-in-image/build-and-publish.sh
--- old/werf-2.35.7/scripts/werf-in-image/build-and-publish.sh 2025-04-30
16:31:11.000000000 +0200
+++ new/werf-2.35.8/scripts/werf-in-image/build-and-publish.sh 2025-05-05
10:20:12.000000000 +0200
@@ -16,9 +16,12 @@
DEST_SUBREPO=$1/werf
+unset WERF_PLATFORM
+
export WERF_REPO=ghcr.io/werf/werf-storage
# Extra labels for artifacthub
+export WERF_EXPORT_ADD_LABEL_SEPARATOR='\n'
export
WERF_EXPORT_ADD_LABEL_AH1=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/werf/werf/main/README.md
\
WERF_EXPORT_ADD_LABEL_AH2=io.artifacthub.package.logo-url=https://raw.githubusercontent.com/werf/website/main/assets/images/werf-logo.svg
\
WERF_EXPORT_ADD_LABEL_AH3=io.artifacthub.package.category=integration-delivery \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/werf-2.35.7/trdl_channels.yaml
new/werf-2.35.8/trdl_channels.yaml
--- old/werf-2.35.7/trdl_channels.yaml 2025-04-30 16:31:11.000000000 +0200
+++ new/werf-2.35.8/trdl_channels.yaml 2025-05-05 10:20:12.000000000 +0200
@@ -38,7 +38,7 @@
- name: "2"
channels:
- name: alpha
- version: 2.35.6
+ version: 2.35.7
- name: beta
version: 2.35.1
- name: ea
++++++ werf.obsinfo ++++++
--- /var/tmp/diff_new_pack.dO0u5x/_old 2025-05-05 23:00:46.123499916 +0200
+++ /var/tmp/diff_new_pack.dO0u5x/_new 2025-05-05 23:00:46.127500084 +0200
@@ -1,5 +1,5 @@
name: werf
-version: 2.35.7
-mtime: 1746023471
-commit: 346c06575907254603ada1598ea117cbfb1514d9
+version: 2.35.8
+mtime: 1746433212
+commit: 85651808ccf5872b68674914e4aee971e6ddbb21
