Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
64210f43
Commit
64210f43
authored
Aug 23, 2016
by
Kubernetes Submit Queue
Committed by
GitHub
Aug 23, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #30429 from ZTE-PaaS/zhangke-patch-023
Automatic merge from submit-queue two nits for kubelet syncPod a useless ‘(’ and a log level should be info
parents
5981aa8b
3950f325
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
kubelet.go
pkg/kubelet/kubelet.go
+2
-2
No files found.
pkg/kubelet/kubelet.go
View file @
64210f43
...
@@ -1633,7 +1633,7 @@ func (kl *Kubelet) syncPod(o syncPodOptions) error {
...
@@ -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 {
...
@@ -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
.
Error
f
(
"Deleting mirror pod %q because it is outdated"
,
format
.
Pod
(
mirrorPod
))
glog
.
Warning
f
(
"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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment