Merge pull request #63980 from detiber/externalEtcdFixes

Automatic merge from submit-queue (batch tested with PRs 63569, 63918, 63980, 63295, 63989). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. kubeadm - fix upgrades with static pod etcd **What this PR does / why we need it**: This PR fixes a regression introduced by https://github.com/kubernetes/kubernetes/pull/63495 which broke kubeadm upgrades for installations using a static pod etcd. **Release note**: ```release-note NONE ```

Merge pull request #63980 from detiber/externalEtcdFixes
53fd0b41 · Kubernetes Submit Queue · GitHub · f105ae3e · c413aefe · 53fd0b41
Unverified Commit 53fd0b41 authored May 18, 2018 by Kubernetes Submit Queue Committed by GitHub May 18, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 10 deletions

apply.go cmd/kubeadm/app/cmd/upgrade/apply.go +2 -4

etcd.go cmd/kubeadm/app/util/etcd/etcd.go +2 -6

No files found.
--- a/cmd/kubeadm/app/cmd/upgrade/apply.go
+++ b/cmd/kubeadm/app/cmd/upgrade/apply.go
@@ -37,7 +37,6 @@ import (
 	"k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient"
 	configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config"
 	dryrunutil "k8s.io/kubernetes/cmd/kubeadm/app/util/dryrun"
-	etcdutil "k8s.io/kubernetes/cmd/kubeadm/app/util/etcd"
 	"k8s.io/kubernetes/pkg/util/version"
 )

@@ -277,9 +276,8 @@ func PerformStaticPodUpgrade(client clientset.Interface, waiter apiclient.Waiter
 		return err
 	}

-	// These are uninitialized because passing in the clients allow for mocking the client during testing
-	var oldEtcdClient, newEtdClient etcdutil.Client
-	return upgrade.StaticPodControlPlane(waiter, pathManager, internalcfg, etcdUpgrade, oldEtcdClient, newEtdClient)
+	// The arguments oldEtcdClient and newEtdClient, are uninitialized because passing in the clients allow for mocking the client during testing
+	return upgrade.StaticPodControlPlane(waiter, pathManager, internalcfg, etcdUpgrade, nil, nil)
 }

 // DryRunStaticPodUpgrade fakes an upgrade of the control plane

--- a/cmd/kubeadm/app/util/etcd/etcd.go
+++ b/cmd/kubeadm/app/util/etcd/etcd.go
@@ -133,14 +133,10 @@ func (c Client) GetVersion() (string, error) {
 		return "", err
 	}
 	for _, v := range versions {
-		if clusterVersion == "" {
-			// This is the first version we've seen
-			clusterVersion = v
-		} else if v != clusterVersion {
+		if clusterVersion != "" && clusterVersion != v {
 			return "", fmt.Errorf("etcd cluster contains endpoints with mismatched versions: %v", versions)
-		} else {
-			clusterVersion = v
 		}
+		clusterVersion = v
 	}
 	if clusterVersion == "" {
 		return "", fmt.Errorf("could not determine cluster etcd version")