Skip to content

K
k3s
Commit 62c7c66f authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #42772 from timchenxiaoyu/sometypo

Automatic merge from submit-queue (batch tested with PRs 44097, 42772, 43880, 44031, 44066) fix some typo fix some typo **Release note**: ```NONE ```
parents 7b7257ac 0bfbd40d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pkg/kubelet/dockershim/helpers.go
View file @ 62c7c66f
...@@ -271,7 +271,7 @@ func getUserFromImageUser(imageUser string) (*int64, string) { ...@@ -271,7 +271,7 @@ func getUserFromImageUser(imageUser string) (*int64, string) {
} }
// See #33189. If the previous attempt to create a sandbox container name FOO // See #33189. If the previous attempt to create a sandbox container name FOO
// failed due to "device or resource busy", it is possbile that docker did // failed due to "device or resource busy", it is possible that docker did
// not clean up properly and has inconsistent internal state. Docker would // not clean up properly and has inconsistent internal state. Docker would
// not report the existence of FOO, but would complain if user wants to // not report the existence of FOO, but would complain if user wants to
// create a new container named FOO. To work around this, we parse the error // create a new container named FOO. To work around this, we parse the error
...@@ -280,7 +280,7 @@ func getUserFromImageUser(imageUser string) (*int64, string) { ...@@ -280,7 +280,7 @@ func getUserFromImageUser(imageUser string) (*int64, string) {
// See #40443. Sometimes even removal may fail with "no such container" error. // See #40443. Sometimes even removal may fail with "no such container" error.
// In that case we have to create the container with a randomized name. // In that case we have to create the container with a randomized name.
// TODO(random-liu): Remove this work around after docker 1.11 is deprecated. // TODO(random-liu): Remove this work around after docker 1.11 is deprecated.
// TODO(#33189): Monitor the tests to see if the fix is sufficent. // TODO(#33189): Monitor the tests to see if the fix is sufficient.
func recoverFromCreationConflictIfNeeded(client dockertools.DockerInterface, createConfig dockertypes.ContainerCreateConfig, err error) (*dockertypes.ContainerCreateResponse, error) { func recoverFromCreationConflictIfNeeded(client dockertools.DockerInterface, createConfig dockertypes.ContainerCreateConfig, err error) (*dockertypes.ContainerCreateResponse, error) {
matches := conflictRE.FindStringSubmatch(err.Error()) matches := conflictRE.FindStringSubmatch(err.Error())
if len(matches) != 2 { if len(matches) != 2 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment