diff --git a/CHANGELOG-1.5.md b/CHANGELOG-1.5.md index dd3b580688e..de5802e6e28 100644 --- a/CHANGELOG-1.5.md +++ b/CHANGELOG-1.5.md @@ -1196,7 +1196,7 @@ binary | sha256 hash * Enforce Disk based pod eviction with GCI base image in Kubelet ([#33520](https://github.com/kubernetes/kubernetes/pull/33520), [@vishh](https://github.com/vishh)) * Remove headers that are unnecessary for proxy target ([#34076](https://github.com/kubernetes/kubernetes/pull/34076), [@mbohlool](https://github.com/mbohlool)) * Add missing argument to log message in federated ingress controller. ([#34158](https://github.com/kubernetes/kubernetes/pull/34158), [@quinton-hoole](https://github.com/quinton-hoole)) -* The kubelet --eviction-minimum-reclaim option can now take precentages as well as absolute values for resources quantities ([#33392](https://github.com/kubernetes/kubernetes/pull/33392), [@sjenning](https://github.com/sjenning)) +* The kubelet --eviction-minimum-reclaim option can now take percentages as well as absolute values for resources quantities ([#33392](https://github.com/kubernetes/kubernetes/pull/33392), [@sjenning](https://github.com/sjenning)) * The implicit registration of Prometheus metrics for workqueue has been removed, and a plug-able interface was added. If you were using workqueue in your own binaries and want these metrics, add the following to your imports in the main package: "k8s.io/pkg/util/workqueue/prometheus". ([#33792](https://github.com/kubernetes/kubernetes/pull/33792), [@caesarxuchao](https://github.com/caesarxuchao)) * Add kubectl --node-port option for specifying the service nodeport ([#33319](https://github.com/kubernetes/kubernetes/pull/33319), [@juanvallejo](https://github.com/juanvallejo)) * To reduce memory usage to reasonable levels in smaller clusters, kube-apiserver now sets the deserialization cache size based on the target memory usage. ([#34000](https://github.com/kubernetes/kubernetes/pull/34000), [@wojtek-t](https://github.com/wojtek-t)) diff --git a/CHANGELOG-1.8.md b/CHANGELOG-1.8.md index 99cc1d02e40..0a840f225fc 100644 --- a/CHANGELOG-1.8.md +++ b/CHANGELOG-1.8.md @@ -1778,7 +1778,7 @@ filename | sha256 hash * Add validation for CustomResources via JSON Schema. ([#47263](https://github.com/kubernetes/kubernetes/pull/47263), [@nikhita](https://github.com/nikhita)) * enqueue a sync task to wake up jobcontroller to check job ActiveDeadlineSeconds in time ([#48454](https://github.com/kubernetes/kubernetes/pull/48454), [@weiwei04](https://github.com/weiwei04)) * Remove previous local ephemeral storage resource names: "ResourceStorageOverlay" and "ResourceStorageScratch" ([#51425](https://github.com/kubernetes/kubernetes/pull/51425), [@NickrenREN](https://github.com/NickrenREN)) -* Add `retainKeys` to patchStrategy for v1 Volumes and extentions/v1beta1 DeploymentStrategy. ([#50296](https://github.com/kubernetes/kubernetes/pull/50296), [@mengqiy](https://github.com/mengqiy)) +* Add `retainKeys` to patchStrategy for v1 Volumes and extensions/v1beta1 DeploymentStrategy. ([#50296](https://github.com/kubernetes/kubernetes/pull/50296), [@mengqiy](https://github.com/mengqiy)) * Add mount options field to PersistentVolume spec ([#50919](https://github.com/kubernetes/kubernetes/pull/50919), [@wongma7](https://github.com/wongma7)) * Use of the alpha initializers feature now requires enabling the `Initializers` feature gate. This feature gate is auto-enabled if the `Initialzers` admission plugin is enabled. ([#51436](https://github.com/kubernetes/kubernetes/pull/51436), [@liggitt](https://github.com/liggitt)) * Fix inconsistent Prometheus cAdvisor metrics ([#51473](https://github.com/kubernetes/kubernetes/pull/51473), [@bboreham](https://github.com/bboreham)) @@ -1997,7 +1997,7 @@ filename | sha256 hash * In GCE, add measures to prevent corruption of known_tokens.csv. ([#49897](https://github.com/kubernetes/kubernetes/pull/49897), [@mikedanese](https://github.com/mikedanese)) * kubeadm: Fix join preflight check false negative ([#49825](https://github.com/kubernetes/kubernetes/pull/49825), [@erhudy](https://github.com/erhudy)) * route_controller will emit "FailedToCreateRoute" event when fails to create route. ([#49821](https://github.com/kubernetes/kubernetes/pull/49821), [@MrHohn](https://github.com/MrHohn)) -* Fix incorrect parsing of io_priority in Portworx volume StorageClass and add support for new paramters. ([#49526](https://github.com/kubernetes/kubernetes/pull/49526), [@harsh-px](https://github.com/harsh-px)) +* Fix incorrect parsing of io_priority in Portworx volume StorageClass and add support for new parameters. ([#49526](https://github.com/kubernetes/kubernetes/pull/49526), [@harsh-px](https://github.com/harsh-px)) * The API Server now automatically creates RBAC ClusterRoles for CSR approving. ([#49284](https://github.com/kubernetes/kubernetes/pull/49284), [@luxas](https://github.com/luxas)) * Each deployment method should bind users/groups to the ClusterRoles if they are using this feature. * Adds AllowPrivilegeEscalation to control whether a process can gain more privileges than its parent process ([#47019](https://github.com/kubernetes/kubernetes/pull/47019), [@jessfraz](https://github.com/jessfraz)) diff --git a/CHANGELOG-1.9.md b/CHANGELOG-1.9.md index 6099944ef53..49eb99540f9 100644 --- a/CHANGELOG-1.9.md +++ b/CHANGELOG-1.9.md @@ -1490,7 +1490,7 @@ filename | sha256 hash * RBAC PolicyRules now allow resource=`*/` to cover `any-resource/`. For example, `*/scale` covers `replicationcontroller/scale`. ([#53722](https://github.com/kubernetes/kubernetes/pull/53722), [@deads2k](https://github.com/deads2k)) * Upgrade to go1.9 ([#51375](https://github.com/kubernetes/kubernetes/pull/51375), [@cblecker](https://github.com/cblecker)) * Webhook always retries connection reset error. ([#53947](https://github.com/kubernetes/kubernetes/pull/53947), [@crassirostris](https://github.com/crassirostris)) -* fix PV Recycle failed on non-amd64 platfrom ([#53958](https://github.com/kubernetes/kubernetes/pull/53958), [@dixudx](https://github.com/dixudx)) +* fix PV Recycle failed on non-amd64 platform ([#53958](https://github.com/kubernetes/kubernetes/pull/53958), [@dixudx](https://github.com/dixudx)) * Verbose option is added to each status function in CRI. Container runtime could return extra information in status response for debugging. ([#53965](https://github.com/kubernetes/kubernetes/pull/53965), [@Random-Liu](https://github.com/Random-Liu)) * Fixed log fallback termination messages when using docker with journald log driver ([#52503](https://github.com/kubernetes/kubernetes/pull/52503), [@joelsmith](https://github.com/joelsmith)) * falls back to parse Docker runtime version as generic if not semver ([#54040](https://github.com/kubernetes/kubernetes/pull/54040), [@dixudx](https://github.com/dixudx)) @@ -1833,7 +1833,7 @@ filename | sha256 hash * Add validation for CustomResources via JSON Schema. ([#47263](https://github.com/kubernetes/kubernetes/pull/47263), [@nikhita](https://github.com/nikhita)) * enqueue a sync task to wake up jobcontroller to check job ActiveDeadlineSeconds in time ([#48454](https://github.com/kubernetes/kubernetes/pull/48454), [@weiwei04](https://github.com/weiwei04)) * Remove previous local ephemeral storage resource names: "ResourceStorageOverlay" and "ResourceStorageScratch" ([#51425](https://github.com/kubernetes/kubernetes/pull/51425), [@NickrenREN](https://github.com/NickrenREN)) -* Add `retainKeys` to patchStrategy for v1 Volumes and extentions/v1beta1 DeploymentStrategy. ([#50296](https://github.com/kubernetes/kubernetes/pull/50296), [@mengqiy](https://github.com/mengqiy)) +* Add `retainKeys` to patchStrategy for v1 Volumes and extensions/v1beta1 DeploymentStrategy. ([#50296](https://github.com/kubernetes/kubernetes/pull/50296), [@mengqiy](https://github.com/mengqiy)) * Add mount options field to PersistentVolume spec ([#50919](https://github.com/kubernetes/kubernetes/pull/50919), [@wongma7](https://github.com/wongma7)) * Use of the alpha initializers feature now requires enabling the `Initializers` feature gate. This feature gate is auto-enabled if the `Initialzers` admission plugin is enabled. ([#51436](https://github.com/kubernetes/kubernetes/pull/51436), [@liggitt](https://github.com/liggitt)) * Fix inconsistent Prometheus cAdvisor metrics ([#51473](https://github.com/kubernetes/kubernetes/pull/51473), [@bboreham](https://github.com/bboreham)) diff --git a/cmd/kubeadm/app/cmd/phases/certs.go b/cmd/kubeadm/app/cmd/phases/certs.go index 3c87983ad2b..b63cf1bbdce 100644 --- a/cmd/kubeadm/app/cmd/phases/certs.go +++ b/cmd/kubeadm/app/cmd/phases/certs.go @@ -114,7 +114,7 @@ func getCertsSubCommands(defaultKubernetesVersion string) []*cobra.Command { // This is used for unit testing only... // If we wouldn't set this to something, the code would dynamically look up the version from the internet - // By setting this explicitely for tests workarounds that + // By setting this explicitly for tests workarounds that if defaultKubernetesVersion != "" { cfg.KubernetesVersion = defaultKubernetesVersion } diff --git a/cmd/kubeadm/app/cmd/phases/etcd.go b/cmd/kubeadm/app/cmd/phases/etcd.go index 86c9d8dc234..86501f1c811 100644 --- a/cmd/kubeadm/app/cmd/phases/etcd.go +++ b/cmd/kubeadm/app/cmd/phases/etcd.go @@ -65,7 +65,7 @@ func getEtcdSubCommands(outDir, defaultKubernetesVersion string) []*cobra.Comman // This is used for unit testing only... // If we wouldn't set this to something, the code would dynamically look up the version from the internet - // By setting this explicitely for tests workarounds that + // By setting this explicitly for tests workarounds that if defaultKubernetesVersion != "" { cfg.KubernetesVersion = defaultKubernetesVersion } diff --git a/cmd/kubeadm/app/cmd/phases/kubeconfig.go b/cmd/kubeadm/app/cmd/phases/kubeconfig.go index 2d707a42014..c7ca5437f63 100644 --- a/cmd/kubeadm/app/cmd/phases/kubeconfig.go +++ b/cmd/kubeadm/app/cmd/phases/kubeconfig.go @@ -94,7 +94,7 @@ func getKubeConfigSubCommands(out io.Writer, outDir, defaultKubernetesVersion st // This is used for unit testing only... // If we wouldn't set this to something, the code would dynamically look up the version from the internet - // By setting this explicitely for tests workarounds that + // By setting this explicitly for tests workarounds that if defaultKubernetesVersion != "" { cfg.KubernetesVersion = defaultKubernetesVersion } diff --git a/cmd/kubeadm/app/phases/addons/proxy/proxy_test.go b/cmd/kubeadm/app/phases/addons/proxy/proxy_test.go index 21893d065da..69cf755d011 100644 --- a/cmd/kubeadm/app/phases/addons/proxy/proxy_test.go +++ b/cmd/kubeadm/app/phases/addons/proxy/proxy_test.go @@ -218,7 +218,7 @@ func TestEnsureProxyAddon(t *testing.T) { UnifiedControlPlaneImage: "someImage", } - // Simulate an error if neccessary + // Simulate an error if necessary switch tc.simError { case ServiceAccountError: client.PrependReactor("create", "serviceaccounts", func(action core.Action) (bool, runtime.Object, error) { diff --git a/cmd/kubeadm/app/phases/certs/certs.go b/cmd/kubeadm/app/phases/certs/certs.go index 3eebcfc2846..1bccf2f7dbe 100644 --- a/cmd/kubeadm/app/phases/certs/certs.go +++ b/cmd/kubeadm/app/phases/certs/certs.go @@ -268,28 +268,28 @@ func NewFrontProxyClientCertAndKey(frontProxyCACert *x509.Certificate, frontProx return frontProxyClientCert, frontProxyClientKey, nil } -// loadCertificateAuthorithy loads certificate authorithy +// loadCertificateAuthorithy loads certificate authority func loadCertificateAuthorithy(pkiDir string, baseName string) (*x509.Certificate, *rsa.PrivateKey, error) { - // Checks if certificate authorithy exists in the PKI directory + // Checks if certificate authority exists in the PKI directory if !pkiutil.CertOrKeyExist(pkiDir, baseName) { - return nil, nil, fmt.Errorf("couldn't load %s certificate authorithy from %s", baseName, pkiDir) + return nil, nil, fmt.Errorf("couldn't load %s certificate authority from %s", baseName, pkiDir) } - // Try to load certificate authorithy .crt and .key from the PKI directory + // Try to load certificate authority .crt and .key from the PKI directory caCert, caKey, err := pkiutil.TryLoadCertAndKeyFromDisk(pkiDir, baseName) if err != nil { - return nil, nil, fmt.Errorf("failure loading %s certificate authorithy: %v", baseName, err) + return nil, nil, fmt.Errorf("failure loading %s certificate authority: %v", baseName, err) } // Make sure the loaded CA cert actually is a CA if !caCert.IsCA { - return nil, nil, fmt.Errorf("%s certificate is not a certificate authorithy", baseName) + return nil, nil, fmt.Errorf("%s certificate is not a certificate authority", baseName) } return caCert, caKey, nil } -// writeCertificateAuthorithyFilesIfNotExist write a new certificate Authorithy to the given path. +// writeCertificateAuthorithyFilesIfNotExist write a new certificate Authority to the given path. // If there already is a certificate file at the given path; kubeadm tries to load it and check if the values in the // existing and the expected certificate equals. If they do; kubeadm will just skip writing the file as it's up-to-date, // otherwise this function returns an error. @@ -309,7 +309,7 @@ func writeCertificateAuthorithyFilesIfNotExist(pkiDir string, baseName string, c return fmt.Errorf("certificate %s is not a CA", baseName) } - // kubeadm doesn't validate the existing certificate Authorithy more than this; + // kubeadm doesn't validate the existing certificate Authority more than this; // Basically, if we find a certificate file with the same path; and it is a CA // kubeadm thinks those files are equal and doesn't bother writing a new file fmt.Printf("[certificates] Using the existing %s certificate and key.\n", baseName) @@ -346,7 +346,7 @@ func writeCertificateFilesIfNotExist(pkiDir string, baseName string, signingCert // kubeadm doesn't validate the existing certificate more than this; // Basically, if we find a certificate file with the same path; and it is signed by - // the expected certificate authorithy, kubeadm thinks those files are equal and + // the expected certificate authority, kubeadm thinks those files are equal and // doesn't bother writing a new file fmt.Printf("[certificates] Using the existing %s certificate and key.\n", baseName) } else { @@ -478,7 +478,7 @@ func validateSignedCert(l certKeyLocation) error { // Try to load CA caCert, err := pkiutil.TryLoadCertFromDisk(l.pkiDir, l.caBaseName) if err != nil { - return fmt.Errorf("failure loading certificate authorithy for %s: %v", l.uxName, err) + return fmt.Errorf("failure loading certificate authority for %s: %v", l.uxName, err) } // Try to load key and signed certificate diff --git a/cmd/kubeadm/app/phases/certs/pkiutil/pki_helpers.go b/cmd/kubeadm/app/phases/certs/pkiutil/pki_helpers.go index 170973e4f18..e6bcb27c955 100644 --- a/cmd/kubeadm/app/phases/certs/pkiutil/pki_helpers.go +++ b/cmd/kubeadm/app/phases/certs/pkiutil/pki_helpers.go @@ -125,7 +125,7 @@ func WritePublicKey(pkiPath, name string, key *rsa.PublicKey) error { return nil } -// CertOrKeyExist retuns a boolean whether the cert or the key exists +// CertOrKeyExist returns a boolean whether the cert or the key exists func CertOrKeyExist(pkiPath, name string) bool { certificatePath, privateKeyPath := pathsForCertAndKey(pkiPath, name) diff --git a/cmd/kubeadm/app/phases/controlplane/manifests.go b/cmd/kubeadm/app/phases/controlplane/manifests.go index 8de7f2ce147..967f6cc9a84 100644 --- a/cmd/kubeadm/app/phases/controlplane/manifests.go +++ b/cmd/kubeadm/app/phases/controlplane/manifests.go @@ -69,7 +69,7 @@ func CreateSchedulerStaticPodManifestFile(manifestDir string, cfg *kubeadmapi.Ma } // GetStaticPodSpecs returns all staticPodSpecs actualized to the context of the current MasterConfiguration -// NB. this methods holds the information about how kubeadm creates static pod mainfests. +// NB. this methods holds the information about how kubeadm creates static pod manifests. func GetStaticPodSpecs(cfg *kubeadmapi.MasterConfiguration, k8sVersion *version.Version) map[string]v1.Pod { // Get the required hostpath mounts mounts := getHostPathVolumesForTheControlPlane(cfg) diff --git a/cmd/kubeadm/app/phases/controlplane/manifests_test.go b/cmd/kubeadm/app/phases/controlplane/manifests_test.go index a45464c8d1e..f321a644813 100644 --- a/cmd/kubeadm/app/phases/controlplane/manifests_test.go +++ b/cmd/kubeadm/app/phases/controlplane/manifests_test.go @@ -74,7 +74,7 @@ func TestGetStaticPodSpecs(t *testing.T) { // Assert each specs refers to the right pod if spec.Spec.Containers[0].Name != assertion.staticPodName { - t.Errorf("getKubeConfigSpecs spec for %s contains pod %s, expectes %s", assertion.staticPodName, spec.Spec.Containers[0].Name, assertion.staticPodName) + t.Errorf("getKubeConfigSpecs spec for %s contains pod %s, expects %s", assertion.staticPodName, spec.Spec.Containers[0].Name, assertion.staticPodName) } } else { diff --git a/cmd/kubeadm/app/phases/etcd/local_test.go b/cmd/kubeadm/app/phases/etcd/local_test.go index 0d076ca0470..569d2c6c5a1 100644 --- a/cmd/kubeadm/app/phases/etcd/local_test.go +++ b/cmd/kubeadm/app/phases/etcd/local_test.go @@ -41,7 +41,7 @@ func TestGetEtcdPodSpec(t *testing.T) { // Assert each specs refers to the right pod if spec.Spec.Containers[0].Name != kubeadmconstants.Etcd { - t.Errorf("getKubeConfigSpecs spec for etcd contains pod %s, expectes %s", spec.Spec.Containers[0].Name, kubeadmconstants.Etcd) + t.Errorf("getKubeConfigSpecs spec for etcd contains pod %s, expects %s", spec.Spec.Containers[0].Name, kubeadmconstants.Etcd) } } diff --git a/cmd/kubeadm/app/phases/selfhosting/podspec_mutation.go b/cmd/kubeadm/app/phases/selfhosting/podspec_mutation.go index fd01d8c391a..c2faa3646d0 100644 --- a/cmd/kubeadm/app/phases/selfhosting/podspec_mutation.go +++ b/cmd/kubeadm/app/phases/selfhosting/podspec_mutation.go @@ -36,7 +36,7 @@ const ( // PodSpecMutatorFunc is a function capable of mutating a PodSpec type PodSpecMutatorFunc func(*v1.PodSpec) -// GetDefaultMutators gets the mutator functions that alwasy should be used +// GetDefaultMutators gets the mutator functions that always should be used func GetDefaultMutators() map[string][]PodSpecMutatorFunc { return map[string][]PodSpecMutatorFunc{ kubeadmconstants.KubeAPIServer: { diff --git a/cmd/kubeadm/app/phases/upgrade/staticpods.go b/cmd/kubeadm/app/phases/upgrade/staticpods.go index 8ea3b2559f5..dbce0222132 100644 --- a/cmd/kubeadm/app/phases/upgrade/staticpods.go +++ b/cmd/kubeadm/app/phases/upgrade/staticpods.go @@ -219,7 +219,7 @@ func performEtcdStaticPodUpgrade(waiter apiclient.Waiter, pathMgr StaticPodPathM } // Write the updated etcd static Pod manifest into the temporary directory, at this point no etcd change - // has occured in any aspects. + // has occurred in any aspects. if err := etcdphase.CreateLocalEtcdStaticPodManifestFile(pathMgr.TempManifestDir(), cfg); err != nil { return true, fmt.Errorf("error creating local etcd static pod manifest file: %v", err) } @@ -253,7 +253,7 @@ func performEtcdStaticPodUpgrade(waiter apiclient.Waiter, pathMgr StaticPodPathM // Checking health state of etcd after the upgrade if _, err = etcdCluster.GetEtcdClusterStatus(); err != nil { - // Despite the fact that upgradeComponent was sucessfull, there is something wrong with etcd cluster + // Despite the fact that upgradeComponent was successful, there is something wrong with etcd cluster // First step is to restore back up of datastore if err := rollbackEtcdData(cfg, fmt.Errorf("etcd cluster is not healthy after upgrade: %v rolling back", err), pathMgr); err != nil { // Even copying back datastore failed, no options for recovery left, bailing out @@ -324,7 +324,7 @@ func StaticPodControlPlane(waiter apiclient.Waiter, pathMgr StaticPodPathManager func rollbackOldManifests(oldManifests map[string]string, origErr error, pathMgr StaticPodPathManager, restoreEtcd bool) error { errs := []error{origErr} for component, backupPath := range oldManifests { - // Will restore etcd manifest only if it was explicitely requested by setting restoreEtcd to True + // Will restore etcd manifest only if it was explicitly requested by setting restoreEtcd to True if component == constants.Etcd && !restoreEtcd { continue } diff --git a/cmd/kubeadm/app/util/apiclient/wait.go b/cmd/kubeadm/app/util/apiclient/wait.go index 5bb9e3f7425..6d76a8bac9e 100644 --- a/cmd/kubeadm/app/util/apiclient/wait.go +++ b/cmd/kubeadm/app/util/apiclient/wait.go @@ -33,7 +33,7 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) -// Waiter is an interface for waiting for criterias in Kubernetes to happen +// Waiter is an interface for waiting for criteria in Kubernetes to happen type Waiter interface { // WaitForAPI waits for the API Server's /healthz endpoint to become "ok" WaitForAPI() error @@ -195,7 +195,7 @@ func (w *KubeWaiter) WaitForStaticPodSingleHash(nodeName string, component strin } // WaitForStaticPodControlPlaneHashChange blocks until it timeouts or notices that the Mirror Pod (for the Static Pod, respectively) has changed -// This implicitely means this function blocks until the kubelet has restarted the Static Pod in question +// This implicitly means this function blocks until the kubelet has restarted the Static Pod in question func (w *KubeWaiter) WaitForStaticPodControlPlaneHashChange(nodeName, component, previousHash string) error { return wait.PollImmediate(constants.APICallRetryInterval, w.timeout, func() (bool, error) { diff --git a/cmd/kubeadm/app/util/version_test.go b/cmd/kubeadm/app/util/version_test.go index 5e70af29deb..23591d2cf4b 100644 --- a/cmd/kubeadm/app/util/version_test.go +++ b/cmd/kubeadm/app/util/version_test.go @@ -187,7 +187,7 @@ func TestSplitVersion(t *testing.T) { // unknown area, not valid input. {"unknown/latest-1", "", "", false}, } - // kubeReleaseBucketURL can be overriden during network tests, thus ensure + // kubeReleaseBucketURL can be overridden during network tests, thus ensure // it will contain value corresponding to expected outcome for this unit test kubeReleaseBucketURL = "https://dl.k8s.io" diff --git a/cmd/kubeadm/test/cmd/version_test.go b/cmd/kubeadm/test/cmd/version_test.go index 6a65ef0c99d..07095d7285d 100644 --- a/cmd/kubeadm/test/cmd/version_test.go +++ b/cmd/kubeadm/test/cmd/version_test.go @@ -117,12 +117,12 @@ func TestCmdVersionOutputJsonOrYaml(t *testing.T) { m := obj.(map[string]interface{}) if m["clientVersion"] == nil { - t.Errorf("failed to get the infomation of clientVersion from 'kubeadm version %s'", rt.args) + t.Errorf("failed to get the information of clientVersion from 'kubeadm version %s'", rt.args) } info := m["clientVersion"].(map[string]interface{}) for _, key := range VersionInfo { if len(info[key].(string)) == 0 { - t.Errorf("failed to get the infomation of %s from 'kubeadm version %s'", key, rt.args) + t.Errorf("failed to get the information of %s from 'kubeadm version %s'", key, rt.args) } } } diff --git a/cmd/kubeadm/test/util.go b/cmd/kubeadm/test/util.go index 916e72bf512..025df6503ec 100644 --- a/cmd/kubeadm/test/util.go +++ b/cmd/kubeadm/test/util.go @@ -44,7 +44,7 @@ func SetupTempDir(t *testing.T) string { // SetupMasterConfigurationFile is a utility function for kubeadm testing that writes a master configuration file // into /config subfolder of a given temporary directory. -// The funtion returns the path of the created master configuration file. +// The function returns the path of the created master configuration file. func SetupMasterConfigurationFile(t *testing.T, tmpdir string, cfg *kubeadmapi.MasterConfiguration) string { cfgPath := filepath.Join(tmpdir, "config/masterconfig.yaml") @@ -89,7 +89,7 @@ func SetupEmptyFiles(t *testing.T, tmpdir string, fileNames ...string) { // SetupPkiDirWithCertificateAuthorithy is a utility function for kubeadm testing that creates a // CertificateAuthorithy cert/key pair into /pki subfolder of a given temporary directory. -// The funtion returns the path of the created pki. +// The function returns the path of the created pki. func SetupPkiDirWithCertificateAuthorithy(t *testing.T, tmpdir string) string { caCert, caKey := certtestutil.SetupCertificateAuthorithy(t)