Skip to content
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

Jump to bottom

Add embedded etcd support #1770

Merged
merged 7 commits into from
Jun 7, 2020
Merged

Add embedded etcd support #1770

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7e59c08
Make program name a variable to be changed at compile time
ibuildthecloud May 5, 2020
4317a91
Delete dqlite
ibuildthecloud May 5, 2020
a18d387
Refactor clustered DB framework
ibuildthecloud May 5, 2020
3957142
Generate etcd certificates
ibuildthecloud May 5, 2020
6b5b693
Add embedded etcd support
ibuildthecloud May 5, 2020
c580a8b
Add heartbeat interval and election timeout
galal-hussein May 27, 2020
f4ff2bf
Update vendor
ibuildthecloud May 7, 2020
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: 2 additions & 0 deletions pkg/daemons/executor/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ type ETCDConfig struct {
ServerTrust ServerTrust `json:"client-transport-security"`
PeerTrust PeerTrust `json:"peer-transport-security"`
ForceNewCluster bool `json:"force-new-cluster,omitempty"`
HeartbeatInterval int `json:"heartbeat-interval"`
ElectionTimeout int `json:"election-timeout"`
}

type ServerTrust struct {
Expand Down
2 changes: 2 additions & 0 deletions pkg/etcd/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,8 @@ func (e *ETCD) cluster(ctx context.Context, forceNew bool, options executor.Init
ClientCertAuth: true,
TrustedCAFile: e.config.Runtime.ETCDPeerCA,
},
ElectionTimeout: 5000,
Copy link
Contributor

Choose a reason for hiding this comment

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

adjuste to customizable parameters?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll address the customization of etcd in a follow up PR. We will probably need to do an approach where you can specific the etcd conf file and we merge it, similar to containerd config. There's to many params to add to the CLI to address everything.

HeartbeatInterval: 500,
})
}

Expand Down