Skip to content

Commit

Permalink
Merge pull request #8889 from windayski/fix-typo
Browse files Browse the repository at this point in the history
fix typos
  • Loading branch information
tstromberg authored Jul 31, 2020
2 parents 47435d9 + d1e8d47 commit aab41ff
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion hack/boilerplate/boilerplate.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func filePasses(filename string, expectedBoilerplate []byte) (bool, error) {
func filesToCheck(rootDir string, extensions map[string][]byte) ([]string, error) {
var outFiles []string
err := filepath.Walk(rootDir, func(path string, info os.FileInfo, err error) error {
// remove current workdir from the beginig of the path in case it matches the skipped path
// remove current workdir from the beginning of the path in case it matches the skipped path
cwd, _ := os.Getwd()
// replace "\" with "\\" for windows style path
re := regexp.MustCompile(`\\`)
Expand Down
4 changes: 2 additions & 2 deletions pkg/minikube/node/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ func handleDownloadOnly(cacheGroup, kicGroup *errgroup.Group, k8sVersion string)
}

// CacheKubectlBinary caches the kubectl binary
func CacheKubectlBinary(k8sVerison string) (string, error) {
func CacheKubectlBinary(k8sVersion string) (string, error) {
binary := "kubectl"
if runtime.GOOS == "windows" {
binary = "kubectl.exe"
}

return download.Binary(binary, k8sVerison, runtime.GOOS, runtime.GOARCH)
return download.Binary(binary, k8sVersion, runtime.GOOS, runtime.GOARCH)
}

// doCacheBinaries caches Kubernetes binaries in the foreground
Expand Down
4 changes: 2 additions & 2 deletions pkg/minikube/out/register/cloud_events.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func printAsCloudEvent(log Log, data map[string]string) {

bs, err := event.MarshalJSON()
if err != nil {
glog.Errorf("error marashalling event: %v", err)
glog.Errorf("error marshalling event: %v", err)
return
}
fmt.Fprintln(outputFile, string(bs))
Expand All @@ -91,7 +91,7 @@ func printAndRecordCloudEvent(log Log, data map[string]string) {

bs, err := event.MarshalJSON()
if err != nil {
glog.Errorf("error marashalling event: %v", err)
glog.Errorf("error marshalling event: %v", err)
return
}
fmt.Fprintln(outputFile, string(bs))
Expand Down

0 comments on commit aab41ff

Please sign in to comment.