From a505b8909a1c733b30f22a8d46eebc022475431a Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Tue, 6 Dec 2022 17:43:26 +0400 Subject: [PATCH] fix: update COSI and reset restart backoff on success See https://github.com/cosi-project/runtime/pull/191 Signed-off-by: Andrey Smirnov --- go.mod | 10 +++++----- go.sum | 20 +++++++++---------- .../controllers/cluster/affiliate_merge.go | 2 ++ .../pkg/controllers/cluster/config.go | 2 ++ .../controllers/cluster/discovery_service.go | 2 ++ .../pkg/controllers/cluster/endpoint.go | 2 ++ .../controllers/cluster/kubernetes_pull.go | 2 ++ .../controllers/cluster/kubernetes_push.go | 2 ++ .../controllers/cluster/local_affiliate.go | 2 ++ .../pkg/controllers/cluster/member.go | 2 ++ .../pkg/controllers/cluster/node_identity.go | 2 ++ .../pkg/controllers/config/machine_type.go | 2 ++ .../pkg/controllers/cri/seccomp_profile.go | 2 ++ .../controllers/cri/seccomp_profile_file.go | 2 ++ .../pkg/controllers/etcd/advertised_peer.go | 2 ++ .../machined/pkg/controllers/etcd/config.go | 2 ++ .../machined/pkg/controllers/etcd/member.go | 2 ++ .../app/machined/pkg/controllers/etcd/pki.go | 2 ++ .../app/machined/pkg/controllers/etcd/spec.go | 2 ++ .../pkg/controllers/files/cri_config_parts.go | 2 ++ .../controllers/files/cri_registry_config.go | 2 ++ .../machined/pkg/controllers/files/etcfile.go | 2 ++ .../pkg/controllers/k8s/address_filter.go | 2 ++ .../pkg/controllers/k8s/control_plane.go | 2 ++ .../k8s/control_plane_static_pod.go | 2 ++ .../machined/pkg/controllers/k8s/endpoint.go | 2 ++ .../pkg/controllers/k8s/extra_manifest.go | 2 ++ .../pkg/controllers/k8s/kubelet_config.go | 2 ++ .../pkg/controllers/k8s/kubelet_service.go | 2 ++ .../pkg/controllers/k8s/kubelet_spec.go | 2 ++ .../pkg/controllers/k8s/kubelet_static_pod.go | 2 ++ .../machined/pkg/controllers/k8s/manifest.go | 2 ++ .../pkg/controllers/k8s/manifest_apply.go | 2 ++ .../pkg/controllers/k8s/node_label_spec.go | 2 ++ .../pkg/controllers/k8s/node_labels_apply.go | 2 ++ .../machined/pkg/controllers/k8s/nodeip.go | 2 ++ .../pkg/controllers/k8s/nodeip_config.go | 2 ++ .../machined/pkg/controllers/k8s/nodename.go | 2 ++ .../k8s/render_config_static_pods.go | 2 ++ .../k8s/render_secrets_static_pod.go | 2 ++ .../pkg/controllers/k8s/static_pod_config.go | 2 ++ .../pkg/controllers/k8s/static_pod_server.go | 2 ++ .../pkg/controllers/kubeaccess/config.go | 2 ++ .../pkg/controllers/kubeaccess/endpoint.go | 2 ++ .../controllers/kubeaccess/serviceaccount.go | 2 ++ .../pkg/controllers/kubespan/config.go | 2 ++ .../pkg/controllers/kubespan/endpoint.go | 2 ++ .../pkg/controllers/kubespan/identity.go | 2 ++ .../pkg/controllers/kubespan/manager.go | 4 ++++ .../pkg/controllers/kubespan/peer_spec.go | 2 ++ .../pkg/controllers/network/address_config.go | 2 ++ .../pkg/controllers/network/address_event.go | 2 ++ .../pkg/controllers/network/address_merge.go | 2 ++ .../pkg/controllers/network/address_spec.go | 2 ++ .../pkg/controllers/network/address_status.go | 2 ++ .../pkg/controllers/network/device_config.go | 2 ++ .../pkg/controllers/network/etcfile.go | 2 ++ .../pkg/controllers/network/hardware_addr.go | 2 ++ .../controllers/network/hostname_config.go | 2 ++ .../pkg/controllers/network/hostname_merge.go | 2 ++ .../pkg/controllers/network/hostname_spec.go | 2 ++ .../pkg/controllers/network/link_config.go | 2 ++ .../pkg/controllers/network/link_merge.go | 2 ++ .../pkg/controllers/network/link_spec.go | 2 ++ .../pkg/controllers/network/link_status.go | 2 ++ .../pkg/controllers/network/node_address.go | 2 ++ .../controllers/network/operator_config.go | 2 ++ .../pkg/controllers/network/operator_merge.go | 2 ++ .../pkg/controllers/network/operator_spec.go | 2 ++ .../network/operator_vip_config.go | 2 ++ .../controllers/network/platform_config.go | 2 ++ .../controllers/network/resolver_config.go | 2 ++ .../pkg/controllers/network/resolver_merge.go | 2 ++ .../pkg/controllers/network/resolver_spec.go | 2 ++ .../pkg/controllers/network/route_config.go | 2 ++ .../pkg/controllers/network/route_merge.go | 2 ++ .../pkg/controllers/network/route_spec.go | 2 ++ .../pkg/controllers/network/route_status.go | 2 ++ .../pkg/controllers/network/status.go | 2 ++ .../controllers/network/timeserver_config.go | 2 ++ .../controllers/network/timeserver_merge.go | 2 ++ .../controllers/network/timeserver_spec.go | 2 ++ .../app/machined/pkg/controllers/perf/perf.go | 2 ++ .../runtime/kernel_module_config.go | 2 ++ .../controllers/runtime/kernel_module_spec.go | 2 ++ .../runtime/kernel_param_config.go | 2 ++ .../controllers/runtime/kernel_param_spec.go | 2 ++ .../pkg/controllers/runtime/kmsg_log.go | 2 ++ .../pkg/controllers/runtime/machine_status.go | 2 ++ .../runtime/machine_status_publisher.go | 2 ++ .../machined/pkg/controllers/secrets/api.go | 2 ++ .../pkg/controllers/secrets/api_cert_sans.go | 2 ++ .../machined/pkg/controllers/secrets/etcd.go | 2 ++ .../pkg/controllers/secrets/kubelet.go | 2 ++ .../pkg/controllers/secrets/kubernetes.go | 2 ++ .../secrets/kubernetes_cert_sans.go | 2 ++ .../machined/pkg/controllers/secrets/root.go | 2 ++ .../pkg/controllers/secrets/trustd.go | 2 ++ .../app/machined/pkg/controllers/time/sync.go | 2 ++ pkg/machinery/go.mod | 8 ++++---- pkg/machinery/go.sum | 16 +++++++-------- 101 files changed, 223 insertions(+), 27 deletions(-) diff --git a/go.mod b/go.mod index cfbd8e6f27..7d4cdd98b8 100644 --- 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 index c9b8d5ab97..793027bed2 100644 --- 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 index 8c63262670..795b922053 100644 --- 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 index 7dbdf44126..ba4306c8e4 100644 --- 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 index 67caebe4c1..2bb0a6b9cb 100644 --- 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 index 66afa5c006..1fdc686bf1 100644 --- 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 index 8f7cf52be5..b8ef83f689 100644 --- 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 index 937cfdea58..780201cae0 100644 --- 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 index 69cdca97e7..b44135d5f5 100644 --- 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 index 45949ea633..967ce40243 100644 --- 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 index 2265581e56..8f8b92274e 100644 --- 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 index 9e008d47c1..d44e1c55f1 100644 --- 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 index 9f9d56b527..64c5057db5 100644 --- 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 index b86cd2032f..5cbea284d3 100644 --- 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 index fb0200c832..26488454a2 100644 --- 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 index dd23971509..04ba46610f 100644 --- 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 index c54a9070d1..c65c852c1a 100644 --- 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 index 9a8fa3480d..eea133e193 100644 --- 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 index 57040f805d..504c7b6327 100644 --- 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 index 14d25c2ea1..b32e764018 100644 --- 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 index 89c8eb5bdc..21dd32f77b 100644 --- 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 index f478e88b20..39c413c8d8 100644 --- 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 index 8eb070fdd5..2e258256b1 100644 --- 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 index 7994d8c9e5..f4b8284bc8 100644 --- 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 index 72617b47a3..659f193a9c 100644 --- 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 index fb9764938b..8795882c3e 100644 --- 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 index e7ffce28aa..5fc90f4556 100644 --- 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 index d6f6c8ce5d..540418a3a5 100644 --- 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 index 5aef649db6..11b1000655 100644 --- 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 index f90c89ae8b..aead1f0fea 100644 --- 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 index 93f585cb82..213ba772fc 100644 --- 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 index bc3a9cefef..f04e36bb6f 100644 --- 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 index f35a5a6962..aef69f4ad3 100644 --- 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 index c6c562bd2e..ac57d0e7a4 100644 --- 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 index 1b6c171ff2..9c289f3be2 100644 --- 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 index 2476cbf363..e48d9c1ce4 100644 --- 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 index 28189d0b28..f92a8051a9 100644 --- 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() } } diff --git a/internal/app/machined/pkg/controllers/k8s/nodename.go b/internal/app/machined/pkg/controllers/k8s/nodename.go index f832ad55e4..5c2467a00d 100644 --- a/internal/app/machined/pkg/controllers/k8s/nodename.go +++ b/internal/app/machined/pkg/controllers/k8s/nodename.go @@ -106,5 +106,7 @@ func (ctrl *NodenameController) Run(ctx context.Context, r controller.Runtime, l ); err != nil { return fmt.Errorf("error modifying nodename resource: %w", err) } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/k8s/render_config_static_pods.go b/internal/app/machined/pkg/controllers/k8s/render_config_static_pods.go index 64318623f1..e9fe791cd4 100644 --- a/internal/app/machined/pkg/controllers/k8s/render_config_static_pods.go +++ b/internal/app/machined/pkg/controllers/k8s/render_config_static_pods.go @@ -166,6 +166,8 @@ func (ctrl *RenderConfigsStaticPodController) Run(ctx context.Context, r control }); err != nil { return err } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/k8s/render_secrets_static_pod.go b/internal/app/machined/pkg/controllers/k8s/render_secrets_static_pod.go index 4715aa951e..05e18f4d5c 100644 --- a/internal/app/machined/pkg/controllers/k8s/render_secrets_static_pod.go +++ b/internal/app/machined/pkg/controllers/k8s/render_secrets_static_pod.go @@ -315,5 +315,7 @@ func (ctrl *RenderSecretsStaticPodController) Run(ctx context.Context, r control }); err != nil { return err } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/k8s/static_pod_config.go b/internal/app/machined/pkg/controllers/k8s/static_pod_config.go index f83e1506ab..d642ee9abe 100644 --- a/internal/app/machined/pkg/controllers/k8s/static_pod_config.go +++ b/internal/app/machined/pkg/controllers/k8s/static_pod_config.go @@ -127,5 +127,7 @@ func (ctrl *StaticPodConfigController) Run(ctx context.Context, r controller.Run } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/k8s/static_pod_server.go b/internal/app/machined/pkg/controllers/k8s/static_pod_server.go index 095b1bae25..88d222a8b0 100644 --- a/internal/app/machined/pkg/controllers/k8s/static_pod_server.go +++ b/internal/app/machined/pkg/controllers/k8s/static_pod_server.go @@ -93,6 +93,8 @@ func (ctrl *StaticPodServerController) Run(ctx context.Context, r controller.Run ctrl.podList = staticPodList ctrl.podListMu.Unlock() } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/kubeaccess/config.go b/internal/app/machined/pkg/controllers/kubeaccess/config.go index 5d1df91893..0b1afb79f9 100644 --- a/internal/app/machined/pkg/controllers/kubeaccess/config.go +++ b/internal/app/machined/pkg/controllers/kubeaccess/config.go @@ -109,5 +109,7 @@ func (ctrl *ConfigController) Run(ctx context.Context, r controller.Runtime, log }); err != nil { return err } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/kubeaccess/endpoint.go b/internal/app/machined/pkg/controllers/kubeaccess/endpoint.go index 13ec9d0eb5..f9b4e9dcb9 100644 --- a/internal/app/machined/pkg/controllers/kubeaccess/endpoint.go +++ b/internal/app/machined/pkg/controllers/kubeaccess/endpoint.go @@ -128,6 +128,8 @@ func (ctrl *EndpointController) Run(ctx context.Context, r controller.Runtime, l if err = ctrl.updateTalosEndpoints(ctx, logger, kubeconfig, endpointAddrs); err != nil { return err } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/kubeaccess/serviceaccount.go b/internal/app/machined/pkg/controllers/kubeaccess/serviceaccount.go index 079abba96a..fb0969a212 100644 --- a/internal/app/machined/pkg/controllers/kubeaccess/serviceaccount.go +++ b/internal/app/machined/pkg/controllers/kubeaccess/serviceaccount.go @@ -177,6 +177,8 @@ func (ctrl *CRDController) Run(ctx context.Context, r controller.Runtime, logger logger, ) }() + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/kubespan/config.go b/internal/app/machined/pkg/controllers/kubespan/config.go index 289009aeed..8bb63b81d7 100644 --- a/internal/app/machined/pkg/controllers/kubespan/config.go +++ b/internal/app/machined/pkg/controllers/kubespan/config.go @@ -104,5 +104,7 @@ func (ctrl *ConfigController) Run(ctx context.Context, r controller.Runtime, log } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/kubespan/endpoint.go b/internal/app/machined/pkg/controllers/kubespan/endpoint.go index e145a3095f..0fd5ce139e 100644 --- a/internal/app/machined/pkg/controllers/kubespan/endpoint.go +++ b/internal/app/machined/pkg/controllers/kubespan/endpoint.go @@ -133,5 +133,7 @@ func (ctrl *EndpointController) Run(ctx context.Context, r controller.Runtime, l } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/kubespan/identity.go b/internal/app/machined/pkg/controllers/kubespan/identity.go index cd13b027d0..786f6168bf 100644 --- a/internal/app/machined/pkg/controllers/kubespan/identity.go +++ b/internal/app/machined/pkg/controllers/kubespan/identity.go @@ -149,5 +149,7 @@ func (ctrl *IdentityController) Run(ctx context.Context, r controller.Runtime, l } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/kubespan/manager.go b/internal/app/machined/pkg/controllers/kubespan/manager.go index d678a12ef8..ccb569de43 100644 --- a/internal/app/machined/pkg/controllers/kubespan/manager.go +++ b/internal/app/machined/pkg/controllers/kubespan/manager.go @@ -389,6 +389,8 @@ func (ctrl *ManagerController) Run(ctx context.Context, r controller.Runtime, lo if !updateSpecs { // micro-optimization: skip updating specs if there are no changes to the incoming resources and no endpoint changes + r.ResetRestartBackoff() + continue } @@ -500,6 +502,8 @@ func (ctrl *ManagerController) Run(ctx context.Context, r controller.Runtime, lo if err = nfTablesMgr.Update(allowedIPsSet); err != nil { return fmt.Errorf("failed updating nftables: %w", err) } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/kubespan/peer_spec.go b/internal/app/machined/pkg/controllers/kubespan/peer_spec.go index d8711f85ac..cfd6e5bfc0 100644 --- a/internal/app/machined/pkg/controllers/kubespan/peer_spec.go +++ b/internal/app/machined/pkg/controllers/kubespan/peer_spec.go @@ -192,6 +192,8 @@ func (ctrl *PeerSpecController) Run(ctx context.Context, r controller.Runtime, l } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/address_config.go b/internal/app/machined/pkg/controllers/network/address_config.go index f41fda57f3..b302ad7d1a 100644 --- a/internal/app/machined/pkg/controllers/network/address_config.go +++ b/internal/app/machined/pkg/controllers/network/address_config.go @@ -150,6 +150,8 @@ func (ctrl *AddressConfigController) Run(ctx context.Context, r controller.Runti } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/address_event.go b/internal/app/machined/pkg/controllers/network/address_event.go index 39ddf5ee7f..10914366c8 100644 --- a/internal/app/machined/pkg/controllers/network/address_event.go +++ b/internal/app/machined/pkg/controllers/network/address_event.go @@ -110,5 +110,7 @@ func (ctrl *AddressEventController) Run(ctx context.Context, r controller.Runtim Hostname: hostname, Addresses: addresses, }) + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/address_merge.go b/internal/app/machined/pkg/controllers/network/address_merge.go index 3f4918a931..3ca1a52002 100644 --- a/internal/app/machined/pkg/controllers/network/address_merge.go +++ b/internal/app/machined/pkg/controllers/network/address_merge.go @@ -136,5 +136,7 @@ func (ctrl *AddressMergeController) Run(ctx context.Context, r controller.Runtim if conflictsDetected > 0 { return fmt.Errorf("%d conflict(s) detected", conflictsDetected) } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/address_spec.go b/internal/app/machined/pkg/controllers/network/address_spec.go index f1dce5aca1..40c5c4b918 100644 --- a/internal/app/machined/pkg/controllers/network/address_spec.go +++ b/internal/app/machined/pkg/controllers/network/address_spec.go @@ -112,6 +112,8 @@ func (ctrl *AddressSpecController) Run(ctx context.Context, r controller.Runtime return err } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/address_status.go b/internal/app/machined/pkg/controllers/network/address_status.go index 6f90a6318a..fe8562612c 100644 --- a/internal/app/machined/pkg/controllers/network/address_status.go +++ b/internal/app/machined/pkg/controllers/network/address_status.go @@ -142,5 +142,7 @@ func (ctrl *AddressStatusController) Run(ctx context.Context, r controller.Runti return fmt.Errorf("error deleting address status %s: %w", res, err) } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/device_config.go b/internal/app/machined/pkg/controllers/network/device_config.go index 48fc28783b..159b657272 100644 --- a/internal/app/machined/pkg/controllers/network/device_config.go +++ b/internal/app/machined/pkg/controllers/network/device_config.go @@ -151,6 +151,8 @@ func (ctrl *DeviceConfigController) Run(ctx context.Context, r controller.Runtim } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/etcfile.go b/internal/app/machined/pkg/controllers/network/etcfile.go index f71a4833b0..04204982a0 100644 --- a/internal/app/machined/pkg/controllers/network/etcfile.go +++ b/internal/app/machined/pkg/controllers/network/etcfile.go @@ -149,6 +149,8 @@ func (ctrl *EtcFileController) Run(ctx context.Context, r controller.Runtime, lo return fmt.Errorf("error modifying resolv.conf: %w", err) } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/hardware_addr.go b/internal/app/machined/pkg/controllers/network/hardware_addr.go index a1cb6db529..d2ecf280e3 100644 --- a/internal/app/machined/pkg/controllers/network/hardware_addr.go +++ b/internal/app/machined/pkg/controllers/network/hardware_addr.go @@ -102,5 +102,7 @@ func (ctrl *HardwareAddrController) Run(ctx context.Context, r controller.Runtim return fmt.Errorf("error deleting resource %q: %w", id, err) } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/hostname_config.go b/internal/app/machined/pkg/controllers/network/hostname_config.go index 73391c62a7..46b301f11b 100644 --- a/internal/app/machined/pkg/controllers/network/hostname_config.go +++ b/internal/app/machined/pkg/controllers/network/hostname_config.go @@ -170,6 +170,8 @@ func (ctrl *HostnameConfigController) Run(ctx context.Context, r controller.Runt } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/hostname_merge.go b/internal/app/machined/pkg/controllers/network/hostname_merge.go index 3a8aa24e0b..eb849473df 100644 --- a/internal/app/machined/pkg/controllers/network/hostname_merge.go +++ b/internal/app/machined/pkg/controllers/network/hostname_merge.go @@ -118,5 +118,7 @@ func (ctrl *HostnameMergeController) Run(ctx context.Context, r controller.Runti } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/hostname_spec.go b/internal/app/machined/pkg/controllers/network/hostname_spec.go index 56e336c4aa..2054707539 100644 --- a/internal/app/machined/pkg/controllers/network/hostname_spec.go +++ b/internal/app/machined/pkg/controllers/network/hostname_spec.go @@ -116,5 +116,7 @@ func (ctrl *HostnameSpecController) Run(ctx context.Context, r controller.Runtim } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/link_config.go b/internal/app/machined/pkg/controllers/network/link_config.go index 3eb03b2af1..838c9f55cf 100644 --- a/internal/app/machined/pkg/controllers/network/link_config.go +++ b/internal/app/machined/pkg/controllers/network/link_config.go @@ -227,6 +227,8 @@ func (ctrl *LinkConfigController) Run(ctx context.Context, r controller.Runtime, } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/link_merge.go b/internal/app/machined/pkg/controllers/network/link_merge.go index bb54a92b24..14acf120d5 100644 --- a/internal/app/machined/pkg/controllers/network/link_merge.go +++ b/internal/app/machined/pkg/controllers/network/link_merge.go @@ -152,5 +152,7 @@ func (ctrl *LinkMergeController) Run(ctx context.Context, r controller.Runtime, if conflictsDetected > 0 { return fmt.Errorf("%d conflict(s) detected", conflictsDetected) } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/link_spec.go b/internal/app/machined/pkg/controllers/network/link_spec.go index 0e8e927db0..49718b6317 100644 --- a/internal/app/machined/pkg/controllers/network/link_spec.go +++ b/internal/app/machined/pkg/controllers/network/link_spec.go @@ -126,6 +126,8 @@ func (ctrl *LinkSpecController) Run(ctx context.Context, r controller.Runtime, l if err = multiErr.ErrorOrNil(); err != nil { return err } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/link_status.go b/internal/app/machined/pkg/controllers/network/link_status.go index c2be9de1e8..711e757b8b 100644 --- a/internal/app/machined/pkg/controllers/network/link_status.go +++ b/internal/app/machined/pkg/controllers/network/link_status.go @@ -116,6 +116,8 @@ func (ctrl *LinkStatusController) Run(ctx context.Context, r controller.Runtime, if err = ctrl.reconcile(ctx, r, logger, conn, ethClient, ethIoctlClient, wgClient); err != nil { return err } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/node_address.go b/internal/app/machined/pkg/controllers/network/node_address.go index deffbea3ef..4af3420fb1 100644 --- a/internal/app/machined/pkg/controllers/network/node_address.go +++ b/internal/app/machined/pkg/controllers/network/node_address.go @@ -243,6 +243,8 @@ func (ctrl *NodeAddressController) Run(ctx context.Context, r controller.Runtime } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/operator_config.go b/internal/app/machined/pkg/controllers/network/operator_config.go index 2aaba30b39..e71737c117 100644 --- a/internal/app/machined/pkg/controllers/network/operator_config.go +++ b/internal/app/machined/pkg/controllers/network/operator_config.go @@ -290,6 +290,8 @@ func (ctrl *OperatorConfigController) Run(ctx context.Context, r controller.Runt if err = specErrors.ErrorOrNil(); err != nil { return err } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/operator_merge.go b/internal/app/machined/pkg/controllers/network/operator_merge.go index 94cde5a9b3..61bfcd6c7d 100644 --- a/internal/app/machined/pkg/controllers/network/operator_merge.go +++ b/internal/app/machined/pkg/controllers/network/operator_merge.go @@ -136,5 +136,7 @@ func (ctrl *OperatorMergeController) Run(ctx context.Context, r controller.Runti if conflictsDetected > 0 { return fmt.Errorf("%d conflict(s) detected", conflictsDetected) } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/operator_spec.go b/internal/app/machined/pkg/controllers/network/operator_spec.go index e5c1f540a4..984e79538b 100644 --- a/internal/app/machined/pkg/controllers/network/operator_spec.go +++ b/internal/app/machined/pkg/controllers/network/operator_spec.go @@ -178,6 +178,8 @@ func (ctrl *OperatorSpecController) Run(ctx context.Context, r controller.Runtim return err } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/operator_vip_config.go b/internal/app/machined/pkg/controllers/network/operator_vip_config.go index 54f23c76da..693cf6fede 100644 --- a/internal/app/machined/pkg/controllers/network/operator_vip_config.go +++ b/internal/app/machined/pkg/controllers/network/operator_vip_config.go @@ -163,6 +163,8 @@ func (ctrl *OperatorVIPConfigController) Run(ctx context.Context, r controller.R if err = specErrors.ErrorOrNil(); err != nil { return err } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/platform_config.go b/internal/app/machined/pkg/controllers/network/platform_config.go index 8158a7d96a..62d21b8853 100644 --- a/internal/app/machined/pkg/controllers/network/platform_config.go +++ b/internal/app/machined/pkg/controllers/network/platform_config.go @@ -197,6 +197,8 @@ func (ctrl *PlatformConfigController) Run(ctx context.Context, r controller.Runt return err } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/resolver_config.go b/internal/app/machined/pkg/controllers/network/resolver_config.go index 4727e7db7e..e499edf37b 100644 --- a/internal/app/machined/pkg/controllers/network/resolver_config.go +++ b/internal/app/machined/pkg/controllers/network/resolver_config.go @@ -127,6 +127,8 @@ func (ctrl *ResolverConfigController) Run(ctx context.Context, r controller.Runt } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/resolver_merge.go b/internal/app/machined/pkg/controllers/network/resolver_merge.go index 9645b1bc76..7ebb016b80 100644 --- a/internal/app/machined/pkg/controllers/network/resolver_merge.go +++ b/internal/app/machined/pkg/controllers/network/resolver_merge.go @@ -126,5 +126,7 @@ func (ctrl *ResolverMergeController) Run(ctx context.Context, r controller.Runti } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/resolver_spec.go b/internal/app/machined/pkg/controllers/network/resolver_spec.go index 9a82412fe9..33015ea710 100644 --- a/internal/app/machined/pkg/controllers/network/resolver_spec.go +++ b/internal/app/machined/pkg/controllers/network/resolver_spec.go @@ -103,5 +103,7 @@ func (ctrl *ResolverSpecController) Run(ctx context.Context, r controller.Runtim } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/route_config.go b/internal/app/machined/pkg/controllers/network/route_config.go index 367c39608e..c336fcd84a 100644 --- a/internal/app/machined/pkg/controllers/network/route_config.go +++ b/internal/app/machined/pkg/controllers/network/route_config.go @@ -145,6 +145,8 @@ func (ctrl *RouteConfigController) Run(ctx context.Context, r controller.Runtime } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/route_merge.go b/internal/app/machined/pkg/controllers/network/route_merge.go index 69af25f046..faf636df22 100644 --- a/internal/app/machined/pkg/controllers/network/route_merge.go +++ b/internal/app/machined/pkg/controllers/network/route_merge.go @@ -134,5 +134,7 @@ func (ctrl *RouteMergeController) Run(ctx context.Context, r controller.Runtime, if conflictsDetected > 0 { return fmt.Errorf("%d conflict(s) detected", conflictsDetected) } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/route_spec.go b/internal/app/machined/pkg/controllers/network/route_spec.go index 55e6016491..d6d3023664 100644 --- a/internal/app/machined/pkg/controllers/network/route_spec.go +++ b/internal/app/machined/pkg/controllers/network/route_spec.go @@ -115,6 +115,8 @@ func (ctrl *RouteSpecController) Run(ctx context.Context, r controller.Runtime, if err = multiErr.ErrorOrNil(); err != nil { return err } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/route_status.go b/internal/app/machined/pkg/controllers/network/route_status.go index a1fd0efa73..de25efc4bd 100644 --- a/internal/app/machined/pkg/controllers/network/route_status.go +++ b/internal/app/machined/pkg/controllers/network/route_status.go @@ -141,5 +141,7 @@ func (ctrl *RouteStatusController) Run(ctx context.Context, r controller.Runtime return fmt.Errorf("error deleting route status %q: %w", id, err) } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/status.go b/internal/app/machined/pkg/controllers/network/status.go index 61a0f5b4fb..f8567d966c 100644 --- a/internal/app/machined/pkg/controllers/network/status.go +++ b/internal/app/machined/pkg/controllers/network/status.go @@ -136,5 +136,7 @@ func (ctrl *StatusController) Run(ctx context.Context, r controller.Runtime, log }); err != nil { return fmt.Errorf("error modifying output status: %w", err) } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/timeserver_config.go b/internal/app/machined/pkg/controllers/network/timeserver_config.go index f09baa44a1..17215110fc 100644 --- a/internal/app/machined/pkg/controllers/network/timeserver_config.go +++ b/internal/app/machined/pkg/controllers/network/timeserver_config.go @@ -126,6 +126,8 @@ func (ctrl *TimeServerConfigController) Run(ctx context.Context, r controller.Ru } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/timeserver_merge.go b/internal/app/machined/pkg/controllers/network/timeserver_merge.go index 50e5d26220..a9410bdefe 100644 --- a/internal/app/machined/pkg/controllers/network/timeserver_merge.go +++ b/internal/app/machined/pkg/controllers/network/timeserver_merge.go @@ -126,5 +126,7 @@ func (ctrl *TimeServerMergeController) Run(ctx context.Context, r controller.Run } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/network/timeserver_spec.go b/internal/app/machined/pkg/controllers/network/timeserver_spec.go index 6e3b4fe326..c50d656250 100644 --- a/internal/app/machined/pkg/controllers/network/timeserver_spec.go +++ b/internal/app/machined/pkg/controllers/network/timeserver_spec.go @@ -108,5 +108,7 @@ func (ctrl *TimeServerSpecController) Run(ctx context.Context, r controller.Runt } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/perf/perf.go b/internal/app/machined/pkg/controllers/perf/perf.go index 23aed91251..776595bffd 100644 --- a/internal/app/machined/pkg/controllers/perf/perf.go +++ b/internal/app/machined/pkg/controllers/perf/perf.go @@ -77,6 +77,8 @@ func (ctrl *StatsController) Run(ctx context.Context, r controller.Runtime, logg if err := ctrl.updateCPU(ctx, r, &fs); err != nil { return err } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/runtime/kernel_module_config.go b/internal/app/machined/pkg/controllers/runtime/kernel_module_config.go index eb68186e87..a67ffef337 100644 --- a/internal/app/machined/pkg/controllers/runtime/kernel_module_config.go +++ b/internal/app/machined/pkg/controllers/runtime/kernel_module_config.go @@ -101,5 +101,7 @@ func (ctrl *KernelModuleConfigController) Run(ctx context.Context, r controller. } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/runtime/kernel_module_spec.go b/internal/app/machined/pkg/controllers/runtime/kernel_module_spec.go index c605a6a081..908d4fb9a3 100644 --- a/internal/app/machined/pkg/controllers/runtime/kernel_module_spec.go +++ b/internal/app/machined/pkg/controllers/runtime/kernel_module_spec.go @@ -76,5 +76,7 @@ func (ctrl *KernelModuleSpecController) Run(ctx context.Context, r controller.Ru } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/runtime/kernel_param_config.go b/internal/app/machined/pkg/controllers/runtime/kernel_param_config.go index 6a8581eaa9..9d6f535e1d 100644 --- a/internal/app/machined/pkg/controllers/runtime/kernel_param_config.go +++ b/internal/app/machined/pkg/controllers/runtime/kernel_param_config.go @@ -112,5 +112,7 @@ func (ctrl *KernelParamConfigController) Run(ctx context.Context, r controller.R } } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/runtime/kernel_param_spec.go b/internal/app/machined/pkg/controllers/runtime/kernel_param_spec.go index 5fdb4e486d..713020d196 100644 --- a/internal/app/machined/pkg/controllers/runtime/kernel_param_spec.go +++ b/internal/app/machined/pkg/controllers/runtime/kernel_param_spec.go @@ -148,6 +148,8 @@ func (ctrl *KernelParamSpecController) Run(ctx context.Context, r controller.Run return errs } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/runtime/kmsg_log.go b/internal/app/machined/pkg/controllers/runtime/kmsg_log.go index 29f6f832e6..d6107f8ae7 100644 --- a/internal/app/machined/pkg/controllers/runtime/kmsg_log.go +++ b/internal/app/machined/pkg/controllers/runtime/kmsg_log.go @@ -163,6 +163,8 @@ func (ctrl *KmsgLogDeliveryController) Run(ctx context.Context, r controller.Run }); err != nil { return fmt.Errorf("error sending logs: %w", err) } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/runtime/machine_status.go b/internal/app/machined/pkg/controllers/runtime/machine_status.go index 84b01a10ad..42f1e3cd1b 100644 --- a/internal/app/machined/pkg/controllers/runtime/machine_status.go +++ b/internal/app/machined/pkg/controllers/runtime/machine_status.go @@ -151,6 +151,8 @@ func (ctrl *MachineStatusController) Run(ctx context.Context, r controller.Runti }); err != nil { return fmt.Errorf("error updating machine status: %w", err) } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/runtime/machine_status_publisher.go b/internal/app/machined/pkg/controllers/runtime/machine_status_publisher.go index 2135792ec6..4b4f5193db 100644 --- a/internal/app/machined/pkg/controllers/runtime/machine_status_publisher.go +++ b/internal/app/machined/pkg/controllers/runtime/machine_status_publisher.go @@ -78,5 +78,7 @@ func (ctrl *MachineStatusPublisherController) Run(ctx context.Context, r control }), }, }) + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/secrets/api.go b/internal/app/machined/pkg/controllers/secrets/api.go index ef8f18ae55..86e2f29725 100644 --- a/internal/app/machined/pkg/controllers/secrets/api.go +++ b/internal/app/machined/pkg/controllers/secrets/api.go @@ -126,6 +126,8 @@ func (ctrl *APIController) Run(ctx context.Context, r controller.Runtime, logger if err = ctrl.teardownAll(ctx, r); err != nil { return err } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/secrets/api_cert_sans.go b/internal/app/machined/pkg/controllers/secrets/api_cert_sans.go index f3872fe8a9..49ca95e920 100644 --- a/internal/app/machined/pkg/controllers/secrets/api_cert_sans.go +++ b/internal/app/machined/pkg/controllers/secrets/api_cert_sans.go @@ -131,6 +131,8 @@ func (ctrl *APICertSANsController) Run(ctx context.Context, r controller.Runtime }); err != nil { return err } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/secrets/etcd.go b/internal/app/machined/pkg/controllers/secrets/etcd.go index 435cc55d20..00a2ed8c13 100644 --- a/internal/app/machined/pkg/controllers/secrets/etcd.go +++ b/internal/app/machined/pkg/controllers/secrets/etcd.go @@ -165,6 +165,8 @@ func (ctrl *EtcdController) Run(ctx context.Context, r controller.Runtime, logge }); err != nil { return err } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/secrets/kubelet.go b/internal/app/machined/pkg/controllers/secrets/kubelet.go index 962e1f7eed..d01a2d7b35 100644 --- a/internal/app/machined/pkg/controllers/secrets/kubelet.go +++ b/internal/app/machined/pkg/controllers/secrets/kubelet.go @@ -78,6 +78,8 @@ func (ctrl *KubeletController) Run(ctx context.Context, r controller.Runtime, lo }); err != nil { return err } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/secrets/kubernetes.go b/internal/app/machined/pkg/controllers/secrets/kubernetes.go index ca508d6397..7d9962469b 100644 --- a/internal/app/machined/pkg/controllers/secrets/kubernetes.go +++ b/internal/app/machined/pkg/controllers/secrets/kubernetes.go @@ -173,6 +173,8 @@ func (ctrl *KubernetesController) Run(ctx context.Context, r controller.Runtime, }); err != nil { return err } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/secrets/kubernetes_cert_sans.go b/internal/app/machined/pkg/controllers/secrets/kubernetes_cert_sans.go index 7d50e883e4..d2776e3939 100644 --- a/internal/app/machined/pkg/controllers/secrets/kubernetes_cert_sans.go +++ b/internal/app/machined/pkg/controllers/secrets/kubernetes_cert_sans.go @@ -142,6 +142,8 @@ func (ctrl *KubernetesCertSANsController) Run(ctx context.Context, r controller. }); err != nil { return err } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/secrets/root.go b/internal/app/machined/pkg/controllers/secrets/root.go index 308bffd4ff..63d9ee03b6 100644 --- a/internal/app/machined/pkg/controllers/secrets/root.go +++ b/internal/app/machined/pkg/controllers/secrets/root.go @@ -130,6 +130,8 @@ func (ctrl *RootController) Run(ctx context.Context, r controller.Runtime, logge }); err != nil { return err } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/secrets/trustd.go b/internal/app/machined/pkg/controllers/secrets/trustd.go index 19a3e85342..6e27f51059 100644 --- a/internal/app/machined/pkg/controllers/secrets/trustd.go +++ b/internal/app/machined/pkg/controllers/secrets/trustd.go @@ -114,6 +114,8 @@ func (ctrl *TrustdController) Run(ctx context.Context, r controller.Runtime, log return err } } + + r.ResetRestartBackoff() } } diff --git a/internal/app/machined/pkg/controllers/time/sync.go b/internal/app/machined/pkg/controllers/time/sync.go index 5b4c5d7a86..fa9f0294c5 100644 --- a/internal/app/machined/pkg/controllers/time/sync.go +++ b/internal/app/machined/pkg/controllers/time/sync.go @@ -237,5 +237,7 @@ func (ctrl *SyncController) Run(ctx context.Context, r controller.Runtime, logge }); err != nil { return fmt.Errorf("error updating objects: %w", err) //nolint:govet } + + r.ResetRestartBackoff() } } diff --git a/pkg/machinery/go.mod b/pkg/machinery/go.mod index 37d54b591a..b628149d9a 100644 --- a/pkg/machinery/go.mod +++ b/pkg/machinery/go.mod @@ -8,7 +8,7 @@ replace gopkg.in/yaml.v3 => github.com/unix4ever/yaml v0.0.0-20220527175918-f17b require ( github.com/containerd/go-cni v1.1.7 - github.com/cosi-project/runtime v0.2.0 + github.com/cosi-project/runtime v0.3.0-alpha.0 github.com/dustin/go-humanize v1.0.0 github.com/evanphx/json-patch v5.6.0+incompatible github.com/ghodss/yaml v1.0.0 @@ -19,7 +19,7 @@ require ( github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 github.com/siderolabs/crypto v0.4.0 - github.com/siderolabs/gen v0.4.1 + github.com/siderolabs/gen v0.4.2 github.com/siderolabs/go-api-signature v0.2.2 github.com/siderolabs/go-blockdevice v0.4.1 github.com/siderolabs/go-debug v0.2.2 @@ -44,7 +44,7 @@ require ( github.com/gertd/go-pluralize v0.2.1 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/go-cmp v0.5.9 // 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/josharian/native v1.0.0 // indirect github.com/mdlayher/genetlink v1.2.0 // indirect @@ -58,7 +58,7 @@ require ( github.com/sirupsen/logrus v1.7.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect golang.org/x/net v0.2.0 // indirect golang.org/x/sync v0.1.0 // indirect diff --git a/pkg/machinery/go.sum b/pkg/machinery/go.sum index 4ccd1cea99..7300fd9da4 100644 --- a/pkg/machinery/go.sum +++ b/pkg/machinery/go.sum @@ -21,8 +21,8 @@ github.com/containerd/go-cni v1.1.7 h1:1yKpVCQAXI21BJIy8q7Nyk4CWpIgUno6ib7JIDca7 github.com/containerd/go-cni v1.1.7/go.mod h1:Ve4Q0RB2Bw78D90OL0YVyDjqdTL7FKh9W+UPbhWiZXA= github.com/containernetworking/cni v1.1.2 h1:wtRGZVv7olUHMOqouPpn3cXJWpJgM6+EUl31EQbXALQ= github.com/containernetworking/cni v1.1.2/go.mod h1:sDpYKmGVENF3s6uvMvGgldDWeG8dMxakj/u+i9ht9vw= -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/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -57,8 +57,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -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/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -113,8 +113,8 @@ github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkB github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/siderolabs/crypto v0.4.0 h1:o1KIR1KyevUcY9nbJlSyQAj7+p+rveGGF8LjAAFMtjc= github.com/siderolabs/crypto v0.4.0/go.mod h1:itZpBsJ9i0aH8jiHAuSlKCal7hni7X1aDYo6vGVl5LY= -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.1 h1:4vY4B6amYRLhohqJkmVB4FIKJnFy7N21r7Lm3huag9w= @@ -154,8 +154,8 @@ go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0 go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= 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.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= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=