Skip to content

Replace endpoint.ParseHostPort with net.SplitHostPort to fix IPv6 client endpoints#11211

Merged
jpbetz merged 1 commit intoetcd-io:masterfrom
jpbetz:ipv6-endpoints
Oct 8, 2019
Merged

Replace endpoint.ParseHostPort with net.SplitHostPort to fix IPv6 client endpoints#11211
jpbetz merged 1 commit intoetcd-io:masterfrom
jpbetz:ipv6-endpoints

Conversation

@jpbetz
Copy link
Copy Markdown
Contributor

@jpbetz jpbetz commented Oct 8, 2019 •
edited
Loading

Fixes kubernetes/kubernetes#83550

Manually verified fix:

etcd --listen-client-urls="https://[::1]:2379" --advertise-client-urls="https://[::1]:2379" --cert-file=integration/fixtures/server-ipv6.crt --key-file=integration/fixtures/server-ipv6.key.insecure

etcdctl --cacert ~/projects/etcd-io/src/go.etcd.io/etcd/integration/fixtures/server-ipv6.crt --endpoints="https://[::1]:2379" get / --write-out json
{"header":{"cluster_id":14841639068965178418,"member_id":10276657743932975437,"revision":1,"raft_term":5}}

We need a automated test for this too. Since we don't have any IPv6 tests in etcd, we need to enable that test carefully, since it would fail in environments without IPv6 enabled. We will do that as a follow up PR.

Regenerated all the test certs after adding one with an IPv6 IP for the manual test. We'll keep the cert around for when we add the automated test.

cc @liggitt @gyuho @jingyih @wenjiaswe @YoyinZyc @hangxie

@jpbetz jpbetz self-assigned this Oct 8, 2019
@jpbetz jpbetz added the type/bug label Oct 8, 2019
@jpbetz jpbetz added this to the etcd-v3.5 milestone Oct 8, 2019
@neolit123
Copy link
Copy Markdown

neolit123 commented Oct 8, 2019

LGTM, thanks for the quick fix.

gyuho
gyuho approved these changes Oct 8, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@gyuho gyuho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, thanks for the quick fix

@neolit123
Copy link
Copy Markdown

neolit123 commented Oct 8, 2019

given kubernetes/kubernetes is at 3.3.15 would it be possible to also backport for 3.3?

@wenjiaswe
Copy link
Copy Markdown
Contributor

wenjiaswe commented Oct 8, 2019

lgtm, thanks Joe! +1 on backporting to 3.3, ref: kubernetes/kubernetes#83209 (comment)

liggitt
liggitt reviewed Oct 8, 2019
View reviewed changes
Comment thread clientv3/client.go
@jpbetz jpbetz merged commit 6aae903 into etcd-io:master Oct 8, 2019
This was referenced Oct 8, 2019
Merged
Merged
jpbetz added a commit that referenced this pull request Oct 9, 2019
@jpbetz
Merge pull request #11216 from jpbetz/automated-cherry-pick-of-#11211…
7558b41 
…-origin-release-3.3

Automated cherry pick of #11211
jpbetz added a commit that referenced this pull request Oct 9, 2019
@jpbetz
Merge pull request #11213 from jpbetz/automated-cherry-pick-of-#11211…
03b5e72 
…-origin-release-3.4

Automated cherry pick of #11211
This was referenced Oct 10, 2019
Closed
Merged
Merged
@hexfusion hexfusion mentioned this pull request Oct 23, 2019
Merged
@jingyih jingyih mentioned this pull request Nov 13, 2019
Merged
@hexfusion hexfusion mentioned this pull request Nov 13, 2019
Merged
spzala added a commit to spzala/etcd that referenced this pull request Dec 2, 2019
@spzala
CHANGELOG: add missing changelogs
54edc8d 
related etcd-io#11184 etcd-io#11211 etcd-io#11354
@spzala spzala mentioned this pull request Dec 2, 2019
Merged
spzala added a commit to spzala/etcd that referenced this pull request Dec 2, 2019
@spzala
CHANGELOG: add missing changelogs
a45b997 
related etcd-io#11184 etcd-io#11211 etcd-io#11354
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@liggitt liggitt liggitt left review comments

@gyuho gyuho gyuho approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@jpbetz jpbetz

Labels

backport/v3.4 type/bug

Milestone

etcd-v3.5

Development

Successfully merging this pull request may close these issues.

1.16: etcd client does not parse IPv6 addresses correctly when members are joining

5 participants

@jpbetz @neolit123 @wenjiaswe @liggitt @gyuho