fix: update COSI and reset restart backoff on success

See cosi-project/runtime#191 Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
siderolabs · Dec 6, 2022 · a505b89 · a505b89
1 parent e92fdcb
commit a505b89
Show file tree

Hide file tree

Showing 101 changed files with 223 additions and 27 deletions.
diff --git a/go.mod b/go.mod
@@ -40,7 +40,7 @@ require (
 	github.com/containernetworking/plugins v1.1.1
 	github.com/coreos/go-iptables v0.6.0
 	github.com/coreos/go-semver v0.3.0
-	github.com/cosi-project/runtime v0.2.0
+	github.com/cosi-project/runtime v0.3.0-alpha.0
 	github.com/docker/distribution v2.8.1+incompatible
 	github.com/docker/docker v20.10.21+incompatible
 	github.com/docker/go-connections v0.4.0
@@ -90,7 +90,7 @@ require (
 	github.com/siderolabs/crypto v0.4.0
 	github.com/siderolabs/discovery-api v0.1.1
 	github.com/siderolabs/discovery-client v0.1.3
-	github.com/siderolabs/gen v0.4.1
+	github.com/siderolabs/gen v0.4.2
 	github.com/siderolabs/go-blockdevice v0.4.2
 	github.com/siderolabs/go-circular v0.1.0
 	github.com/siderolabs/go-cmd v0.1.1
@@ -123,7 +123,7 @@ require (
 	go.etcd.io/etcd/etcdutl/v3 v3.5.6
 	go.uber.org/atomic v1.10.0
 	go.uber.org/multierr v1.8.0
-	go.uber.org/zap v1.23.0
+	go.uber.org/zap v1.24.0
 	go4.org/netipx v0.0.0-20220925034521-797b0c90d8ab
 	golang.org/x/net v0.2.0
 	golang.org/x/sync v0.1.0
@@ -199,7 +199,7 @@ require (
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gosuri/uilive v0.0.4 // indirect
 	github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.13.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.14.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/go-memdb v1.3.4 // indirect
@@ -279,7 +279,7 @@ require (
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	golang.org/x/crypto v0.1.0 // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/oauth2 v0.1.0 // indirect
+	golang.org/x/oauth2 v0.2.0 // indirect
 	golang.org/x/text v0.4.0 // indirect
 	golang.org/x/tools v0.1.12 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect

diff --git a/go.sum b/go.sum
@@ -312,8 +312,8 @@ github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzA
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/cosi-project/runtime v0.2.0 h1:4jzNWoftvsHCU3pv49mzmALc6iaXfNwMpRD2U9LSfqE=
-github.com/cosi-project/runtime v0.2.0/go.mod h1:6KLUKBiwLpZNOi4opnz96v6HDl8VUGnTiyCFeqSzQJQ=
+github.com/cosi-project/runtime v0.3.0-alpha.0 h1:Jd8CAOG/FXliVPmKQ+TrVjjzUCRhuHevLXoxXaOLv+I=
+github.com/cosi-project/runtime v0.3.0-alpha.0/go.mod h1:5PyAjBqrjRRqobGHBIImQAek/XwLYx+cc3UjxA2Y3jc=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
@@ -591,8 +591,8 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.13.0 h1:fi9bGIUJOGzzrHBbP8NWbTfNC5fKO6X7kFw40TOqGB8=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.13.0/go.mod h1:uY3Aurq+SxwQCpdX91xZ9CgxIMT1EsYtcidljXufYIY=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.14.0 h1:t7uX3JBHdVwAi3G7sSSdbsk8NfgA+LnUS88V/2EKaA0=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.14.0/go.mod h1:4OGVnY4qf2+gw+ssiHbW+pq4mo2yko94YxxMmXZ7jCA=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -1013,8 +1013,8 @@ github.com/siderolabs/discovery-api v0.1.1 h1:DI+CjD/Nl0nIk8qkaNKz1sEquWTEKHKH4+
 github.com/siderolabs/discovery-api v0.1.1/go.mod h1:JnJg4h1HbAhOazQl0lYHEjrg63rg/cf9r2te6/DqUxo=
 github.com/siderolabs/discovery-client v0.1.3 h1:DsiH2aiObxHGJISLXxih4q+NmSixUzxRegNjLlRC8s4=
 github.com/siderolabs/discovery-client v0.1.3/go.mod h1:4ahEk2dMPKAGCLK5sRUxHfVryROxflwDPL+2c5MrLMI=
-github.com/siderolabs/gen v0.4.1 h1:NoPmxjLFwOGRFaKypk2hoT5/XIzoM6AhF0eqy61bQLk=
-github.com/siderolabs/gen v0.4.1/go.mod h1:wS8tFq7sn5vqKAuyS30vJUig3tX5v6q79VG4KfUnILM=
+github.com/siderolabs/gen v0.4.2 h1:25z0dRKymC8uFxHfOWc3GKTCpK058u4FvOYLmfeQTfw=
+github.com/siderolabs/gen v0.4.2/go.mod h1:wS8tFq7sn5vqKAuyS30vJUig3tX5v6q79VG4KfUnILM=
 github.com/siderolabs/go-api-signature v0.2.2 h1:C5tUzuFsJYidpYyVfJGYpgQwETglA8B62ET4obkLDGE=
 github.com/siderolabs/go-api-signature v0.2.2/go.mod h1:9jSRiJsuKyf6b/hyKcBgCZXvu7xGJ+RiCQQAVraGdN0=
 github.com/siderolabs/go-blockdevice v0.4.2 h1:ZA8rds0Ge/7ScNCAchK/wVJs0mmdphu4OZncirYaFyk=
@@ -1232,8 +1232,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
 go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
-go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY=
-go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
+go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
+go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
 go4.org/netipx v0.0.0-20220925034521-797b0c90d8ab h1:+yW1yrZ09EYNu1spCUOHBBNRbrLnfmutwyhbhCv3b6Q=
 go4.org/netipx v0.0.0-20220925034521-797b0c90d8ab/go.mod h1:tgPU4N2u9RByaTN3NC2p9xOzyFpte4jYwsIIRF7XlSc=
 golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -1360,8 +1360,8 @@ golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4Iltr
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
-golang.org/x/oauth2 v0.1.0 h1:isLCZuhj4v+tYv7eskaN4v/TM+A1begWWgyVJDdl1+Y=
-golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A=
+golang.org/x/oauth2 v0.2.0 h1:GtQkldQ9m7yvzCL1V+LrYow3Khe0eJH0w7RbX/VbaIU=
+golang.org/x/oauth2 v0.2.0/go.mod h1:Cwn6afJ8jrQwYMxQDTpISoXmXW9I6qF6vDeuuoX3Ibs=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

diff --git a/internal/app/machined/pkg/controllers/cluster/affiliate_merge.go b/internal/app/machined/pkg/controllers/cluster/affiliate_merge.go
@@ -106,5 +106,7 @@ func (ctrl *AffiliateMergeController) Run(ctx context.Context, r controller.Runt
 				}
 			}
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
diff --git a/internal/app/machined/pkg/controllers/cluster/config.go b/internal/app/machined/pkg/controllers/cluster/config.go
@@ -144,5 +144,7 @@ func (ctrl *ConfigController) Run(ctx context.Context, r controller.Runtime, log
 				}
 			}
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
diff --git a/internal/app/machined/pkg/controllers/cluster/discovery_service.go b/internal/app/machined/pkg/controllers/cluster/discovery_service.go
@@ -320,6 +320,8 @@ func (ctrl *DiscoveryServiceController) Run(ctx context.Context, r controller.Ru
 		if err := cleanupAffiliates(ctx, ctrl, r, touchedIDs); err != nil {
 			return err
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
 

diff --git a/internal/app/machined/pkg/controllers/cluster/endpoint.go b/internal/app/machined/pkg/controllers/cluster/endpoint.go
@@ -91,5 +91,7 @@ func (ctrl *EndpointController) Run(ctx context.Context, r controller.Runtime, l
 		); err != nil {
 			return fmt.Errorf("error updating endpoints: %w", err)
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
diff --git a/internal/app/machined/pkg/controllers/cluster/kubernetes_pull.go b/internal/app/machined/pkg/controllers/cluster/kubernetes_pull.go
@@ -171,5 +171,7 @@ func (ctrl *KubernetesPullController) Run(ctx context.Context, r controller.Runt
 		if err := cleanupAffiliates(ctx, ctrl, r, touchedIDs); err != nil {
 			return err
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
diff --git a/internal/app/machined/pkg/controllers/cluster/kubernetes_push.go b/internal/app/machined/pkg/controllers/cluster/kubernetes_push.go
@@ -140,5 +140,7 @@ func (ctrl *KubernetesPushController) Run(ctx context.Context, r controller.Runt
 				return fmt.Errorf("error pushing to Kubernetes registry: %w", err)
 			}
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
diff --git a/internal/app/machined/pkg/controllers/cluster/local_affiliate.go b/internal/app/machined/pkg/controllers/cluster/local_affiliate.go
@@ -296,5 +296,7 @@ func (ctrl *LocalAffiliateController) Run(ctx context.Context, r controller.Runt
 				}
 			}
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
diff --git a/internal/app/machined/pkg/controllers/cluster/member.go b/internal/app/machined/pkg/controllers/cluster/member.go
@@ -104,5 +104,7 @@ func (ctrl *MemberController) Run(ctx context.Context, r controller.Runtime, log
 				}
 			}
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
diff --git a/internal/app/machined/pkg/controllers/cluster/node_identity.go b/internal/app/machined/pkg/controllers/cluster/node_identity.go
@@ -125,5 +125,7 @@ func (ctrl *NodeIdentityController) Run(ctx context.Context, r controller.Runtim
 
 			ctrl.identityEstablished = true
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
diff --git a/internal/app/machined/pkg/controllers/config/machine_type.go b/internal/app/machined/pkg/controllers/config/machine_type.go
@@ -75,5 +75,7 @@ func (ctrl *MachineTypeController) Run(ctx context.Context, r controller.Runtime
 		}); err != nil {
 			return fmt.Errorf("error updating objects: %w", err)
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
diff --git a/internal/app/machined/pkg/controllers/cri/seccomp_profile.go b/internal/app/machined/pkg/controllers/cri/seccomp_profile.go
@@ -99,5 +99,7 @@ func (ctrl *SeccompProfileController) Run(ctx context.Context, r controller.Runt
 				}
 			}
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
diff --git a/internal/app/machined/pkg/controllers/cri/seccomp_profile_file.go b/internal/app/machined/pkg/controllers/cri/seccomp_profile_file.go
@@ -165,6 +165,8 @@ func (ctrl *SeccompProfileFileController) Run(ctx context.Context, r controller.
 		}); err != nil {
 			return err
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
 

diff --git a/internal/app/machined/pkg/controllers/etcd/advertised_peer.go b/internal/app/machined/pkg/controllers/etcd/advertised_peer.go
@@ -109,6 +109,8 @@ func (ctrl *AdvertisedPeerController) Run(ctx context.Context, r controller.Runt
 		if err = ctrl.updateAdvertisedPeers(ctx, logger, etcdSpec.TypedSpec().AdvertisedAddresses); err != nil {
 			return fmt.Errorf("error updating advertised peers: %w", err)
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
 

diff --git a/internal/app/machined/pkg/controllers/etcd/config.go b/internal/app/machined/pkg/controllers/etcd/config.go
@@ -118,6 +118,8 @@ func (ctrl *ConfigController) Run(ctx context.Context, r controller.Runtime, log
 		}); err != nil {
 			return fmt.Errorf("error updating Config status: %w", err)
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
 

diff --git a/internal/app/machined/pkg/controllers/etcd/member.go b/internal/app/machined/pkg/controllers/etcd/member.go
@@ -94,6 +94,8 @@ func (ctrl *MemberController) Run(ctx context.Context, r controller.Runtime, log
 				return fmt.Errorf("error destroying etcd member resource: %w", err)
 			}
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
 

diff --git a/internal/app/machined/pkg/controllers/etcd/pki.go b/internal/app/machined/pkg/controllers/etcd/pki.go
@@ -144,5 +144,7 @@ func (ctrl *PKIController) Run(ctx context.Context, r controller.Runtime, logger
 		}); err != nil {
 			return fmt.Errorf("error updating PKI status: %w", err)
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
diff --git a/internal/app/machined/pkg/controllers/etcd/spec.go b/internal/app/machined/pkg/controllers/etcd/spec.go
@@ -192,5 +192,7 @@ func (ctrl *SpecController) Run(ctx context.Context, r controller.Runtime, logge
 		}); err != nil {
 			return fmt.Errorf("error updating Spec status: %w", err)
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
diff --git a/internal/app/machined/pkg/controllers/files/cri_config_parts.go b/internal/app/machined/pkg/controllers/files/cri_config_parts.go
@@ -88,5 +88,7 @@ func (ctrl *CRIConfigPartsController) Run(ctx context.Context, r controller.Runt
 			}); err != nil {
 			return fmt.Errorf("error modifying resource: %w", err)
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
diff --git a/internal/app/machined/pkg/controllers/files/cri_registry_config.go b/internal/app/machined/pkg/controllers/files/cri_registry_config.go
@@ -127,6 +127,8 @@ func (ctrl *CRIRegistryConfigController) Run(ctx context.Context, r controller.R
 		if err := ctrl.syncHosts(shadowPath, criHosts); err != nil {
 			return fmt.Errorf("error syncing hosts: %w", err)
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
 

diff --git a/internal/app/machined/pkg/controllers/files/etcfile.go b/internal/app/machined/pkg/controllers/files/etcfile.go
@@ -161,6 +161,8 @@ func (ctrl *EtcFileController) Run(ctx context.Context, r controller.Runtime, lo
 				}
 			}
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
 

diff --git a/internal/app/machined/pkg/controllers/k8s/address_filter.go b/internal/app/machined/pkg/controllers/k8s/address_filter.go
@@ -137,5 +137,7 @@ func (ctrl *AddressFilterController) Run(ctx context.Context, r controller.Runti
 				}
 			}
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
diff --git a/internal/app/machined/pkg/controllers/k8s/control_plane.go b/internal/app/machined/pkg/controllers/k8s/control_plane.go
@@ -144,6 +144,8 @@ func (ctrl *ControlPlaneController) Run(ctx context.Context, r controller.Runtim
 				return fmt.Errorf("error updating objects: %w", err)
 			}
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
 

diff --git a/internal/app/machined/pkg/controllers/k8s/control_plane_static_pod.go b/internal/app/machined/pkg/controllers/k8s/control_plane_static_pod.go
@@ -207,6 +207,8 @@ func (ctrl *ControlPlaneStaticPodController) Run(ctx context.Context, r controll
 				}
 			}
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
 

diff --git a/internal/app/machined/pkg/controllers/k8s/endpoint.go b/internal/app/machined/pkg/controllers/k8s/endpoint.go
@@ -101,6 +101,8 @@ func (ctrl *EndpointController) Run(ctx context.Context, r controller.Runtime, l
 				return err
 			}
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
 

diff --git a/internal/app/machined/pkg/controllers/k8s/extra_manifest.go b/internal/app/machined/pkg/controllers/k8s/extra_manifest.go
@@ -138,6 +138,8 @@ func (ctrl *ExtraManifestController) Run(ctx context.Context, r controller.Runti
 				}
 			}
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
 

diff --git a/internal/app/machined/pkg/controllers/k8s/kubelet_config.go b/internal/app/machined/pkg/controllers/k8s/kubelet_config.go
@@ -96,6 +96,8 @@ func (ctrl *KubeletConfigController) Run(ctx context.Context, r controller.Runti
 		); err != nil {
 			return fmt.Errorf("error modifying KubeletConfig resource: %w", err)
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
 

diff --git a/internal/app/machined/pkg/controllers/k8s/kubelet_service.go b/internal/app/machined/pkg/controllers/k8s/kubelet_service.go
@@ -205,6 +205,8 @@ func (ctrl *KubeletServiceController) Run(ctx context.Context, r controller.Runt
 		if err = ctrl.V1Alpha1Services.Start("kubelet"); err != nil {
 			return fmt.Errorf("error starting kubelet service: %w", err)
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
 

diff --git a/internal/app/machined/pkg/controllers/k8s/kubelet_spec.go b/internal/app/machined/pkg/controllers/k8s/kubelet_spec.go
@@ -199,6 +199,8 @@ func (ctrl *KubeletSpecController) Run(ctx context.Context, r controller.Runtime
 		); err != nil {
 			return fmt.Errorf("error modifying KubeletSpec resource: %w", err)
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
 

diff --git a/internal/app/machined/pkg/controllers/k8s/kubelet_static_pod.go b/internal/app/machined/pkg/controllers/k8s/kubelet_static_pod.go
@@ -159,6 +159,8 @@ func (ctrl *KubeletStaticPodController) Run(ctx context.Context, r controller.Ru
 		if err != nil {
 			return fmt.Errorf("error building kubelet client: %w", err)
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
 

diff --git a/internal/app/machined/pkg/controllers/k8s/manifest.go b/internal/app/machined/pkg/controllers/k8s/manifest.go
@@ -141,6 +141,8 @@ func (ctrl *ManifestController) Run(ctx context.Context, r controller.Runtime, l
 				return fmt.Errorf("error cleaning up manifests: %w", err)
 			}
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
 

diff --git a/internal/app/machined/pkg/controllers/k8s/manifest_apply.go b/internal/app/machined/pkg/controllers/k8s/manifest_apply.go
@@ -173,6 +173,8 @@ func (ctrl *ManifestApplyController) Run(ctx context.Context, r controller.Runti
 		}); err != nil {
 			return fmt.Errorf("error updating manifest status: %w", err)
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
 

diff --git a/internal/app/machined/pkg/controllers/k8s/node_label_spec.go b/internal/app/machined/pkg/controllers/k8s/node_label_spec.go
@@ -99,5 +99,7 @@ func (ctrl *NodeLabelSpecController) Run(ctx context.Context, r controller.Runti
 				return fmt.Errorf("error destroying node label spec: %w", err)
 			}
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
diff --git a/internal/app/machined/pkg/controllers/k8s/node_labels_apply.go b/internal/app/machined/pkg/controllers/k8s/node_labels_apply.go
@@ -86,6 +86,8 @@ func (ctrl *NodeLabelsApplyController) Run(ctx context.Context, r controller.Run
 		if err := ctrl.reconcileWithK8s(ctx, r, logger); err != nil {
 			return err
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
 

diff --git a/internal/app/machined/pkg/controllers/k8s/nodeip.go b/internal/app/machined/pkg/controllers/k8s/nodeip.go
@@ -146,5 +146,7 @@ func (ctrl *NodeIPController) Run(ctx context.Context, r controller.Runtime, log
 		); err != nil {
 			return fmt.Errorf("error modifying NodeIP resource: %w", err)
 		}
+
+		r.ResetRestartBackoff()
 	}
 }
diff --git a/internal/app/machined/pkg/controllers/k8s/nodeip_config.go b/internal/app/machined/pkg/controllers/k8s/nodeip_config.go
@@ -116,6 +116,8 @@ func (ctrl *NodeIPConfigController) Run(ctx context.Context, r controller.Runtim
 		); err != nil {
 			return fmt.Errorf("error modifying NodeIPConfig resource: %w", err)
 		}
+
+		r.ResetRestartBackoff()
 	}
 }