Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
81e7858e
Unverified
Commit
81e7858e
authored
Feb 25, 2019
by
Kubernetes Prow Robot
Committed by
GitHub
Feb 25, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #74501 from RA489/fixptrtofunction
Refactor etcd client function have same signatures in etcd.go
parents
3b11f958
a0ee4b47
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
etcd.go
cmd/kubeadm/app/util/etcd/etcd.go
+7
-7
No files found.
cmd/kubeadm/app/util/etcd/etcd.go
View file @
81e7858e
...
@@ -149,7 +149,7 @@ type Member struct {
...
@@ -149,7 +149,7 @@ type Member struct {
}
}
// GetMemberID returns the member ID of the given peer URL
// GetMemberID returns the member ID of the given peer URL
func
(
c
Client
)
GetMemberID
(
peerURL
string
)
(
uint64
,
error
)
{
func
(
c
*
Client
)
GetMemberID
(
peerURL
string
)
(
uint64
,
error
)
{
cli
,
err
:=
clientv3
.
New
(
clientv3
.
Config
{
cli
,
err
:=
clientv3
.
New
(
clientv3
.
Config
{
Endpoints
:
c
.
Endpoints
,
Endpoints
:
c
.
Endpoints
,
DialTimeout
:
30
*
time
.
Second
,
DialTimeout
:
30
*
time
.
Second
,
...
@@ -176,7 +176,7 @@ func (c Client) GetMemberID(peerURL string) (uint64, error) {
...
@@ -176,7 +176,7 @@ func (c Client) GetMemberID(peerURL string) (uint64, error) {
}
}
// RemoveMember notifies an etcd cluster to remove an existing member
// RemoveMember notifies an etcd cluster to remove an existing member
func
(
c
Client
)
RemoveMember
(
id
uint64
)
([]
Member
,
error
)
{
func
(
c
*
Client
)
RemoveMember
(
id
uint64
)
([]
Member
,
error
)
{
cli
,
err
:=
clientv3
.
New
(
clientv3
.
Config
{
cli
,
err
:=
clientv3
.
New
(
clientv3
.
Config
{
Endpoints
:
c
.
Endpoints
,
Endpoints
:
c
.
Endpoints
,
DialTimeout
:
30
*
time
.
Second
,
DialTimeout
:
30
*
time
.
Second
,
...
@@ -251,7 +251,7 @@ func (c *Client) AddMember(name string, peerAddrs string) ([]Member, error) {
...
@@ -251,7 +251,7 @@ func (c *Client) AddMember(name string, peerAddrs string) ([]Member, error) {
// GetVersion returns the etcd version of the cluster.
// GetVersion returns the etcd version of the cluster.
// An error is returned if the version of all endpoints do not match
// An error is returned if the version of all endpoints do not match
func
(
c
Client
)
GetVersion
()
(
string
,
error
)
{
func
(
c
*
Client
)
GetVersion
()
(
string
,
error
)
{
var
clusterVersion
string
var
clusterVersion
string
versions
,
err
:=
c
.
GetClusterVersions
()
versions
,
err
:=
c
.
GetClusterVersions
()
...
@@ -271,7 +271,7 @@ func (c Client) GetVersion() (string, error) {
...
@@ -271,7 +271,7 @@ func (c Client) GetVersion() (string, error) {
}
}
// GetClusterVersions returns a map of the endpoints and their associated versions
// GetClusterVersions returns a map of the endpoints and their associated versions
func
(
c
Client
)
GetClusterVersions
()
(
map
[
string
]
string
,
error
)
{
func
(
c
*
Client
)
GetClusterVersions
()
(
map
[
string
]
string
,
error
)
{
versions
:=
make
(
map
[
string
]
string
)
versions
:=
make
(
map
[
string
]
string
)
statuses
,
err
:=
c
.
GetClusterStatus
()
statuses
,
err
:=
c
.
GetClusterStatus
()
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -285,7 +285,7 @@ func (c Client) GetClusterVersions() (map[string]string, error) {
...
@@ -285,7 +285,7 @@ func (c Client) GetClusterVersions() (map[string]string, error) {
}
}
// ClusterAvailable returns true if the cluster status indicates the cluster is available.
// ClusterAvailable returns true if the cluster status indicates the cluster is available.
func
(
c
Client
)
ClusterAvailable
()
(
bool
,
error
)
{
func
(
c
*
Client
)
ClusterAvailable
()
(
bool
,
error
)
{
_
,
err
:=
c
.
GetClusterStatus
()
_
,
err
:=
c
.
GetClusterStatus
()
if
err
!=
nil
{
if
err
!=
nil
{
return
false
,
err
return
false
,
err
...
@@ -294,7 +294,7 @@ func (c Client) ClusterAvailable() (bool, error) {
...
@@ -294,7 +294,7 @@ func (c Client) ClusterAvailable() (bool, error) {
}
}
// GetClusterStatus returns nil for status Up or error for status Down
// GetClusterStatus returns nil for status Up or error for status Down
func
(
c
Client
)
GetClusterStatus
()
(
map
[
string
]
*
clientv3
.
StatusResponse
,
error
)
{
func
(
c
*
Client
)
GetClusterStatus
()
(
map
[
string
]
*
clientv3
.
StatusResponse
,
error
)
{
cli
,
err
:=
clientv3
.
New
(
clientv3
.
Config
{
cli
,
err
:=
clientv3
.
New
(
clientv3
.
Config
{
Endpoints
:
c
.
Endpoints
,
Endpoints
:
c
.
Endpoints
,
DialTimeout
:
5
*
time
.
Second
,
DialTimeout
:
5
*
time
.
Second
,
...
@@ -319,7 +319,7 @@ func (c Client) GetClusterStatus() (map[string]*clientv3.StatusResponse, error)
...
@@ -319,7 +319,7 @@ func (c Client) GetClusterStatus() (map[string]*clientv3.StatusResponse, error)
}
}
// WaitForClusterAvailable returns true if all endpoints in the cluster are available after retry attempts, an error is returned otherwise
// WaitForClusterAvailable returns true if all endpoints in the cluster are available after retry attempts, an error is returned otherwise
func
(
c
Client
)
WaitForClusterAvailable
(
retries
int
,
retryInterval
time
.
Duration
)
(
bool
,
error
)
{
func
(
c
*
Client
)
WaitForClusterAvailable
(
retries
int
,
retryInterval
time
.
Duration
)
(
bool
,
error
)
{
for
i
:=
0
;
i
<
retries
;
i
++
{
for
i
:=
0
;
i
<
retries
;
i
++
{
if
i
>
0
{
if
i
>
0
{
fmt
.
Printf
(
"[util/etcd] Waiting %v until next retry
\n
"
,
retryInterval
)
fmt
.
Printf
(
"[util/etcd] Waiting %v until next retry
\n
"
,
retryInterval
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment