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

Merge pull request #106470 from qmloong/qmloong/fix

Browse Source 
fix: some typos and syncPod outdated workflow annotation
This commit is contained in:
Kubernetes Prow Robot 2022-01-11 10:48:38 -08:00 committed by GitHub
commit 7eb5046064
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/eviction/eviction_manager.go
View File

@ -63,7 +63,7 @@ type managerImpl struct {
config Config config Config
// the function to invoke to kill a pod // the function to invoke to kill a pod
killPodFunc KillPodFunc killPodFunc KillPodFunc
// the function to get the mirror pod by a given statid pod // the function to get the mirror pod by a given static pod
mirrorPodFunc MirrorPodFunc mirrorPodFunc MirrorPodFunc
// the interface that knows how to do image gc // the interface that knows how to do image gc
imageGC ImageGC imageGC ImageGC

3
pkg/kubelet/kubelet.go
View File

@ -1500,6 +1500,7 @@ func (kl *Kubelet) Run(updates <-chan kubetypes.PodUpdate) {
// o - the SyncPodOptions for this invocation // o - the SyncPodOptions for this invocation
// //
// The workflow is: // The workflow is:
// * Kill the pod immediately if update type is SyncPodKill
// * If the pod is being created, record pod worker start latency // * If the pod is being created, record pod worker start latency
// * Call generateAPIPodStatus to prepare an v1.PodStatus for the pod // * Call generateAPIPodStatus to prepare an v1.PodStatus for the pod
// * If the pod is being seen as running for the first time, record pod // * If the pod is being seen as running for the first time, record pod
@ -1727,7 +1728,7 @@ func (kl *Kubelet) syncPod(ctx context.Context, updateType kubetypes.SyncPodType
for _, r := range result.SyncResults { for _, r := range result.SyncResults {
if r.Error != kubecontainer.ErrCrashLoopBackOff && r.Error != images.ErrImagePullBackOff { if r.Error != kubecontainer.ErrCrashLoopBackOff && r.Error != images.ErrImagePullBackOff {
// Do not record an event here, as we keep all event logging for sync pod failures // Do not record an event here, as we keep all event logging for sync pod failures
// local to container runtime so we get better errors // local to container runtime, so we get better errors.
return err return err
} }
} }