diff --git a/go.mod b/go.mod index 80628b9f..5a9095d1 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dominikbraun/graph v0.23.0 github.com/ettle/strcase v0.2.0 github.com/flant/kube-client v1.5.0 - github.com/flant/shell-operator v1.12.2 + github.com/flant/shell-operator v1.12.3 github.com/go-chi/chi/v5 v5.2.2 github.com/go-openapi/loads v0.23.1 github.com/go-openapi/spec v0.22.0 diff --git a/go.sum b/go.sum index 6910a340..751b567a 100644 --- a/go.sum +++ b/go.sum @@ -155,8 +155,8 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/flant/kube-client v1.5.0 h1:6QZOZy3uk58Bh9YUn4CnhEz13og/cEGXB2uBZ1gWwtM= github.com/flant/kube-client v1.5.0/go.mod h1:hpJZ0FnDKHW3r5q5SYQgBrTw9k94q4+dcnJ4uOGYBHc= -github.com/flant/shell-operator v1.12.2 h1:/B5tB7CfpzRnIFLAkXtQOVKLLdhvaB9h2LTKuWyDj8M= -github.com/flant/shell-operator v1.12.2/go.mod h1:RFXNvfK/v18J5u4RMqfFSDFhwJvMNPv5OR3BpioyxI0= +github.com/flant/shell-operator v1.12.3 h1:KFOnV34aen1yT3AKaYVNQlqufQHJiIKeUKmE/7aftiY= +github.com/flant/shell-operator v1.12.3/go.mod h1:RFXNvfK/v18J5u4RMqfFSDFhwJvMNPv5OR3BpioyxI0= github.com/flopp/go-findfont v0.1.0 h1:lPn0BymDUtJo+ZkV01VS3661HL6F4qFlkhcJN55u6mU= github.com/flopp/go-findfont v0.1.0/go.mod h1:wKKxRDjD024Rh7VMwoU90i6ikQRCr+JTHB5n4Ejkqvw= github.com/fluxcd/flagger v1.36.1 h1:X2PumtNwZz9YSGaOtZLFm2zAKLgHhFkbNv8beg7ifyc= @@ -544,8 +544,6 @@ 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.18.1-0.20251127115054-cb2cde474127 h1:MCxrBPACp2KZ7PCtVDc2WtDH1DVeH3VAs3mDhJarYAQ= -github.com/werf/nelm v1.18.1-0.20251127115054-cb2cde474127/go.mod h1:V3fEi7u60qJvHnMLyXyuKjMDMSFy54vFMgyIgHjBGGU= github.com/werf/nelm v1.18.1-0.20251201095604-c3dd3788de56 h1:FmoddtC/vLcV9KJDE4i9jJ12nThYVtBNnVCD2RBdq+Y= github.com/werf/nelm v1.18.1-0.20251201095604-c3dd3788de56/go.mod h1:V3fEi7u60qJvHnMLyXyuKjMDMSFy54vFMgyIgHjBGGU= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= diff --git a/pkg/helm/helm3lib/helm3lib.go b/pkg/helm/helm3lib/helm3lib.go index 59175e6e..90526c6b 100644 --- a/pkg/helm/helm3lib/helm3lib.go +++ b/pkg/helm/helm3lib/helm3lib.go @@ -11,6 +11,7 @@ import ( "sort" "strconv" "strings" + "sync" "time" "github.com/deckhouse/deckhouse/pkg/log" @@ -20,6 +21,7 @@ import ( "helm.sh/helm/v3/pkg/chart/loader" "helm.sh/helm/v3/pkg/chartutil" "helm.sh/helm/v3/pkg/cli" + "helm.sh/helm/v3/pkg/kube" "helm.sh/helm/v3/pkg/release" "helm.sh/helm/v3/pkg/releaseutil" "helm.sh/helm/v3/pkg/storage" @@ -66,11 +68,16 @@ var ( _ client.HelmClient = &LibClient{} options *Options actionConfig *action.Configuration + once sync.Once ) func NewClient(logger *log.Logger, labels map[string]string) client.HelmClient { logEntry := logger.With("operator.component", "helm3lib") + once.Do(func() { + kube.ManagedFieldsManager = "helm" + }) + return &LibClient{ Logger: logEntry, Namespace: options.Namespace,