github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41290 from feiskyer/fix

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 41182, 41290)

Fix typo of defualt

Fix typo of defualt introduced in #41274.

**Release note**:

`NONE`

cc @Random-Liu
This commit is contained in:
Kubernetes Submit Queue 2017-02-11 23:19:37 -08:00 committed by GitHub
commit 7738f41b95
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/remote/remote_runtime.go
View File

@ -74,7 +74,7 @@ func (r *RemoteRuntimeService) Version(apiVersion string) (*runtimeapi.VersionRe
// RunPodSandbox creates and starts a pod-level sandbox. Runtimes should ensure // RunPodSandbox creates and starts a pod-level sandbox. Runtimes should ensure
// the sandbox is in ready state. // the sandbox is in ready state.
func (r *RemoteRuntimeService) RunPodSandbox(config *runtimeapi.PodSandboxConfig) (string, error) { func (r *RemoteRuntimeService) RunPodSandbox(config *runtimeapi.PodSandboxConfig) (string, error) {
// Use 2 times longer timeout for sandbox operation (4 mins by defualt) // Use 2 times longer timeout for sandbox operation (4 mins by default)
// TODO: Make the pod sandbox timeout configurable. // TODO: Make the pod sandbox timeout configurable.
ctx, cancel := getContextWithTimeout(r.timeout * 2) ctx, cancel := getContextWithTimeout(r.timeout * 2)
defer cancel() defer cancel()