github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 23:15:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #42226 from timchenxiaoyu/reconciletypo

Browse Source 
Automatic merge from submit-queue

fix reconcile typo
This commit is contained in:
Kubernetes Submit Queue 2017-03-24 10:25:27 -07:00 committed by GitHub
commit 6eaa8610a1
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/status/status_manager.go
View File

@ -484,7 +484,7 @@ func (m *manager) couldBeDeleted(uid types.UID, status v1.PodStatus) bool {
// needsReconcile compares the given status with the status in the pod manager (which
// in fact comes from apiserver), returns whether the status needs to be reconciled with
// the apiserver. Now when pod status is inconsistent between apiserver and kubelet,
// kubelet should forcibly send an update to reconclie the inconsistence, because kubelet
// kubelet should forcibly send an update to reconcile the inconsistence, because kubelet
// should be the source of truth of pod status.
// NOTE(random-liu): It's simpler to pass in mirror pod uid and get mirror pod by uid, but
// now the pod manager only supports getting mirror pod by static pod, so we have to pass