✨ etcd: Etcd client with dialer passthrough. #2031

randomvariable · 2020-01-09T13:44:58Z

What this PR does / why we need it:
Allows user to contact etcd with arbitrary connection types, useful
when proxying through the Kubernetes API server.

Protobuf types are wrapped such that downstream consumers do not
need to import etcd packages.

Signed-off-by: Naadir Jeewa jeewan@vmware.com

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Part of #1902

randomvariable · 2020-01-09T14:42:09Z

@dlipovetsky

chuckha

some architecture concerns and some copy pasta clean ups

util/etcd/etcd.go

chuckha

Everything in this review is a nit. Feel free to fix or not. Looks great!

/approve

util/etcd/etcd.go

dlipovetsky · 2020-01-10T18:33:06Z

Thanks a lot for creating this client!

/approve

k8s-ci-robot · 2020-01-10T18:33:29Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chuckha, dlipovetsky, randomvariable

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [chuckha]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

dlipovetsky · 2020-01-10T18:37:34Z

Out of curiosity: Why create an ephemeral etcd client in each function, as opposed to creating a long-lived etcd client?

randomvariable · 2020-01-13T13:31:51Z

May need to refresh the connection as API servers move around, but it makes more sense for that to be a consumer-level concern, so have switched to long-lived.

randomvariable · 2020-01-13T14:00:27Z

/retest

vincepri · 2020-01-13T15:44:20Z

Reviewing this now

vincepri

Overall this is a great effort. I've left some comments regarding some consistency around the godoc lines (mostly nits), and some others regarding the logic during backoff.

Thank you for putting this together!

util/etcd/etcd.go

randomvariable · 2020-01-13T17:31:08Z

/test pull-cluster-api-verify

controlplane/kubeadm/internal/etcd/etcd.go

Allows user to contact etcd with arbitrary connection types, useful when proxying through the Kubernetes API server. Protobuf types are wrapped such that downstream consumers do not need to import etcd packages. Signed-off-by: Naadir Jeewa <jeewan@vmware.com>

randomvariable · 2020-01-14T14:48:46Z

Rebased on master.

vincepri

/lgtm

/hold
@ncdc feel free to remove the hold when you're ready

ncdc · 2020-01-15T17:36:44Z

controlplane/kubeadm/internal/etcd/etcd.go

+			if c.MemberID == newMember.ID {
+				newMember.Alarms = append(newMember.Alarms, c.Type)
+			}
+			members[i] = newMember


Don't you want this outside of the alarms loop?

ncdc · 2020-01-15T17:45:06Z

controlplane/kubeadm/internal/etcd/etcd.go

+}
+
+// UpdateMemberPeerList updates the given member's list of peers.
+func (c *Client) UpdateMemberPeerList(id uint64, peerURLs []string) (*[]Member, error) {


You want to return a pointer to a slice, not a slice of pointers?

ncdc · 2020-01-15T17:45:14Z

controlplane/kubeadm/internal/etcd/etcd.go

+}
+
+// Members retrieves a list of etcd members.
+func (c *Client) Members() (*[]Member, error) {


You want to return a pointer to a slice, not a slice of pointers?

ncdc · 2020-01-15T17:45:35Z

controlplane/kubeadm/internal/etcd/etcd.go

+}
+
+// Alarms retrieves all alarms on a cluster.
+func (c *Client) Alarms() (*[]MemberAlarm, error) {


You want to return a pointer to a slice, not a slice of pointers?

ncdc · 2020-01-15T17:47:09Z

controlplane/kubeadm/internal/etcd/etcd.go

+// BackoffParams sets the parameters for the client
+func BackoffParams(params wait.Backoff) func(*Client) error {
+	return func(c *Client) error {
+		return c.setBackoffParams(params)


I'm not sure I would have split this out into a separate function, but it's fine to keep it this way if you want.

ncdc · 2020-01-15T17:47:13Z

controlplane/kubeadm/internal/etcd/etcd.go

+// Endpoint changes the etcd endpoint for the client
+func Endpoint(addr string) func(*Client) error {
+	return func(c *Client) error {
+		return c.setEndpoint(addr)


I'm not sure I would have split this out into a separate function, but it's fine to keep it this way if you want.

ncdc · 2020-01-15T17:47:18Z

controlplane/kubeadm/internal/etcd/etcd.go

+// Timeout changes the method timeout for the etcd client
+func Timeout(duration time.Duration) func(*Client) error {
+	return func(c *Client) error {
+		return c.setTimeout(duration)


I'm not sure I would have split this out into a separate function, but it's fine to keep it this way if you want.

randomvariable · 2020-01-17T12:47:27Z

Doing revisions whilst working on consumption of the package. Temporarily closing.

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 9, 2020

k8s-ci-robot requested review from chuckha and vincepri January 9, 2020 13:46

randomvariable force-pushed the etcd-client branch 4 times, most recently from d9ce606 to d1fe78d Compare January 9, 2020 14:39

randomvariable force-pushed the etcd-client branch from d1fe78d to 1f3f3ad Compare January 9, 2020 14:44

chuckha reviewed Jan 9, 2020

View reviewed changes

randomvariable force-pushed the etcd-client branch 2 times, most recently from 70a1384 to f4cd6c0 Compare January 9, 2020 15:43

chuckha approved these changes Jan 9, 2020

View reviewed changes

util/etcd/etcd.go Outdated Show resolved Hide resolved

util/etcd/etcd.go Outdated Show resolved Hide resolved

util/etcd/etcd.go Outdated Show resolved Hide resolved

util/etcd/etcd.go Outdated Show resolved Hide resolved

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 9, 2020

ncdc reviewed Jan 10, 2020

View reviewed changes

util/etcd/etcd.go Outdated Show resolved Hide resolved

util/etcd/etcd.go Outdated Show resolved Hide resolved

util/etcd/etcd.go Outdated Show resolved Hide resolved

randomvariable force-pushed the etcd-client branch 3 times, most recently from 80f64c8 to 74957ed Compare January 13, 2020 13:30

randomvariable force-pushed the etcd-client branch from 74957ed to 7c32267 Compare January 13, 2020 14:31

vincepri reviewed Jan 13, 2020

View reviewed changes

randomvariable force-pushed the etcd-client branch 3 times, most recently from f9480df to bcb1e6b Compare January 13, 2020 16:57

randomvariable force-pushed the etcd-client branch 2 times, most recently from 0490393 to 4ad1568 Compare January 13, 2020 17:08

randomvariable force-pushed the etcd-client branch from 4ad1568 to e5b2b78 Compare January 13, 2020 17:47

vincepri reviewed Jan 13, 2020

View reviewed changes

randomvariable force-pushed the etcd-client branch from 70f95ac to bf5f646 Compare January 13, 2020 18:31

randomvariable force-pushed the etcd-client branch from bf5f646 to 9add495 Compare January 14, 2020 14:42

vincepri approved these changes Jan 14, 2020

View reviewed changes

k8s-ci-robot assigned vincepri Jan 14, 2020

k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Jan 14, 2020

ncdc reviewed Jan 15, 2020

View reviewed changes

ncdc added this to the v0.3.0 milestone Jan 16, 2020

randomvariable closed this Jan 17, 2020

dlipovetsky mentioned this pull request Jan 29, 2020

✨ KubeadmControlPlane scale up serially #2193

Closed

randomvariable mentioned this pull request Jan 29, 2020

Control plane healthchecks #1902

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

✨ etcd: Etcd client with dialer passthrough. #2031

✨ etcd: Etcd client with dialer passthrough. #2031

randomvariable commented Jan 9, 2020

randomvariable commented Jan 9, 2020

chuckha left a comment

chuckha left a comment

dlipovetsky commented Jan 10, 2020

k8s-ci-robot commented Jan 10, 2020

dlipovetsky commented Jan 10, 2020

randomvariable commented Jan 13, 2020

randomvariable commented Jan 13, 2020

vincepri commented Jan 13, 2020

vincepri left a comment

randomvariable commented Jan 13, 2020

randomvariable commented Jan 14, 2020

vincepri left a comment

ncdc Jan 15, 2020

ncdc Jan 15, 2020

ncdc Jan 15, 2020

ncdc Jan 15, 2020

ncdc Jan 15, 2020

ncdc Jan 15, 2020

ncdc Jan 15, 2020

randomvariable commented Jan 17, 2020

✨ etcd: Etcd client with dialer passthrough. #2031

✨ etcd: Etcd client with dialer passthrough. #2031

Conversation

randomvariable commented Jan 9, 2020

randomvariable commented Jan 9, 2020

chuckha left a comment

Choose a reason for hiding this comment

chuckha left a comment

Choose a reason for hiding this comment

dlipovetsky commented Jan 10, 2020

k8s-ci-robot commented Jan 10, 2020

dlipovetsky commented Jan 10, 2020

randomvariable commented Jan 13, 2020

randomvariable commented Jan 13, 2020

vincepri commented Jan 13, 2020

vincepri left a comment

Choose a reason for hiding this comment

randomvariable commented Jan 13, 2020

randomvariable commented Jan 14, 2020

vincepri left a comment

Choose a reason for hiding this comment

ncdc Jan 15, 2020

Choose a reason for hiding this comment

ncdc Jan 15, 2020

Choose a reason for hiding this comment

ncdc Jan 15, 2020

Choose a reason for hiding this comment

ncdc Jan 15, 2020

Choose a reason for hiding this comment

ncdc Jan 15, 2020

Choose a reason for hiding this comment

ncdc Jan 15, 2020

Choose a reason for hiding this comment

ncdc Jan 15, 2020

Choose a reason for hiding this comment

randomvariable commented Jan 17, 2020