github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #91956 from kinvolk/rata/fix-kubelet-log-on-kill

Browse Source 
kubelet: Fix log typo when killing a container
This commit is contained in:
Kubernetes Prow Robot 2020-06-24 13:30:38 -07:00 committed by GitHub
commit 9a3276548b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -629,10 +629,10 @@ func (m *kubeGenericRuntimeManager) killContainer(pod *v1.Pod, containerID kubec
} }
if gracePeriodOverride != nil { if gracePeriodOverride != nil {
gracePeriod = *gracePeriodOverride gracePeriod = *gracePeriodOverride
klog.V(3).Infof("Killing container %q, but using %d second grace period override", containerID, gracePeriod) klog.V(3).Infof("Killing container %q, but using a %d second grace period override", containerID, gracePeriod)
} }
klog.V(2).Infof("Killing container %q with %d second grace period", containerID.String(), gracePeriod) klog.V(2).Infof("Killing container %q with a %d second grace period", containerID.String(), gracePeriod)
err := m.runtimeService.StopContainer(containerID.ID, gracePeriod) err := m.runtimeService.StopContainer(containerID.ID, gracePeriod)
if err != nil { if err != nil {