Fix kubeadm typos

NathanBaulch · NathanBaulch · commit ad7cb45bb24a · 2024-09-03T13:07:55.000+10:00
diff --git a/cmd/kubeadm/app/apis/kubeadm/types.go b/cmd/kubeadm/app/apis/kubeadm/types.go
@@ -338,7 +338,7 @@ type JoinConfiguration struct {
 	NodeRegistration NodeRegistrationOptions
 
 	// CACertPath is the path to the SSL certificate authority used to
-	// secure comunications between node and control-plane.
+	// secure communications between node and control-plane.
 	// Defaults to "/etc/kubernetes/pki/ca.crt".
 	CACertPath string
 
diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta3/types.go b/cmd/kubeadm/app/apis/kubeadm/v1beta3/types.go
@@ -322,7 +322,7 @@ type JoinConfiguration struct {
 	NodeRegistration NodeRegistrationOptions `json:"nodeRegistration,omitempty"`
 
 	// CACertPath is the path to the SSL certificate authority used to
-	// secure comunications between node and control-plane.
+	// secure communications between node and control-plane.
 	// Defaults to "/etc/kubernetes/pki/ca.crt".
 	// +optional
 	CACertPath string `json:"caCertPath,omitempty"`
diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta4/conversion.go b/cmd/kubeadm/app/apis/kubeadm/v1beta4/conversion.go
@@ -63,7 +63,7 @@ func Convert_v1beta4_JoinConfiguration_To_kubeadm_JoinConfiguration(in *JoinConf
 	return err
 }
 
-// Convert_kubeadm_JoinConfiguration_To_v1beta4_JoinConfiguration converts a private JoinConfinguration to a public JoinCOnfiguration.
+// Convert_kubeadm_JoinConfiguration_To_v1beta4_JoinConfiguration converts a private JoinConfiguration to a public JoinConfiguration.
 func Convert_kubeadm_JoinConfiguration_To_v1beta4_JoinConfiguration(in *kubeadm.JoinConfiguration, out *JoinConfiguration, s conversion.Scope) error {
 	err := autoConvert_kubeadm_JoinConfiguration_To_v1beta4_JoinConfiguration(in, out, s)
 	timeoutControlPlane := kubeadm.GetConversionTimeoutControlPlane() // Remove with v1beta3.
diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta4/types.go b/cmd/kubeadm/app/apis/kubeadm/v1beta4/types.go
@@ -371,7 +371,7 @@ type JoinConfiguration struct {
 	NodeRegistration NodeRegistrationOptions `json:"nodeRegistration,omitempty"`
 
 	// CACertPath is the path to the SSL certificate authority used to
-	// secure comunications between node and control-plane.
+	// secure communications between node and control-plane.
 	// Defaults to "/etc/kubernetes/pki/ca.crt".
 	// +optional
 	CACertPath string `json:"caCertPath,omitempty"`
diff --git a/cmd/kubeadm/app/apis/kubeadm/validation/validation_test.go b/cmd/kubeadm/app/apis/kubeadm/validation/validation_test.go
@@ -1067,7 +1067,7 @@ func TestValidateSocketPath(t *testing.T) {
 		{name: "valid socket URL", criSocket: kubeadmapiv1.DefaultContainerRuntimeURLScheme + "://" + "/some/path", expectedErrors: false},
 		{name: "unsupported URL scheme", criSocket: "bla:///some/path", expectedErrors: true},
 		{name: "missing URL scheme", criSocket: "/some/path", expectedErrors: true},
-		{name: "unparseable URL", criSocket: ":::", expectedErrors: true},
+		{name: "unparsable URL", criSocket: ":::", expectedErrors: true},
 		{name: "empty CRISocket", criSocket: "", expectedErrors: true},
 	}
 	for _, tc := range tests {
diff --git a/cmd/kubeadm/app/cmd/config.go b/cmd/kubeadm/app/cmd/config.go
@@ -59,7 +59,7 @@ func newCmdConfig(out io.Writer) *cobra.Command {
 		Long: fmt.Sprintf(dedent.Dedent(`
 			There is a ConfigMap in the %s namespace called %q that kubeadm uses to store internal configuration about the
 			cluster. kubeadm CLI v1.8.0+ automatically creates this ConfigMap with the config used with 'kubeadm init', but if you
-			initialized your cluster using kubeadm v1.7.x or lower, you must use the 'kubeadm init phase upload-config' command to 
+			initialized your cluster using kubeadm v1.7.x or lower, you must use the 'kubeadm init phase upload-config' command to
 			create this ConfigMap. This is required so that 'kubeadm upgrade' can configure your upgraded cluster correctly.
 		`), metav1.NamespaceSystem, constants.KubeadmConfigConfigMap),
 		// Without this callback, if a user runs just the "upload"
diff --git a/cmd/kubeadm/app/cmd/join.go b/cmd/kubeadm/app/cmd/join.go
@@ -59,7 +59,7 @@ var (
 
 		`)
 
-	joinControPlaneDoneTemp = template.Must(template.New("join").Parse(dedent.Dedent(`
+	joinControlPlaneDoneTemp = template.Must(template.New("join").Parse(dedent.Dedent(`
 		This node has joined the cluster and a new control plane instance was created:
 
 		* Certificate signing request was sent to apiserver and approval was received.
@@ -196,7 +196,7 @@ func newCmdJoin(out io.Writer, joinOptions *joinOptions) *cobra.Command {
 					"KubeConfigPath": kubeadmconstants.GetAdminKubeConfigPath(),
 					"etcdMessage":    etcdMessage,
 				}
-				if err := joinControPlaneDoneTemp.Execute(data.outputWriter, ctx); err != nil {
+				if err := joinControlPlaneDoneTemp.Execute(data.outputWriter, ctx); err != nil {
 					return err
 				}
 
diff --git a/cmd/kubeadm/app/cmd/phases/init/bootstraptoken.go b/cmd/kubeadm/app/cmd/phases/init/bootstraptoken.go
@@ -88,7 +88,7 @@ func runBootstrapToken(c workflow.RunData) error {
 		return errors.Wrap(err, "error updating or creating token")
 	}
 	// Create RBAC rules that makes the bootstrap tokens able to get nodes
-	if err := nodebootstraptokenphase.AllowBoostrapTokensToGetNodes(client); err != nil {
+	if err := nodebootstraptokenphase.AllowBootstrapTokensToGetNodes(client); err != nil {
 		return errors.Wrap(err, "error allowing bootstrap tokens to get Nodes")
 	}
 	// Create RBAC rules that makes the bootstrap tokens able to post CSRs
diff --git a/cmd/kubeadm/app/cmd/phases/workflow/phase.go b/cmd/kubeadm/app/cmd/phases/workflow/phase.go
@@ -54,7 +54,7 @@ type Phase struct {
 	RunAllSiblings bool
 
 	// Run defines a function implementing the phase action.
-	// It is recommended to implent type assertion, e.g. using golang type switch,
+	// It is recommended to implement type assertion, e.g. using golang type switch,
 	// for validating the RunData type.
 	Run func(data RunData) error
 
diff --git a/cmd/kubeadm/app/cmd/phases/workflow/runner.go b/cmd/kubeadm/app/cmd/phases/workflow/runner.go
@@ -284,7 +284,7 @@ func (e *Runner) Help(cmdUse string) string {
 	})
 
 	// prints the list of phases indented by level and formatted using the maxlength
-	// the list is enclosed in a mardown code block for ensuring better readability in the public web site
+	// the list is enclosed in a markdown code block for ensuring better readability in the public web site
 	line := fmt.Sprintf("The %q command executes the following phases:\n", cmdUse)
 	line += "```\n"
 	offset := 2
diff --git a/cmd/kubeadm/app/cmd/token_test.go b/cmd/kubeadm/app/cmd/token_test.go
@@ -271,12 +271,12 @@ func TestGetClientSet(t *testing.T) {
 	defer os.RemoveAll(tmpDir)
 	fullPath := filepath.Join(tmpDir, testConfigTokenFile)
 
-	// test dryRun = false on a non-exisiting file
+	// test dryRun = false on a non-existing file
 	if _, err = cmdutil.GetClientSet(fullPath, false); err == nil {
 		t.Errorf("GetClientSet(); dry-run: false; did no fail for test file %q: %v", fullPath, err)
 	}
 
-	// test dryRun = true on a non-exisiting file
+	// test dryRun = true on a non-existing file
 	if _, err = cmdutil.GetClientSet(fullPath, true); err == nil {
 		t.Errorf("GetClientSet(); dry-run: true; did no fail for test file %q: %v", fullPath, err)
 	}
@@ -291,7 +291,7 @@ func TestGetClientSet(t *testing.T) {
 		t.Errorf("Unable to write test file %q: %v", fullPath, err)
 	}
 
-	// test dryRun = true on an exisiting file
+	// test dryRun = true on an existing file
 	if _, err = cmdutil.GetClientSet(fullPath, true); err != nil {
 		t.Errorf("GetClientSet(); dry-run: true; failed for test file %q: %v", fullPath, err)
 	}
diff --git a/cmd/kubeadm/app/componentconfigs/fakeconfig_test.go b/cmd/kubeadm/app/componentconfigs/fakeconfig_test.go
@@ -279,7 +279,7 @@ func TestConfigBaseMarshal(t *testing.T) {
 		`, kubeadmapiv1.SchemeGroupVersion.String())))
 
 		if expected != got {
-			t.Fatalf("Missmatch between expected and got:\nExpected:\n%s\n---\nGot:\n%s", expected, got)
+			t.Fatalf("Mismatch between expected and got:\nExpected:\n%s\n---\nGot:\n%s", expected, got)
 		}
 	})
 }
@@ -332,7 +332,7 @@ func TestGeneratedConfigFromCluster(t *testing.T) {
 				hash: testYAMLHash,
 			},
 			{
-				name:         "Missmatching hash means user supplied config",
+				name:         "Mismatching hash means user supplied config",
 				hash:         mismatchHash,
 				userSupplied: true,
 			},
diff --git a/cmd/kubeadm/app/componentconfigs/kubelet_test.go b/cmd/kubeadm/app/componentconfigs/kubelet_test.go
@@ -230,7 +230,7 @@ func TestKubeletDefault(t *testing.T) {
 			got.Default(&test.clusterCfg, &kubeadmapi.APIEndpoint{}, &kubeadmapi.NodeRegistrationOptions{})
 
 			if !reflect.DeepEqual(got, &expected) {
-				t.Fatalf("Missmatch between expected and got:\nExpected:\n%v\n---\nGot:\n%v", expected, *got)
+				t.Fatalf("Mismatch between expected and got:\nExpected:\n%v\n---\nGot:\n%v", expected, *got)
 			}
 		})
 	}
diff --git a/cmd/kubeadm/app/componentconfigs/kubelet_unix_test.go b/cmd/kubeadm/app/componentconfigs/kubelet_unix_test.go
@@ -75,7 +75,7 @@ func TestMutateResolverConfig(t *testing.T) {
 				t.Fatalf("failed to mutate ResolverConfig for KubeletConfiguration, %v", err)
 			}
 			if !reflect.DeepEqual(test.cfg, test.expected) {
-				t.Errorf("Missmatch between expected and got:\nExpected:\n%+v\n---\nGot:\n%+v",
+				t.Errorf("Mismatch between expected and got:\nExpected:\n%+v\n---\nGot:\n%+v",
 					test.expected, test.cfg)
 			}
 		})
diff --git a/cmd/kubeadm/app/componentconfigs/kubelet_windows_test.go b/cmd/kubeadm/app/componentconfigs/kubelet_windows_test.go
@@ -85,7 +85,7 @@ func TestMutatePaths(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			mutatePaths(test.cfg, drive)
 			if !reflect.DeepEqual(test.cfg, test.expected) {
-				t.Errorf("Missmatch between expected and got:\nExpected:\n%+v\n---\nGot:\n%+v",
+				t.Errorf("Mismatch between expected and got:\nExpected:\n%+v\n---\nGot:\n%+v",
 					test.expected, test.cfg)
 			}
 		})
diff --git a/cmd/kubeadm/app/componentconfigs/kubeproxy_test.go b/cmd/kubeadm/app/componentconfigs/kubeproxy_test.go
@@ -118,7 +118,7 @@ func TestKubeProxyDefault(t *testing.T) {
 			}
 			got.Default(&test.clusterCfg, &test.endpoint, &kubeadmapi.NodeRegistrationOptions{})
 			if !reflect.DeepEqual(got, &expected) {
-				t.Fatalf("Missmatch between expected and got:\nExpected:\n%v\n---\nGot:\n%v", expected, got)
+				t.Fatalf("Mismatch between expected and got:\nExpected:\n%v\n---\nGot:\n%v", expected, got)
 			}
 		})
 	}
diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go
@@ -195,7 +195,7 @@ const (
 
 	// KubeletBaseConfigMapRole defines the base kubelet configuration ConfigMap.
 	KubeletBaseConfigMapRole = "kubeadm:kubelet-config"
-	// KubeProxyClusterRoleBindingName sets the name for the kube-proxy CluterRoleBinding
+	// KubeProxyClusterRoleBindingName sets the name for the kube-proxy ClusterRoleBinding
 	KubeProxyClusterRoleBindingName = "kubeadm:node-proxier"
 	// NodeKubeletBootstrap defines the name of the ClusterRoleBinding that lets kubelets post CSRs
 	NodeKubeletBootstrap = "kubeadm:kubelet-bootstrap"
@@ -236,7 +236,7 @@ const (
 	// KubeletHealthCheckTimeout specifies the default kubelet timeout
 	KubeletHealthCheckTimeout = 4 * time.Minute
 
-	// UpgradeManifestsTimeout specifies the default timeout for upgradring static Pod manifests
+	// UpgradeManifestsTimeout specifies the default timeout for upgrading static Pod manifests
 	UpgradeManifestsTimeout = 5 * time.Minute
 
 	// PullImageRetry specifies how many times ContainerRuntime retries when pulling image failed
diff --git a/cmd/kubeadm/app/discovery/discovery.go b/cmd/kubeadm/app/discovery/discovery.go
@@ -61,13 +61,13 @@ func For(cfg *kubeadmapi.JoinConfiguration) (*clientcmdapi.Config, error) {
 		), nil
 	}
 
-	// if the config returned from discovery has authentication credentials, proceed with the TLS boostrap process
+	// if the config returned from discovery has authentication credentials, proceed with the TLS bootstrap process
 	if kubeconfigutil.HasAuthenticationCredentials(config) {
 		return config, nil
 	}
 
 	// if there are no authentication credentials (nor in the config returned from discovery, nor in the TLSBootstrapToken), fail
-	return nil, errors.New("couldn't find authentication credentials for the TLS boostrap process. Please use Token discovery, a discovery file with embedded authentication credentials or a discovery file without authentication credentials but with the TLSBootstrapToken flag")
+	return nil, errors.New("couldn't find authentication credentials for the TLS bootstrap process. Please use Token discovery, a discovery file with embedded authentication credentials or a discovery file without authentication credentials but with the TLSBootstrapToken flag")
 }
 
 // DiscoverValidatedKubeConfig returns a validated Config object that specifies where the cluster is and the CA cert to trust
diff --git a/cmd/kubeadm/app/phases/bootstraptoken/node/tlsbootstrap.go b/cmd/kubeadm/app/phases/bootstraptoken/node/tlsbootstrap.go
@@ -49,8 +49,8 @@ func AllowBootstrapTokensToPostCSRs(client clientset.Interface) error {
 	})
 }
 
-// AllowBoostrapTokensToGetNodes creates RBAC rules to allow Node Bootstrap Tokens to list nodes
-func AllowBoostrapTokensToGetNodes(client clientset.Interface) error {
+// AllowBootstrapTokensToGetNodes creates RBAC rules to allow Node Bootstrap Tokens to list nodes
+func AllowBootstrapTokensToGetNodes(client clientset.Interface) error {
 	fmt.Println("[bootstrap-token] Configured RBAC rules to allow Node Bootstrap tokens to get nodes")
 
 	if err := apiclient.CreateOrUpdateClusterRole(client, &rbac.ClusterRole{
diff --git a/cmd/kubeadm/app/phases/bootstraptoken/node/tlsbootstrap_test.go b/cmd/kubeadm/app/phases/bootstraptoken/node/tlsbootstrap_test.go
@@ -198,7 +198,7 @@ func TestAutoApproveNodeCertificateRotation(t *testing.T) {
 	}
 }
 
-func TestAllowBoostrapTokensToGetNodes(t *testing.T) {
+func TestAllowBootstrapTokensToGetNodes(t *testing.T) {
 	tests := []struct {
 		name   string
 		client clientset.Interface
@@ -270,8 +270,8 @@ func TestAllowBoostrapTokensToGetNodes(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if err := AllowBoostrapTokensToGetNodes(tt.client); err != nil {
-				t.Errorf("AllowBoostrapTokensToGetNodes() return error = %v", err)
+			if err := AllowBootstrapTokensToGetNodes(tt.client); err != nil {
+				t.Errorf("AllowBootstrapTokensToGetNodes() return error = %v", err)
 			}
 		})
 	}
diff --git a/cmd/kubeadm/app/phases/certs/renewal/manager_test.go b/cmd/kubeadm/app/phases/certs/renewal/manager_test.go
@@ -184,7 +184,7 @@ func TestRenewUsingLocalCA(t *testing.T) {
 			}
 
 			if !newCert.NotAfter.After(cert.NotAfter) {
-				t.Fatalf("expected new certificate with updated expiration, but renewed certificate has same NotAfter value: saw %s, expected greather than %s", newCert.NotAfter, cert.NotAfter)
+				t.Fatalf("expected new certificate with updated expiration, but renewed certificate has same NotAfter value: saw %s, expected greater than %s", newCert.NotAfter, cert.NotAfter)
 			}
 
 			certtestutil.AssertCertificateIsSignedByCa(t, newCert, testCACert)
diff --git a/cmd/kubeadm/app/phases/controlplane/manifests.go b/cmd/kubeadm/app/phases/controlplane/manifests.go
@@ -179,7 +179,7 @@ func getAPIServerCommand(cfg *kubeadmapi.ClusterConfiguration, localAPIEndpoint
 		{Name: "secure-port", Value: fmt.Sprintf("%d", localAPIEndpoint.BindPort)},
 		{Name: "allow-privileged", Value: "true"},
 		{Name: "kubelet-preferred-address-types", Value: "InternalIP,ExternalIP,Hostname"},
-		// add options to configure the front proxy.  Without the generated client cert, this will never be useable
+		// add options to configure the front proxy.  Without the generated client cert, this will never be usable
 		// so add it unconditionally with recommended values
 		{Name: "requestheader-username-headers", Value: "X-Remote-User"},
 		{Name: "requestheader-group-headers", Value: "X-Remote-Group"},
diff --git a/cmd/kubeadm/app/phases/controlplane/manifests_test.go b/cmd/kubeadm/app/phases/controlplane/manifests_test.go
@@ -636,7 +636,7 @@ func errorDiffArguments(t *testing.T, name string, actual, expected []string) {
 }
 
 // removeCommon removes common items from left list
-// makes compairing two cmdline (with lots of arguments) easier
+// makes comparing two cmdline (with lots of arguments) easier
 func removeCommon(left, right []string) []string {
 	origSet := sets.New(left...)
 	origSet.Delete(right...)
diff --git a/cmd/kubeadm/app/phases/copycerts/copycerts.go b/cmd/kubeadm/app/phases/copycerts/copycerts.go
@@ -85,7 +85,7 @@ func CreateCertificateKey() (string, error) {
 	return hex.EncodeToString(randBytes), nil
 }
 
-// UploadCerts save certs needs to join a new control-plane on kubeadm-certs sercret.
+// UploadCerts save certs needs to join a new control-plane on kubeadm-certs secret.
 func UploadCerts(client clientset.Interface, cfg *kubeadmapi.InitConfiguration, key string) error {
 	fmt.Printf("[upload-certs] Storing the certificates in Secret %q in the %q Namespace\n", kubeadmconstants.KubeadmCertsSecret, metav1.NamespaceSystem)
 	decodedKey, err := hex.DecodeString(key)
diff --git a/cmd/kubeadm/app/phases/upgrade/compute.go b/cmd/kubeadm/app/phases/upgrade/compute.go
@@ -94,7 +94,7 @@ func GetAvailableUpgrades(versionGetterImpl VersionGetter, experimentalUpgradesA
 			" nodes to the same version of Kubernetes", strings.Join(verMsg, ", "))
 	}
 
-	// Get the lastest cluster version
+	// Get the latest cluster version
 	clusterVersion, err := getLatestClusterVersion(kubeAPIServerVersions)
 	if err != nil {
 		return upgrades, err
diff --git a/cmd/kubeadm/app/phases/upgrade/compute_test.go b/cmd/kubeadm/app/phases/upgrade/compute_test.go
@@ -127,7 +127,7 @@ const fakeCurrentCoreDNSVersion = "1.0.6"
 
 func TestGetAvailableUpgrades(t *testing.T) {
 
-	// constansts for test cases
+	// constants for test cases
 	// variables are in the form v{MAJOR}{MINOR}{PATCH}, where MINOR is a variable so test are automatically uptodate to the latest MinimumControlPlaneVersion/
 
 	// v1.X series, e.g. v1.14
diff --git a/cmd/kubeadm/app/phases/upgrade/postupgrade.go b/cmd/kubeadm/app/phases/upgrade/postupgrade.go
@@ -78,7 +78,7 @@ func PerformPostUpgradeTasks(client clientset.Interface, cfg *kubeadmapi.InitCon
 	}
 
 	// Create RBAC rules that makes the bootstrap tokens able to get nodes
-	if err := nodebootstraptoken.AllowBoostrapTokensToGetNodes(client); err != nil {
+	if err := nodebootstraptoken.AllowBootstrapTokensToGetNodes(client); err != nil {
 		errs = append(errs, err)
 	}
 
@@ -186,7 +186,7 @@ func PerformAddonsUpgrade(client clientset.Interface, cfg *kubeadmapi.InitConfig
 	return errorsutil.NewAggregate(errs)
 }
 
-// unupgradedControlPlaneInstances returns a list of control palne instances that have not yet been upgraded.
+// unupgradedControlPlaneInstances returns a list of control plane instances that have not yet been upgraded.
 //
 // NB. This function can only be called after the current control plane instance has been upgraded already.
 // Because it determines whether the other control plane instances have been upgraded by checking whether
@@ -325,7 +325,7 @@ func UpdateKubeletLocalMode(cfg *kubeadmapi.InitConfiguration, dryRun bool) erro
 		return err
 	}
 
-	// Skip changing kubeconfig file if Server does not match the ControlPlaneEndoint.
+	// Skip changing kubeconfig file if Server does not match the ControlPlaneEndpoint.
 	if config.Clusters[configContext.Cluster].Server != controlPlaneAPIEndpoint || controlPlaneAPIEndpoint == localAPIEndpoint {
 		klog.V(2).Infof("Skipping update of the Server URL in %s, because it's already not equal to %q or already matches the localAPIEndpoint", kubeletKubeConfigFilePath, cfg.ControlPlaneEndpoint)
 		return nil
diff --git a/cmd/kubeadm/app/phases/upgrade/staticpods.go b/cmd/kubeadm/app/phases/upgrade/staticpods.go
@@ -60,11 +60,11 @@ type StaticPodPathManager interface {
 	TempManifestPath(component string) string
 	// TempManifestDir should point to the temporary directory created for generating new manifests for the upgrade
 	TempManifestDir() string
-	// BackupManifestPath gets the file path for the component in the backup directory used for backuping manifests during the transition
+	// BackupManifestPath gets the file path for the component in the backup directory used for backing up manifests during the transition
 	BackupManifestPath(component string) string
-	// BackupManifestDir should point to the backup directory used for backuping manifests during the transition
+	// BackupManifestDir should point to the backup directory used for backing up manifests during the transition
 	BackupManifestDir() string
-	// BackupEtcdDir should point to the backup directory used for backuping manifests during the transition
+	// BackupEtcdDir should point to the backup directory used for backing up manifests during the transition
 	BackupEtcdDir() string
 	// CleanupDirs cleans up all temporary directories
 	CleanupDirs() error
@@ -151,17 +151,17 @@ func (spm *KubeStaticPodPathManager) TempManifestDir() string {
 	return spm.tempManifestDir
 }
 
-// BackupManifestPath gets the file path for the component in the backup directory used for backuping manifests during the transition
+// BackupManifestPath gets the file path for the component in the backup directory used for backing up manifests during the transition
 func (spm *KubeStaticPodPathManager) BackupManifestPath(component string) string {
 	return constants.GetStaticPodFilepath(component, spm.backupManifestDir)
 }
 
-// BackupManifestDir should point to the backup directory used for backuping manifests during the transition
+// BackupManifestDir should point to the backup directory used for backing up manifests during the transition
 func (spm *KubeStaticPodPathManager) BackupManifestDir() string {
 	return spm.backupManifestDir
 }
 
-// BackupEtcdDir should point to the backup directory used for backuping manifests during the transition
+// BackupEtcdDir should point to the backup directory used for backing up manifests during the transition
 func (spm *KubeStaticPodPathManager) BackupEtcdDir() string {
 	return spm.backupEtcdDir
 }
diff --git a/cmd/kubeadm/app/phases/upgrade/staticpods_test.go b/cmd/kubeadm/app/phases/upgrade/staticpods_test.go
@@ -792,7 +792,7 @@ func TestRenewCertsByComponent(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			pkiutiltesting.Reset()
 
-			// Setup up basic requities
+			// Setup up basic requisites
 			tmpDir := testutil.SetupTempDir(t)
 			defer os.RemoveAll(tmpDir)
 
diff --git a/cmd/kubeadm/app/phases/upgrade/versiongetter.go b/cmd/kubeadm/app/phases/upgrade/versiongetter.go
@@ -72,7 +72,7 @@ func (g *KubeVersionGetter) ClusterVersion() (string, *versionutil.Version, erro
 	// common.go#getClient()
 	// The problem here is that during upgrade dry-run client reactors are backed by a dynamic client
 	// via NewClientBackedDryRunGetterFromKubeconfig() and for GetActions there seems to be no analog to
-	// Discovery().Serverversion() resource for a dynamic client(?).
+	// Discovery().ServerVersion() resource for a dynamic client(?).
 	fakeclientDiscovery, ok := g.client.Discovery().(*fakediscovery.FakeDiscovery)
 	if ok {
 		clusterVersionInfo = fakeclientDiscovery.FakedServerVersion
diff --git a/cmd/kubeadm/app/util/config/common.go b/cmd/kubeadm/app/util/config/common.go
diff --git a/cmd/kubeadm/app/util/config/strict/strict.go b/cmd/kubeadm/app/util/config/strict/strict.go
diff --git a/cmd/kubeadm/app/util/config/upgradeconfiguration_test.go b/cmd/kubeadm/app/util/config/upgradeconfiguration_test.go
diff --git a/cmd/kubeadm/app/util/marshal_test.go b/cmd/kubeadm/app/util/marshal_test.go
diff --git a/cmd/kubeadm/app/util/pkiutil/pki_helpers.go b/cmd/kubeadm/app/util/pkiutil/pki_helpers.go
diff --git a/cmd/kubeadm/app/util/users/users_linux.go b/cmd/kubeadm/app/util/users/users_linux.go

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func Convert_v1beta4_JoinConfiguration_To_kubeadm_JoinConfiguration(in *JoinConf`
`63`	`63`	`return err`
`64`	`64`	`}`
`65`	`65`
`66`		`-// Convert_kubeadm_JoinConfiguration_To_v1beta4_JoinConfiguration converts a private JoinConfinguration to a public JoinCOnfiguration.`
	`66`	`+// Convert_kubeadm_JoinConfiguration_To_v1beta4_JoinConfiguration converts a private JoinConfiguration to a public JoinConfiguration.`
`67`	`67`	`func Convert_kubeadm_JoinConfiguration_To_v1beta4_JoinConfiguration(in kubeadm.JoinConfiguration, out JoinConfiguration, s conversion.Scope) error {`
`68`	`68`	`err := autoConvert_kubeadm_JoinConfiguration_To_v1beta4_JoinConfiguration(in, out, s)`
`69`	`69`	`timeoutControlPlane := kubeadm.GetConversionTimeoutControlPlane() // Remove with v1beta3.`
Original file line number	Diff line number	Diff line change
`@@ -1067,7 +1067,7 @@ func TestValidateSocketPath(t *testing.T) {`
`1067`	`1067`	`{name: "valid socket URL", criSocket: kubeadmapiv1.DefaultContainerRuntimeURLScheme + "://" + "/some/path", expectedErrors: false},`
`1068`	`1068`	`{name: "unsupported URL scheme", criSocket: "bla:///some/path", expectedErrors: true},`
`1069`	`1069`	`{name: "missing URL scheme", criSocket: "/some/path", expectedErrors: true},`
`1070`		`- {name: "unparseable URL", criSocket: ":::", expectedErrors: true},`
	`1070`	`+ {name: "unparsable URL", criSocket: ":::", expectedErrors: true},`
`1071`	`1071`	`{name: "empty CRISocket", criSocket: "", expectedErrors: true},`
`1072`	`1072`	`}`
`1073`	`1073`	`for _, tc := range tests {`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ var (`
`59`	`59`
`60`	`60`	`)
`61`	`61`
`62`		- joinControPlaneDoneTemp = template.Must(template.New("join").Parse(dedent.Dedent(`
	`62`	+ joinControlPlaneDoneTemp = template.Must(template.New("join").Parse(dedent.Dedent(`
`63`	`63`	`This node has joined the cluster and a new control plane instance was created:`
`64`	`64`
`65`	`65`	`* Certificate signing request was sent to apiserver and approval was received.`
`@@ -196,7 +196,7 @@ func newCmdJoin(out io.Writer, joinOptions joinOptions) cobra.Command {`
`196`	`196`	`"KubeConfigPath": kubeadmconstants.GetAdminKubeConfigPath(),`
`197`	`197`	`"etcdMessage": etcdMessage,`
`198`	`198`	`}`
`199`		`- if err := joinControPlaneDoneTemp.Execute(data.outputWriter, ctx); err != nil {`
	`199`	`+ if err := joinControlPlaneDoneTemp.Execute(data.outputWriter, ctx); err != nil {`
`200`	`200`	`return err`
`201`	`201`	`}`
`202`	`202`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func runBootstrapToken(c workflow.RunData) error {`
`88`	`88`	`return errors.Wrap(err, "error updating or creating token")`
`89`	`89`	`}`
`90`	`90`	`// Create RBAC rules that makes the bootstrap tokens able to get nodes`
`91`		`- if err := nodebootstraptokenphase.AllowBoostrapTokensToGetNodes(client); err != nil {`
	`91`	`+ if err := nodebootstraptokenphase.AllowBootstrapTokensToGetNodes(client); err != nil {`
`92`	`92`	`return errors.Wrap(err, "error allowing bootstrap tokens to get Nodes")`
`93`	`93`	`}`
`94`	`94`	`// Create RBAC rules that makes the bootstrap tokens able to post CSRs`