UPSTREAM<carry>: etcdctl: fix move-leader for multiple endpoints

[tjungblu]

Due to a duplicate call of clientConfigFromCmd, the move-leader command would fail with "conflicting environment variable is shadowed by corresponding command-line flag". Also in scenarios where no command-line flag was supplied.

Signed-off-by: Thomas Jungblut tjungblu@redhat.com

---

4.8 backport of #146 originally in etcd-io#14441

[openshift-ci]

@tjungblu: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

UPSTREAM: etcdctl: fix move-leader for multiple endpoints

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: tjungblu
Once this PR has been reviewed and has the lgtm label, please assign dusk125 for approval by writing /assign @dusk125 in a comment. For more information see:The Kubernetes Code Review Process.

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

Needs approval from an approver in each of these files:

• OWNERS

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

[tjungblu]

confirmed it working on 4.8 with cluster bot too:

sh-4.4# etcdctl member list
94d75701cc4f18b5, started, ci-ln-f4jpnyt-72292-d99vj-master-0, https://10.0.0.4:2380, https://10.0.0.4:2379, false
de78b5a856ac0e99, started, ci-ln-f4jpnyt-72292-d99vj-master-1, https://10.0.0.5:2380, https://10.0.0.5:2379, false
e7084adbccd7a077, started, ci-ln-f4jpnyt-72292-d99vj-master-2, https://10.0.0.3:2380, https://10.0.0.3:2379, false
sh-4.4# etcdctl move-leader de78b5a856ac0e99
Leadership transferred from de78b5a856ac0e99 to de78b5a856ac0e99

[tjungblu]

/retest-required

[tjungblu]

this is confirmed for 3.4.21, so will leave the carry out for the proper rebase in https://issues.redhat.com/browse/OCPBUGS-1023

[openshift-ci]

@tjungblu: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/unit	7c81485	link	true	/test unit
ci/prow/e2e-aws-upgrade	7c81485	link	true	/test e2e-aws-upgrade

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[tjungblu]

closing this carry for the imminent rebase of 3.4.21