Skip to content

Commit b513f35

Browse files
authored
Merge pull request kubernetes#88429 from taesunny/master
Fix: cmd/kubeadm Typos in some error messages, comments
2 parents 9c15432 + d10e3da commit b513f35

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

cmd/kubeadm/app/util/kustomize/strategicmerge.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ func newStrategicMergeSliceFromBytes(in []byte) (strategicMergeSlice, error) {
8080
return err
8181
}
8282

83-
// Get the stategicMergeSlice for the item
83+
// Get the strategicMergeSlice for the item
8484
itemU, err := newStrategicMergeSliceFromBytes(itemJSON)
8585
if err != nil {
8686
return err
8787
}
8888

89-
// append the stategicMergeSlice for the item to the stategicMergeSlice
89+
// append the strategicMergeSlice for the item to the strategicMergeSlice
9090
result = append(result, itemU...)
9191

9292
return nil

cmd/kubeadm/app/util/output/output.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
// TextOutput describes the plain text output
3131
const TextOutput = "text"
3232

33-
// TextPrintFlags is an iterface to handle custom text output
33+
// TextPrintFlags is an interface to handle custom text output
3434
type TextPrintFlags interface {
3535
ToPrinter(outputFormat string) (Printer, error)
3636
}

cmd/kubeadm/app/util/runtime/runtime_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ func TestRemoveContainers(t *testing.T) {
219219
t.Errorf("unexpected RemoveContainers errors: %v, criSocket: %s, containers: %v", err, tc.criSocket, tc.containers)
220220
}
221221
if tc.isError && err == nil {
222-
t.Errorf("unexpected RemoveContnainers success, criSocket: %s, containers: %v", tc.criSocket, tc.containers)
222+
t.Errorf("unexpected RemoveContainers success, criSocket: %s, containers: %v", tc.criSocket, tc.containers)
223223
}
224224
})
225225
}

0 commit comments

Comments
 (0)