github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #77788 from mysunshine92/wym-0510 

fix typos
k3s-v1.15.3
Kubernetes Prow Robot 2019-05-13 11:52:31 -07:00 committed by GitHub
parent b957c6d7d7 503ac59abe
commit 0252a32342
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/kuberuntime/kuberuntime_container.go
View File

@ -546,7 +546,7 @@ func (m *kubeGenericRuntimeManager) killContainer(pod *v1.Pod, containerID kubec
pod, containerSpec = restoredPod, restoredContainer
}
// From this point , pod and container must be non-nil.
// From this point, pod and container must be non-nil.
gracePeriod := int64(minimumGracePeriodInSeconds)
switch {
case pod.DeletionGracePeriodSeconds != nil:

2
pkg/kubelet/kuberuntime/kuberuntime_manager.go
View File

@ -377,7 +377,7 @@ type containerToKillInfo struct {
type podActions struct {
// Stop all running (regular and init) containers and the sandbox for the pod.
KillPod bool
// Whether need to create a new sandbox. If needed to kill pod and create a
// Whether need to create a new sandbox. If needed to kill pod and create
// a new pod sandbox, all init containers need to be purged (i.e., removed).
CreateSandbox bool
// The id of existing sandbox. It is used for starting containers in ContainersToStart.