github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #88429 from taesunny/master

Browse Source 
Fix: cmd/kubeadm Typos in some error messages, comments
This commit is contained in:
Kubernetes Prow Robot 2020-02-23 11:14:47 -08:00 committed by GitHub
commit b513f359a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/util/kustomize/strategicmerge.go
View File

@ -80,13 +80,13 @@ func newStrategicMergeSliceFromBytes(in []byte) (strategicMergeSlice, error) {
return err
}
// Get the stategicMergeSlice for the item
// Get the strategicMergeSlice for the item
itemU, err := newStrategicMergeSliceFromBytes(itemJSON)
if err != nil {
return err
}
// append the stategicMergeSlice for the item to the stategicMergeSlice
// append the strategicMergeSlice for the item to the strategicMergeSlice
result = append(result, itemU...)
return nil

2
cmd/kubeadm/app/util/output/output.go
View File

@ -30,7 +30,7 @@ import (
// TextOutput describes the plain text output
const TextOutput = "text"
// TextPrintFlags is an iterface to handle custom text output
// TextPrintFlags is an interface to handle custom text output
type TextPrintFlags interface {
ToPrinter(outputFormat string) (Printer, error)
}

2
cmd/kubeadm/app/util/runtime/runtime_test.go
View File

@ -219,7 +219,7 @@ func TestRemoveContainers(t *testing.T) {
t.Errorf("unexpected RemoveContainers errors: %v, criSocket: %s, containers: %v", err, tc.criSocket, tc.containers)
}
if tc.isError && err == nil {
t.Errorf("unexpected RemoveContnainers success, criSocket: %s, containers: %v", tc.criSocket, tc.containers)
t.Errorf("unexpected RemoveContainers success, criSocket: %s, containers: %v", tc.criSocket, tc.containers)
}
})
}