Merge pull request #53229 from pipejakob/kubeadm-upgrade-grammar

Automatic merge from submit-queue (batch tested with PRs 49705, 53229). 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>. Fix kubeadm upgrade grammar. **What this PR does / why we need it**: I noticed an erroneous word in the output from the kubeadm upgrade docs. This error message currently reads: "Note: Before you **do** can perform this upgrade, you have to update kubeadm to..." **Release note**: ```release-note NONE ``` CC @kubernetes/sig-cluster-lifecycle-pr-reviews

Merge pull request #53229 from pipejakob/kubeadm-upgrade-grammar
628df56b · Kubernetes Submit Queue · GitHub · bb035a28 · 5d9e492f · 628df56b
Commit 628df56b authored Sep 29, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 29, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

plan.go cmd/kubeadm/app/cmd/upgrade/plan.go +1 -1

plan_test.go cmd/kubeadm/app/cmd/upgrade/plan_test.go +4 -4

No files found.
--- a/cmd/kubeadm/app/cmd/upgrade/plan.go
+++ b/cmd/kubeadm/app/cmd/upgrade/plan.go
@@ -122,7 +122,7 @@ func printAvailableUpgrades(upgrades []upgrade.Upgrade, w io.Writer) {
 		fmt.Fprintln(w, "")
 		if upgrade.Before.KubeadmVersion != upgrade.After.KubeadmVersion {
-			fmt.Fprintf(w, "Note: Before you do can perform this upgrade, you have to update kubeadm to %s\n", upgrade.After.KubeadmVersion)
+			fmt.Fprintf(w, "Note: Before you can perform this upgrade, you have to update kubeadm to %s\n", upgrade.After.KubeadmVersion)
 			fmt.Fprintln(w, "")
 		}

--- a/cmd/kubeadm/app/cmd/upgrade/plan_test.go
+++ b/cmd/kubeadm/app/cmd/upgrade/plan_test.go
@@ -106,7 +106,7 @@ You can now apply the upgrade by executing the following command:
 	kubeadm upgrade apply v1.7.3
-Note: Before you do can perform this upgrade, you have to update kubeadm to v1.7.3
+Note: Before you can perform this upgrade, you have to update kubeadm to v1.7.3
 _____________________________________________________________________
@@ -223,7 +223,7 @@ You can now apply the upgrade by executing the following command:
 	kubeadm upgrade apply v1.8.2
-Note: Before you do can perform this upgrade, you have to update kubeadm to v1.8.2
+Note: Before you can perform this upgrade, you have to update kubeadm to v1.8.2
 _____________________________________________________________________
@@ -265,7 +265,7 @@ You can now apply the upgrade by executing the following command:
 	kubeadm upgrade apply v1.8.0-beta.1
-Note: Before you do can perform this upgrade, you have to update kubeadm to v1.8.0-beta.1
+Note: Before you can perform this upgrade, you have to update kubeadm to v1.8.0-beta.1
 _____________________________________________________________________
@@ -307,7 +307,7 @@ You can now apply the upgrade by executing the following command:
 	kubeadm upgrade apply v1.8.0-rc.1
-Note: Before you do can perform this upgrade, you have to update kubeadm to v1.8.0-rc.1
+Note: Before you can perform this upgrade, you have to update kubeadm to v1.8.0-rc.1
 _____________________________________________________________________