Skip to content

fix: etcd client leak in the (legacy) Upgrade API #13508

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
talos-bot merged 1 commit into from
Jun 3, 2026
+5 −1
Merged

fix: etcd client leak in the (legacy) Upgrade API #13508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion internal/app/machined/internal/server/v1alpha1/v1alpha1_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,12 +531,14 @@ func (s *Server) Upgrade(ctx context.Context, in *machine.UpgradeRequest) (*mach
return nil, fmt.Errorf("error validating installer image %q: %w", in.GetImage(), err)
}

if !inMaintenance && s.Controller.Runtime().Config().Machine().Type() != machinetype.TypeWorker && !in.GetForce() {
if !inMaintenance && s.Controller.Runtime().Config().Machine().Type() != machinetype.TypeWorker && !in.GetForce() && !in.GetPreserve() {
etcdClient, err := etcd.NewClientFromControlPlaneIPs(ctx, s.Controller.Runtime().State().V1Alpha2().Resources())
if err != nil {
return nil, fmt.Errorf("failed to create etcd client: %w", err)
}

defer etcdClient.Close() //nolint:errcheck

// acquire the upgrade mutex
unlocker, err := tryLockUpgradeMutex(ctx, etcdClient)
if err != nil {
Expand Down
2 changes: 2 additions & 0 deletions internal/pkg/etcd/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ func validateMemberHealth(ctx context.Context, memberURIs []string) (err error)
return fmt.Errorf("failed to create client to member: %w", err)
}

defer c.Close() //nolint:errcheck

return c.ValidateQuorum(ctx)
}

Expand Down