Skip to content

Commit 4d6eb62

Browse files
authored
Merge pull request #346 from fluxcd/managed-fields-manager
Set the managed fields owner to helm-controller
2 parents 9eb8024 + 049aca9 commit 4d6eb62

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

main.go

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"time"
2323

2424
flag "github.com/spf13/pflag"
25+
"helm.sh/helm/v3/pkg/kube"
2526
"k8s.io/apimachinery/pkg/runtime"
2627
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
2728
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
@@ -105,6 +106,9 @@ func main() {
105106
watchNamespace = os.Getenv("RUNTIME_NAMESPACE")
106107
}
107108

109+
// set the managedFields owner for resources reconciled from Helm charts
110+
kube.ManagedFieldsManager = controllerName
111+
108112
restConfig := client.GetConfigOrDie(clientOptions)
109113
mgr, err := ctrl.NewManager(restConfig, ctrl.Options{
110114
Scheme: scheme,

0 commit comments

Comments
 (0)