From a1956360bdd3cb0e89d202509fc62f3ab2cf6b50 Mon Sep 17 00:00:00 2001 From: Sinelnikov Michail Date: Thu, 26 Feb 2026 18:19:10 +0300 Subject: [PATCH 1/2] bump nelm Signed-off-by: Sinelnikov Michail --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 12cb4ccb..04b7b435 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.11.1 github.com/tidwall/gjson v1.18.0 - github.com/werf/nelm v1.21.1-0.20260211145403-697eed6dd07c + github.com/werf/nelm v1.22.1-0.20260226105851-08c852246d12 google.golang.org/protobuf v1.36.7 gopkg.in/alecthomas/kingpin.v2 v2.2.6 gopkg.in/yaml.v3 v3.0.1 @@ -215,7 +215,7 @@ require ( github.com/tidwall/pretty v1.2.1 // indirect github.com/tidwall/sjson v1.2.5 // indirect github.com/wI2L/jsondiff v0.5.0 // indirect - github.com/werf/3p-helm v0.0.0-20260211143448-0b619e3cc3bf // indirect + github.com/werf/3p-helm v0.0.0-20260226105203-2bf4ce55336e // indirect github.com/werf/common-go v0.0.0-20251113140850-a1a98e909e9b // indirect github.com/werf/kubedog v0.13.1-0.20260115171811-304218f24308 // indirect github.com/werf/lockgate v0.1.1 // indirect diff --git a/go.sum b/go.sum index 387a6de7..bb8bcc8f 100644 --- a/go.sum +++ b/go.sum @@ -551,8 +551,8 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY= github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28= github.com/wI2L/jsondiff v0.5.0 h1:RRMTi/mH+R2aXcPe1VYyvGINJqQfC3R+KSEakuU1Ikw= github.com/wI2L/jsondiff v0.5.0/go.mod h1:qqG6hnK0Lsrz2BpIVCxWiK9ItsBCpIZQiv0izJjOZ9s= -github.com/werf/3p-helm v0.0.0-20260211143448-0b619e3cc3bf h1:lWl6myftkC7mIRJ15LvUPNVHIzi7CIVHZhyhsNqD5mc= -github.com/werf/3p-helm v0.0.0-20260211143448-0b619e3cc3bf/go.mod h1:UAmQvGZhiUULXQpigm1yqcp57s097kpAHz2EvFtKCSk= +github.com/werf/3p-helm v0.0.0-20260226105203-2bf4ce55336e h1:fwID2o1P9HH793Lfw1oWIT4ooLEoQtpxYiSqQ3lA6VU= +github.com/werf/3p-helm v0.0.0-20260226105203-2bf4ce55336e/go.mod h1:UAmQvGZhiUULXQpigm1yqcp57s097kpAHz2EvFtKCSk= github.com/werf/common-go v0.0.0-20251113140850-a1a98e909e9b h1:58850oFrnw5Jy5YaB8QifXz75qpGotfx6qqZ9Q2my1A= github.com/werf/common-go v0.0.0-20251113140850-a1a98e909e9b/go.mod h1:MXS0JR9zut+oR9oEM8PEkdXXoEbKDILTmWopt0z1eZs= github.com/werf/kubedog v0.13.1-0.20260115171811-304218f24308 h1:ee55f/lNya8V9jCBsQWDhvOw6y1fB0uysop8te9aUcM= @@ -561,8 +561,8 @@ github.com/werf/lockgate v0.1.1 h1:S400JFYjtWfE4i4LY9FA8zx0fMdfui9DPrBiTciCrx4= 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.21.1-0.20260211145403-697eed6dd07c h1:js48oqpm6g96R2MoEBTgzr7tcdDiMw5YHZnOOESHGEs= -github.com/werf/nelm v1.21.1-0.20260211145403-697eed6dd07c/go.mod h1:jUWL77X4EX3T5LRknehzuICg0Xi/1e74PGIkThRMs1s= +github.com/werf/nelm v1.22.1-0.20260226105851-08c852246d12 h1:4FZrAAYfPvjbaUs0nly+8MKMMj3oziW8CQ02f8LEg5k= +github.com/werf/nelm v1.22.1-0.20260226105851-08c852246d12/go.mod h1:uOXjJjxcxGSnBxSusUauSdjSPOx+E6egYnPEXZ4+lXQ= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= From 259657834d4b05d1271eadca8aa1b283fc337b7c Mon Sep 17 00:00:00 2001 From: Sinelnikov Michail Date: Thu, 26 Feb 2026 18:34:34 +0300 Subject: [PATCH 2/2] fix Signed-off-by: Sinelnikov Michail --- pkg/helm/nelm/nelm.go | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkg/helm/nelm/nelm.go b/pkg/helm/nelm/nelm.go index 31a22273..0fc7aaff 100644 --- a/pkg/helm/nelm/nelm.go +++ b/pkg/helm/nelm/nelm.go @@ -350,19 +350,21 @@ func (c *NelmClient) UpgradeRelease(releaseName, modulePath string, valuesPaths NoFinalTracking: true, LegacyHelmCompatibleTracking: true, }, - Chart: modulePath, - DefaultChartName: releaseName, - DefaultChartVersion: "0.2.0", - DefaultChartAPIVersion: "v2", - DefaultDeletePropagation: "Background", - ExtraLabels: c.labels, - ExtraAnnotations: extraAnnotations, - NoInstallStandaloneCRDs: true, - ReleaseHistoryLimit: int(c.opts.HistoryMax), - ReleaseLabels: releaseLabels, - ReleaseStorageDriver: c.opts.HelmDriver, - Timeout: c.opts.Timeout, - ForceAdoption: true, + ReleaseInstallRuntimeOptions: common.ReleaseInstallRuntimeOptions{ + DefaultDeletePropagation: "Background", + ExtraLabels: c.labels, + ExtraAnnotations: extraAnnotations, + NoInstallStandaloneCRDs: true, + ReleaseHistoryLimit: int(c.opts.HistoryMax), + ReleaseLabels: releaseLabels, + ReleaseStorageDriver: c.opts.HelmDriver, + ForceAdoption: true, + }, + Chart: modulePath, + DefaultChartName: releaseName, + DefaultChartVersion: "0.2.0", + DefaultChartAPIVersion: "v2", + Timeout: c.opts.Timeout, }); err != nil { return fmt.Errorf("install nelm release %q: %w", releaseName, err) }