Skip to content

[addon-operator] Set field manager for helm #708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ldmonster merged 7 commits into from
Dec 3, 2025
Merged

[addon-operator] Set field manager for helm #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1826c8b
bump
ldmonster Dec 2, 2025
01e4a85
bump
ldmonster Dec 2, 2025
2d0466d
bump
ldmonster Dec 2, 2025
4baacae
bump
ldmonster Dec 2, 2025
6b48b9d
Merge commit 'b995f12be8112590181c76a68485eabe721c0bb8' into fix/set-…
ldmonster Dec 3, 2025
c29213d
Merge commit 'a44cbb345df17ee00a6debcce813312574e91bdb' into fix/set-…
ldmonster Dec 3, 2025
5b546fa
bump
ldmonster Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down
7 changes: 7 additions & 0 deletions pkg/helm/helm3lib/helm3lib.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"sort"
"strconv"
"strings"
"sync"
"time"

"github.com/deckhouse/deckhouse/pkg/log"
Expand All @@ -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"
Expand Down Expand Up @@ -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,
Expand Down
Loading