Skip to content

fix(etcd): single node etcd cluster access #3149

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
May 2, 2025
Merged

fix(etcd): single node etcd cluster access #3149

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
348de67
[modules][etcd] Fix single node etcd cluster access
3vilhamster May 1, 2025
32fb8ac
add unit test
3vilhamster May 1, 2025
b136a82
adjust test to subtests and fix default configureCMD test
3vilhamster May 1, 2025
8961500
fix CleanupContainer before error handling and simplify closure
3vilhamster May 1, 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
2 changes: 1 addition & 1 deletion modules/etcd/cmd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
func Test_configureCMD(t *testing.T) {
t.Run("default", func(t *testing.T) {
got := configureCMD(options{})
want := []string{"etcd", "--name=default"}
want := []string{"etcd", "--name=default", "--listen-client-urls=http://0.0.0.0:2379", "--advertise-client-urls=http://0.0.0.0:2379"}
require.Equal(t, want, got)
})

Expand Down
5 changes: 4 additions & 1 deletion modules/etcd/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,10 @@ func configureCMD(settings options) []string {
cmds := []string{"etcd"}

if len(settings.nodeNames) == 0 {
cmds = append(cmds, "--name=default")
cmds = append(cmds, "--name=default",
"--listen-client-urls="+scheme+"://0.0.0.0:"+clientPort,
"--advertise-client-urls="+scheme+"://0.0.0.0:"+clientPort,
)
} else {
clusterCmds := []string{
"--name=" + settings.nodeNames[settings.currentNode],
Expand Down
23 changes: 18 additions & 5 deletions modules/etcd/etcd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,23 @@ func TestRun(t *testing.T) {
require.Contains(t, string(output), "default")
}

func TestRun_PutGet(t *testing.T) {
ctx := context.Background()
func TestPutGet(t *testing.T) {
t.Run("single_node", func(t *testing.T) {
ctr, err := etcd.Run(context.Background(), "gcr.io/etcd-development/etcd:v3.5.14")
require.NoError(t, err)
testPutGet(t, ctr)
})
t.Run("multiple_nodes", func(t *testing.T) {
ctr, err := etcd.Run(context.Background(), "gcr.io/etcd-development/etcd:v3.5.14", etcd.WithNodes("etcd-1", "etcd-2", "etcd-3"))
require.NoError(t, err)
testPutGet(t, ctr)
})
}

ctr, err := etcd.Run(ctx, "gcr.io/etcd-development/etcd:v3.5.14", etcd.WithNodes("etcd-1", "etcd-2", "etcd-3"))
func testPutGet(t *testing.T, ctr *etcd.EtcdContainer) {
testcontainers.CleanupContainer(t, ctr)
require.NoError(t, err)

ctx := context.Background()

clientEndpoints, err := ctr.ClientEndpoints(ctx)
require.NoError(t, err)
Expand All @@ -45,7 +56,9 @@ func TestRun_PutGet(t *testing.T) {
DialTimeout: 5 * time.Second,
})
require.NoError(t, err)
defer cli.Close()
defer func(cli *clientv3.Client) {
require.NoError(t, cli.Close())
}(cli)

ctx, cancel := context.WithTimeout(ctx, 2*time.Second)
defer cancel()
Expand Down