fix race

Signed-off-by: Mikhail Scherba <mikhail.scherba@flant.com>

Author: miklezzzz

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/dominikbraun/graph v0.23.0
 	github.com/ettle/strcase v0.2.0
 	github.com/flant/kube-client v1.2.2
-	github.com/flant/shell-operator v1.5.4-0.20250218103902-153e6952772d
+	github.com/flant/shell-operator v1.5.4-0.20250219083821-5782d5984178
 	github.com/go-chi/chi/v5 v5.2.1
 	github.com/go-openapi/loads v0.19.5
 	github.com/go-openapi/spec v0.19.8

go.sum

@@ -138,8 +138,8 @@ github.com/flant/kube-client v1.2.2 h1:27LBs+PKJEFnkQXjPU9eIps7a7iyI13AKcSYj897D
 github.com/flant/kube-client v1.2.2/go.mod h1:eMa3aJ6V1PRWSQ/RCROkObDpY4S74uM84SJS4G/LINg=
 github.com/flant/libjq-go v1.6.3-0.20201126171326-c46a40ff22ee h1:evii83J+/6QGNvyf6tjQ/p27DPY9iftxIBb37ALJRTg=
 github.com/flant/libjq-go v1.6.3-0.20201126171326-c46a40ff22ee/go.mod h1:f+REaGl/+pZR97rbTcwHEka/MAipoQQ2Mc0iQUj4ak0=
-github.com/flant/shell-operator v1.5.4-0.20250218103902-153e6952772d h1:BKrxOl5I38R4b/u2Kdh+YoiSzrIvi1+tg9HrJOtBaOQ=
-github.com/flant/shell-operator v1.5.4-0.20250218103902-153e6952772d/go.mod h1:vfhZxDVSb/v+e8+roBtz+oe8mqahvizfIPCzhFq/7HE=
+github.com/flant/shell-operator v1.5.4-0.20250219083821-5782d5984178 h1:jtkt2vpcKjrIt+I0+hOPZr4aFadwvK8Hb/V2nSRuCOI=
+github.com/flant/shell-operator v1.5.4-0.20250219083821-5782d5984178/go.mod h1:vfhZxDVSb/v+e8+roBtz+oe8mqahvizfIPCzhFq/7HE=
 github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/foxcpp/go-mockdns v1.0.0 h1:7jBqxd3WDWwi/6WhDvacvH1XsN3rOLXyHM1uhvIx6FI=

pkg/addon-operator/operator.go

@@ -82,9 +82,6 @@ type AddonOperator struct {
 	// HelmResourcesManager monitors absent resources created for modules.
 	HelmResourcesManager helm_resources_manager.HelmResourcesManager
 
-	// converge state
-	ConvergeState *converge.ConvergeState
-
 	// Initial KubeConfig to bypass initial loading from the ConfigMap.
 	InitialKubeConfig *config.KubeConfig
 
@@ -105,6 +102,10 @@ type AddonOperator struct {
 	discoveredGVKs map[string]struct{}
 
 	Logger *log.Logger
+
+	l sync.Mutex
+	// converge state
+	ConvergeState *converge.ConvergeState
 }
 
 type parallelQueueEvent struct {
@@ -2688,6 +2689,7 @@ func (op *AddonOperator) CheckCRDsEnsured(t sh_task.Task) {
 func (op *AddonOperator) CheckConvergeStatus(t sh_task.Task) {
 	convergeTasks := ConvergeTasksInQueue(op.engine.TaskQueues.GetMain())
 
+	op.l.Lock()
 	// Converge state is 'Started'. Update StartedAt and
 	// Activation if the converge process is just started.
 	if convergeTasks > 0 && op.ConvergeState.StartedAt == 0 {
@@ -2707,6 +2709,7 @@ func (op *AddonOperator) CheckConvergeStatus(t sh_task.Task) {
 
 	// Update field for the first converge.
 	op.UpdateFirstConvergeStatus(convergeTasks)
+	op.l.Unlock()
 
 	// Report modules left to process.
 	if convergeTasks > 0 && (t.GetType() == task.ModuleRun || t.GetType() == task.ModuleDelete) {