github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-14 22:33:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #30429 from ZTE-PaaS/zhangke-patch-023

Browse Source 
Automatic merge from submit-queue

two nits for kubelet syncPod

a useless ‘(’ and a log level should be info
This commit is contained in:
Kubernetes Submit Queue 2016-08-23 15:04:59 -07:00 committed by GitHub
commit 64210f43ff
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/kubelet.go
View File

@ -1633,7 +1633,7 @@ func (kl *Kubelet) syncPod(o syncPodOptions) error {
} }
// Latency measurements for the main workflow are relative to the // Latency measurements for the main workflow are relative to the
// (first time the pod was seen by the API server. // first time the pod was seen by the API server.
var firstSeenTime time.Time var firstSeenTime time.Time
if firstSeenTimeStr, ok := pod.Annotations[kubetypes.ConfigFirstSeenAnnotationKey]; ok { if firstSeenTimeStr, ok := pod.Annotations[kubetypes.ConfigFirstSeenAnnotationKey]; ok {
firstSeenTime = kubetypes.ConvertToTimestamp(firstSeenTimeStr).Get() firstSeenTime = kubetypes.ConvertToTimestamp(firstSeenTimeStr).Get()
@ -1686,7 +1686,7 @@ func (kl *Kubelet) syncPod(o syncPodOptions) error {
if mirrorPod.DeletionTimestamp != nil || !kl.podManager.IsMirrorPodOf(mirrorPod, pod) { if mirrorPod.DeletionTimestamp != nil || !kl.podManager.IsMirrorPodOf(mirrorPod, pod) {
// The mirror pod is semantically different from the static pod. Remove // The mirror pod is semantically different from the static pod. Remove
// it. The mirror pod will get recreated later. // it. The mirror pod will get recreated later.
glog.Errorf("Deleting mirror pod %q because it is outdated", format.Pod(mirrorPod)) glog.Warningf("Deleting mirror pod %q because it is outdated", format.Pod(mirrorPod))
if err := kl.podManager.DeleteMirrorPod(podFullName); err != nil { if err := kl.podManager.DeleteMirrorPod(podFullName); err != nil {
glog.Errorf("Failed deleting mirror pod %q: %v", format.Pod(mirrorPod), err) glog.Errorf("Failed deleting mirror pod %q: %v", format.Pod(mirrorPod), err)
} else { } else {