Skip to content

Bugs: wrong address and memory leak #285

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
merged 4 commits into from
Apr 22, 2025
Merged

Bugs: wrong address and memory leak #285

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0716ee0
Bugs: wrong address and memory leak
lllamnyp Apr 18, 2025
0100a75
Create TLS-capable clients if security enabled
lllamnyp Apr 18, 2025
92c9f35
Create TLS-capable clients if security enabled (#286)
lllamnyp Apr 18, 2025
d76c473
Satisfy the linter
lllamnyp Apr 21, 2025
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
10 changes: 10 additions & 0 deletions internal/controller/etcdcluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,16 @@ func (r *EtcdClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request)
if err != nil {
return ctrl.Result{}, err
}
defer func() {
if clusterClient != nil {
clusterClient.Close()
}
for i := range singleClients {
if singleClients[i] != nil {
singleClients[i].Close()
}
}
}()
state.endpointsFound = clusterClient != nil && singleClients != nil

if !state.endpointsFound {
Expand Down
3 changes: 2 additions & 1 deletion internal/controller/factory/etcd_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ func NewEtcdClientSet(ctx context.Context, cluster *v1alpha1.EtcdCluster, cli cl
cfg.Endpoints = []string{ep}
singleClients[i], err = clientv3.New(cfg)
if err != nil {
clusterClient.Close()
return nil, nil, fmt.Errorf("error building etcd single-endpoint client for endpoint %s: %w", ep, err)
}
}
Expand Down Expand Up @@ -56,7 +57,7 @@ func configFromCluster(ctx context.Context, cluster *v1alpha1.EtcdCluster, cli c
}
}
for name := range names {
urls = append(urls, fmt.Sprintf("%s:%s", name, "2379"))
urls = append(urls, fmt.Sprintf("%s.%s.%s:%s", name, ep.Name, ep.Namespace, "2379"))
}

return clientv3.Config{Endpoints: urls}, nil
Expand Down
Loading