Skip to content

Commit 2da1418

Browse files
authored
[addon-operator] Set field manager for helm (#708)
Signed-off-by: Pavel Okhlopkov <[email protected]>
1 parent a44cbb3 commit 2da1418

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/dominikbraun/graph v0.23.0
1111
github.com/ettle/strcase v0.2.0
1212
github.com/flant/kube-client v1.5.0
13-
github.com/flant/shell-operator v1.12.2
13+
github.com/flant/shell-operator v1.12.3
1414
github.com/go-chi/chi/v5 v5.2.2
1515
github.com/go-openapi/loads v0.23.1
1616
github.com/go-openapi/spec v0.22.0

go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2
155155
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
156156
github.com/flant/kube-client v1.5.0 h1:6QZOZy3uk58Bh9YUn4CnhEz13og/cEGXB2uBZ1gWwtM=
157157
github.com/flant/kube-client v1.5.0/go.mod h1:hpJZ0FnDKHW3r5q5SYQgBrTw9k94q4+dcnJ4uOGYBHc=
158-
github.com/flant/shell-operator v1.12.2 h1:/B5tB7CfpzRnIFLAkXtQOVKLLdhvaB9h2LTKuWyDj8M=
159-
github.com/flant/shell-operator v1.12.2/go.mod h1:RFXNvfK/v18J5u4RMqfFSDFhwJvMNPv5OR3BpioyxI0=
158+
github.com/flant/shell-operator v1.12.3 h1:KFOnV34aen1yT3AKaYVNQlqufQHJiIKeUKmE/7aftiY=
159+
github.com/flant/shell-operator v1.12.3/go.mod h1:RFXNvfK/v18J5u4RMqfFSDFhwJvMNPv5OR3BpioyxI0=
160160
github.com/flopp/go-findfont v0.1.0 h1:lPn0BymDUtJo+ZkV01VS3661HL6F4qFlkhcJN55u6mU=
161161
github.com/flopp/go-findfont v0.1.0/go.mod h1:wKKxRDjD024Rh7VMwoU90i6ikQRCr+JTHB5n4Ejkqvw=
162162
github.com/fluxcd/flagger v1.36.1 h1:X2PumtNwZz9YSGaOtZLFm2zAKLgHhFkbNv8beg7ifyc=
@@ -544,8 +544,6 @@ github.com/werf/lockgate v0.1.1 h1:S400JFYjtWfE4i4LY9FA8zx0fMdfui9DPrBiTciCrx4=
544544
github.com/werf/lockgate v0.1.1/go.mod h1:0yIFSLq9ausy6ejNxF5uUBf/Ib6daMAfXuCaTMZJzIE=
545545
github.com/werf/logboek v0.6.1 h1:oEe6FkmlKg0z0n80oZjLplj6sXcBeLleCkjfOOZEL2g=
546546
github.com/werf/logboek v0.6.1/go.mod h1:Gez5J4bxekyr6MxTmIJyId1F61rpO+0/V4vjCIEIZmk=
547-
github.com/werf/nelm v1.18.1-0.20251127115054-cb2cde474127 h1:MCxrBPACp2KZ7PCtVDc2WtDH1DVeH3VAs3mDhJarYAQ=
548-
github.com/werf/nelm v1.18.1-0.20251127115054-cb2cde474127/go.mod h1:V3fEi7u60qJvHnMLyXyuKjMDMSFy54vFMgyIgHjBGGU=
549547
github.com/werf/nelm v1.18.1-0.20251201095604-c3dd3788de56 h1:FmoddtC/vLcV9KJDE4i9jJ12nThYVtBNnVCD2RBdq+Y=
550548
github.com/werf/nelm v1.18.1-0.20251201095604-c3dd3788de56/go.mod h1:V3fEi7u60qJvHnMLyXyuKjMDMSFy54vFMgyIgHjBGGU=
551549
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=

pkg/helm/helm3lib/helm3lib.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"sort"
1212
"strconv"
1313
"strings"
14+
"sync"
1415
"time"
1516

1617
"github.com/deckhouse/deckhouse/pkg/log"
@@ -20,6 +21,7 @@ import (
2021
"helm.sh/helm/v3/pkg/chart/loader"
2122
"helm.sh/helm/v3/pkg/chartutil"
2223
"helm.sh/helm/v3/pkg/cli"
24+
"helm.sh/helm/v3/pkg/kube"
2325
"helm.sh/helm/v3/pkg/release"
2426
"helm.sh/helm/v3/pkg/releaseutil"
2527
"helm.sh/helm/v3/pkg/storage"
@@ -66,11 +68,16 @@ var (
6668
_ client.HelmClient = &LibClient{}
6769
options *Options
6870
actionConfig *action.Configuration
71+
once sync.Once
6972
)
7073

7174
func NewClient(logger *log.Logger, labels map[string]string) client.HelmClient {
7275
logEntry := logger.With("operator.component", "helm3lib")
7376

77+
once.Do(func() {
78+
kube.ManagedFieldsManager = "helm"
79+
})
80+
7481
return &LibClient{
7582
Logger: logEntry,
7683
Namespace: options.Namespace,

0 commit comments

Comments
 (0)